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 pull request #875 from grasdk/feature/month-addition

Browse Source 
Feature/month addition
This commit is contained in:
Patrik J. Braun 2024-04-04 22:54:35 +02:00 committed by GitHub
commit bf776627cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -779,7 +779,7 @@ export class SearchManager {
break; break;
case DatePatternFrequency.months_ago: case DatePatternFrequency.months_ago:
to.setUTCMonth(to.getUTCMonth() - tq.agoNumber); to.setTime(Utils.addMonthToDate(to, -1 * tq.agoNumber).getTime());
break; break;
case DatePatternFrequency.years_ago: case DatePatternFrequency.years_ago:

13
src/common/Utils.ts
View File

@ -220,6 +220,19 @@ export class Utils {
return dayOfYear; return dayOfYear;
} }
//Adding months to a date differently from standard JS
//this function makes sure that if date is the 31st and you add a month, you will get the last day of the next month
//so adding or subtracting a month from 31st of march will give 30th of april or 28th of february respectively (29th on leap years).
static addMonthToDate(date: Date, numMonths: number) {
const result = new Date(date)
const expectedMonth = ((date.getMonth() + numMonths) % 12 + 12) % 12; //inner %12 + 12 makes correct handling of negative months
result.setMonth(result.getMonth() + numMonths);
if (result.getMonth() !== expectedMonth) {
result.setDate(0);
}
return result;
}
static renderDataSize(size: number): string { static renderDataSize(size: number): string {
const postFixes = ['B', 'KB', 'MB', 'GB', 'TB']; const postFixes = ['B', 'KB', 'MB', 'GB', 'TB'];
let index = 0; let index = 0;

15
test/backend/unit/model/sql/SearchManager.spec.ts
View File

@ -132,18 +132,9 @@ describe('SearchManager', (sqlHelper: DBTestHelper) => {
delete pFaceLessTmp.metadata.faces; delete pFaceLessTmp.metadata.faces;
d = new Date(); d = new Date();
//we create a date 1 month and 1 day before now //we create a date 1 month and 1 day before now
if ([1, 3, 5, 7, 8, 10, 0].includes(d.getMonth())) { d = Utils.addMonthToDate(d, -1); //subtract 1 month in the "human way"
//Now is a month after a long month: feb (1), april (3), june (5), august(7), september(8), november (10), january (0) d.setDate(d.getDate()-1); //subtract 1 day
pFaceLessTmp.metadata.creationDate = d.getTime() - 60 * 60 * 24 * 32 * 1000; pFaceLessTmp.metadata.creationDate = d.getTime();
} else if (d.getMonth() == 2 && Utils.isDateFromLeapYear(d)) {
//march on leap years
pFaceLessTmp.metadata.creationDate = d.getTime() - 60 * 60 * 24 * 30 * 1000;
} else if (d.getMonth() == 2) {
//march (and not leap years)
pFaceLessTmp.metadata.creationDate = d.getTime() - 60 * 60 * 24 * 29 * 1000;
} else { //all other months must come after a short month with 30 days, so we subtract 31
pFaceLessTmp.metadata.creationDate = d.getTime() - 60 * 60 * 24 * 31 * 1000;
}
pFaceLessTmp.metadata.creationDateOffset = "+02:00"; pFaceLessTmp.metadata.creationDateOffset = "+02:00";
dir = await DBTestHelper.persistTestDir(directory); dir = await DBTestHelper.persistTestDir(directory);