xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

Implement date pattern negating on the UI: #660

Browse Source
This commit is contained in:
Patrik J. Braun 2023-08-04 19:24:55 +02:00
parent 891c155cce
commit a14c2ff45d
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/model/threading/MetadataLoader.ts
View File

@ -45,6 +45,7 @@ export class MetadataLoader {
try { try {
for (const stream of data.streams) { for (const stream of data.streams) {
console.log(stream);
if (stream.width) { if (stream.width) {
metadata.size.width = stream.width; metadata.size.width = stream.width;
metadata.size.height = stream.height; metadata.size.height = stream.height;

19
src/common/SearchQueryParser.ts
View File

@ -357,7 +357,8 @@ export class SearchQueryParser {
if (kwStartsWith(str, this.keywords.sameDay) || if (kwStartsWith(str, this.keywords.sameDay) ||
new RegExp('^' + SearchQueryParser.humanToRegexpStr(this.keywords.lastNDays) + '!?:').test(str)) { new RegExp('^' + SearchQueryParser.humanToRegexpStr(this.keywords.lastNDays) + '!?:').test(str)) {
const freqStr = str.slice(str.indexOf(':') + 1);
const freqStr = str.indexOf('!:') === -1 ? str.slice(str.indexOf(':') + 1) : str.slice(str.indexOf('!:') + 2);
let freq: DatePatternFrequency = null; let freq: DatePatternFrequency = null;
let ago; let ago;
if (freqStr == this.keywords.every_week) { if (freqStr == this.keywords.every_week) {
@ -381,15 +382,16 @@ export class SearchQueryParser {
} }
if (freq) { if (freq) {
const ret = { return {
type: SearchQueryTypes.date_pattern, type: SearchQueryTypes.date_pattern,
daysLength: kwStartsWith(str, this.keywords.sameDay) ? 0 : intFromRegexp(str), daysLength: kwStartsWith(str, this.keywords.sameDay) ? 0 : intFromRegexp(str),
frequency: freq frequency: freq,
...((new RegExp('^' + SearchQueryParser.humanToRegexpStr(this.keywords.lastNDays) + '!:').test(str) ||
str.startsWith(this.keywords.sameDay + '!:')) && {
negate: true
}),
...(ago && {agoNumber: ago})
} as DatePatternSearch; } as DatePatternSearch;
if (ago) {
ret.agoNumber = ago;
}
return ret;
} }
} }
@ -586,6 +588,9 @@ export class SearchQueryParser {
} else { } else {
strBuilder += this.keywords.lastNDays.replace(/%d/g, q.daysLength.toString()); strBuilder += this.keywords.lastNDays.replace(/%d/g, q.daysLength.toString());
} }
if (q.negate === true) {
strBuilder += '!';
}
strBuilder += ':'; strBuilder += ':';
switch (q.frequency) { switch (q.frequency) {
case DatePatternFrequency.every_week: case DatePatternFrequency.every_week:

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

@ -153,6 +153,12 @@ describe('SearchQueryParser', () => {
frequency: DatePatternFrequency.years_ago, frequency: DatePatternFrequency.years_ago,
agoNumber: 1 agoNumber: 1
} as DatePatternSearch); } as DatePatternSearch);
check({
type: SearchQueryTypes.date_pattern, daysLength: i,
frequency: DatePatternFrequency.years_ago,
agoNumber: 1,
negate: true
} as DatePatternSearch);
} }
}); });
it('Default logical operator should be AND', () => { it('Default logical operator should be AND', () => {