xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

Parsing ISO date string manually in search queries, also replacing all date to UTC dates #312

Browse Source
This commit is contained in:
Patrik J. Braun 2021-05-27 23:15:00 +02:00
parent 37594f1b88
commit e63a7cae98
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/SearchQueryParser.ts
View File

@ -62,6 +62,7 @@ export class SearchQueryParser {
public static stringifyDate(time: number): string { public static stringifyDate(time: number): string {
const date = new Date(time); const date = new Date(time);
// simplify date with yeah only if its first of jan // simplify date with yeah only if its first of jan
if (date.getMonth() === 0 && date.getDate() === 1) { if (date.getMonth() === 0 && date.getDate() === 1) {
return date.getFullYear().toString(); return date.getFullYear().toString();
@ -78,12 +79,23 @@ export class SearchQueryParser {
} }
// it is the year only // it is the year only
if (text.length === 4) { if (text.length === 4) {
const d = new Date(2000, 0, 1); return Date.UTC(parseInt(text, 10), 0, 1, 0, 0, 0, 0);
d.setFullYear(parseInt(text, 10));
return d.getTime();
} }
const timestamp = Date.parse(text); let timestamp = null;
if (isNaN(timestamp)) { // Parsing ISO string
try {
const parts = text.split('-').map(t => parseInt(t, 10));
if (parts && parts.length === 3) {
timestamp = (Date.UTC(parts[0], parts[1] - 1, parts[2])); // Note: months are 0-based
}
} catch (e) {
}
// If it could not parse as ISO string, try our luck with Date.parse
// https://stackoverflow.com/questions/2587345/why-does-date-parse-give-incorrect-results
if (timestamp === null) {
timestamp = Date.parse(text);
}
if (isNaN(timestamp) || timestamp === null) {
throw new Error('Cannot parse date: ' + text); throw new Error('Cannot parse date: ' + text);
} }

16
test/common/unit/SearchQueryParser.ts
View File

@ -85,20 +85,20 @@ describe('SearchQueryParser', () => {
}); });
it('Date search', () => { it('Date search', () => {
check({type: SearchQueryTypes.from_date, value: (new Date(2020, 1, 10)).getTime()} as FromDateSearch); check({type: SearchQueryTypes.from_date, value: (Date.UTC(2020, 1, 10))} as FromDateSearch);
check({type: SearchQueryTypes.from_date, value: (new Date(2020, 1, 1)).getTime()} as FromDateSearch); check({type: SearchQueryTypes.from_date, value: (Date.UTC(2020, 1, 1))} as FromDateSearch);
check({type: SearchQueryTypes.to_date, value: (new Date(2020, 1, 20)).getTime()} as ToDateSearch); check({type: SearchQueryTypes.to_date, value: (Date.UTC(2020, 1, 20))} as ToDateSearch);
check({type: SearchQueryTypes.to_date, value: (new Date(2020, 1, 1)).getTime()} as ToDateSearch); check({type: SearchQueryTypes.to_date, value: (Date.UTC(2020, 1, 1))} as ToDateSearch);
check({type: SearchQueryTypes.from_date, value: (new Date(2020, 1, 1)).getTime(), negate: true} as FromDateSearch); check({type: SearchQueryTypes.from_date, value: (Date.UTC(2020, 1, 1)), negate: true} as FromDateSearch);
check({type: SearchQueryTypes.to_date, value: (new Date(2020, 1, 1)).getTime(), negate: true} as ToDateSearch); check({type: SearchQueryTypes.to_date, value: (Date.UTC(2020, 1, 1)), negate: true} as ToDateSearch);
const parser = new SearchQueryParser(queryKeywords); const parser = new SearchQueryParser(queryKeywords);
// test if date gets simplified on 1st of Jan. // test if date gets simplified on 1st of Jan.
let query: RangeSearch = {type: SearchQueryTypes.to_date, value: (new Date(2020, 0, 1)).getTime()} as ToDateSearch; let query: RangeSearch = {type: SearchQueryTypes.to_date, value: (Date.UTC(2020, 0, 1))} as ToDateSearch;
expect(parser.parse(queryKeywords.to + ':' + (new Date(query.value)).getFullYear())) expect(parser.parse(queryKeywords.to + ':' + (new Date(query.value)).getFullYear()))
.to.deep.equals(query, parser.stringify(query)); .to.deep.equals(query, parser.stringify(query));
query = ({type: SearchQueryTypes.from_date, value: (new Date(2020, 0, 1)).getTime()} as FromDateSearch); query = ({type: SearchQueryTypes.from_date, value: (Date.UTC(2020, 0, 1))} as FromDateSearch);
expect(parser.parse(queryKeywords.from + ':' + (new Date(query.value)).getFullYear())) expect(parser.parse(queryKeywords.from + ':' + (new Date(query.value)).getFullYear()))
.to.deep.equals(query, parser.stringify(query)); .to.deep.equals(query, parser.stringify(query));