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

Replacing local date format with ISO string format as Date.parse only supports that reliably cross browser. #312

Browse Source
This commit is contained in:
Patrik J. Braun 2021-05-26 22:07:37 +02:00
parent d9a91a824f
commit 37594f1b88
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/SearchQueryParser.ts
View File

@ -60,13 +60,13 @@ export class SearchQueryParser {
return text;
}
private static stringifyDate(time: number): string {
public static stringifyDate(time: number): string {
const date = new Date(time);
// simplify date with yeah only if its first of jan
if (date.getMonth() === 0 && date.getDate() === 1) {
return date.getFullYear().toString();
}
return this.stringifyText(date.toLocaleDateString());
return this.stringifyText(date.toISOString().substring(0, 10));
}
private static parseDate(text: string): number {
@ -82,7 +82,12 @@ export class SearchQueryParser {
d.setFullYear(parseInt(text, 10));
return d.getTime();
}
return Date.parse(text);
const timestamp = Date.parse(text);
if (isNaN(timestamp)) {
throw new Error('Cannot parse date: ' + text);
}
return timestamp;
}
public parse(str: string, implicitAND = true): SearchQueryDTO {
@ -257,7 +262,7 @@ export class SearchQueryParser {
if (str.charAt(typeTmp.key.length) === '"' && str.charAt(str.length - 1) === '"') {
ret.text = str.slice(typeTmp.key.length + 1, str.length - 1);
ret.matchType = TextSearchQueryMatchTypes.exact_match;
// like match
// like match
} else if (str.charAt(typeTmp.key.length) === '(' && str.charAt(str.length - 1) === ')') {
ret.text = str.slice(typeTmp.key.length + 1, str.length - 1);
} else {

4
src/frontend/app/ui/gallery/search/autocomplete.service.ts
View File

@ -38,12 +38,12 @@ export class AutoCompleteService {
this.keywords.push(this.searchQueryParserService.keywords.to + ':' +
SearchQueryParser.stringifyText((new Date()).getFullYear().toString()));
this.keywords.push(this.searchQueryParserService.keywords.to + ':' +
SearchQueryParser.stringifyText((new Date()).toLocaleDateString()));
SearchQueryParser.stringifyText(SearchQueryParser.stringifyDate(Date.now())));
this.keywords.push(this.searchQueryParserService.keywords.from + ':' +
SearchQueryParser.stringifyText((new Date()).getFullYear().toString()));
this.keywords.push(this.searchQueryParserService.keywords.from + ':' +
SearchQueryParser.stringifyText((new Date()).toLocaleDateString()));
SearchQueryParser.stringifyText(SearchQueryParser.stringifyDate(Date.now())));
TextSearchQueryTypes.forEach(t => {
this.textSearchKeywordsMap[(this.searchQueryParserService.keywords as any)[SearchQueryTypes[t]]] = t;