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

Merge branch 'bugfix/offset-or-ignore' of https://github.com/grasdk/pigallery2 into bugfix/offset-or-ignore

Browse Source
This commit is contained in:
grasdk 2024-05-12 00:57:44 +02:00
commit 81209975c8
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/model/database/SearchManager.ts
View File

@ -811,9 +811,14 @@ export class SearchManager {
q.where( q.where(
`(media.metadata.creationDate + (media.metadata.creationDateOffset * 60000)) >= :to${queryId}`, `(media.metadata.creationDate + (media.metadata.creationDateOffset * 60000)) >= :to${queryId}`,
textParam textParam
).orWhere(`media.metadata.creationDate < :from${queryId}`, ).orWhere(`(media.metadata.creationDate + (media.metadata.creationDateOffset * 60000)) < :from${queryId}`,
textParam); textParam);
} else { } else {
q.where(
`media.metadata.creationDate >= :to${queryId}`,
textParam
).orWhere(`media.metadata.creationDate < :from${queryId}`,
textParam);
} }
} else { } else {
@ -821,10 +826,14 @@ export class SearchManager {
q.where( q.where(
`(media.metadata.creationDate + (media.metadata.creationDateOffset * 60000)) < :to${queryId}`, `(media.metadata.creationDate + (media.metadata.creationDateOffset * 60000)) < :to${queryId}`,
textParam textParam
).andWhere(`media.metadata.creationDate >= :from${queryId}`, ).andWhere(`(media.metadata.creationDate + (media.metadata.creationDateOffset * 60000)) >= :from${queryId}`,
textParam); textParam);
} else { } else {
q.where(
`media.metadata.creationDate < :to${queryId}`,
textParam
).andWhere(`media.metadata.creationDate >= :from${queryId}`,
textParam);
} }
} }
@ -845,8 +854,6 @@ export class SearchManager {
if (Config.Database.type === DatabaseType.sqlite) { if (Config.Database.type === DatabaseType.sqlite) {
//(media.metadata.creationDate + (media.metadata.creationDateOffset * 60000))
if (tq.daysLength == 0) { if (tq.daysLength == 0) {
if (Config.Gallery.ignoreTimestampOffset === true) { if (Config.Gallery.ignoreTimestampOffset === true) {
q.where( q.where(

1
test/backend/unit/model/sql/CoverManager.spec.ts
View File

@ -128,6 +128,7 @@ describe('CoverManager', (sqlHelper: DBTestHelper) => {
before(async () => { before(async () => {
await setUpSqlDB(); await setUpSqlDB();
Config.Gallery.ignoreTimestampOffset = false;
}); });