mirror of
https://github.com/bpatrik/pigallery2.git
synced 2024-12-23 01:27:14 +02:00
Merge pull request #845 from grasdk/feature/timestamp_rework_test_fix
fix leap year searching and tests. small metadatabuffer size optimization
This commit is contained in:
commit
5d5be0604e
@ -764,7 +764,7 @@ export class SearchManager {
|
||||
tq.frequency === DatePatternFrequency.days_ago)) {
|
||||
|
||||
if (isNaN(tq.agoNumber)) {
|
||||
throw new Error('ago number is missing on date patter search query with frequency: ' + DatePatternFrequency[tq.frequency] + ', ago number: ' + tq.agoNumber);
|
||||
throw new Error('ago number is missing on date pattern search query with frequency: ' + DatePatternFrequency[tq.frequency] + ', ago number: ' + tq.agoNumber);
|
||||
}
|
||||
const to = new Date();
|
||||
to.setHours(0, 0, 0, 0);
|
||||
@ -853,15 +853,16 @@ export class SearchManager {
|
||||
};
|
||||
switch (tq.frequency) {
|
||||
case DatePatternFrequency.every_year:
|
||||
if (tq.daysLength >= 365) { // trivial result includes all photos
|
||||
const d = new Date();
|
||||
if (tq.daysLength >= (Utils.isDateFromLeapYear(d) ? 366: 365)) { // trivial result includes all photos
|
||||
if (tq.negate) {
|
||||
q.andWhere('FALSE');
|
||||
}
|
||||
return q;
|
||||
}
|
||||
const d = new Date();
|
||||
const dayOfYear = Math.floor((d.getTime() - new Date(d.getFullYear(), 0, 0).getTime()) / 1000 / 60 / 60 / 24);
|
||||
addWhere('%j', dayOfYear - tq.daysLength < 0);
|
||||
|
||||
const dayOfYear = Utils.getDayOfYear(d);
|
||||
addWhere('%m%d', dayOfYear - tq.daysLength < 0);
|
||||
break;
|
||||
case DatePatternFrequency.every_month:
|
||||
if (tq.daysLength >= 31) { // trivial result includes all photos
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -147,6 +147,26 @@ export class Utils {
|
||||
}
|
||||
}
|
||||
|
||||
static isLeapYear(year: number) {
|
||||
return (0 == year % 4) && (0 != year % 100) || (0 == year % 400)
|
||||
}
|
||||
|
||||
static isDateFromLeapYear(date: Date) {
|
||||
return Utils.isLeapYear(date.getFullYear());
|
||||
}
|
||||
|
||||
// Get Day of Year
|
||||
static getDayOfYear(date: Date) {
|
||||
//Day-number at the start of Jan to Dec. A month baseline
|
||||
const dayCount = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];
|
||||
const mn = date.getMonth();
|
||||
let dayOfYear = dayCount[mn] + date.getDate(); //add the date to the month baseline
|
||||
if (mn > 1 && Utils.isLeapYear((date.getFullYear()))) {
|
||||
dayOfYear++; //Add an extra day for march to december (mn>1) on leap years
|
||||
}
|
||||
return dayOfYear;
|
||||
}
|
||||
|
||||
static renderDataSize(size: number): string {
|
||||
const postFixes = ['B', 'KB', 'MB', 'GB', 'TB'];
|
||||
let index = 0;
|
||||
|
@ -184,7 +184,7 @@ export class GallerySortingService {
|
||||
private getGroupByNameFn(grouping: GroupingMethod) {
|
||||
switch (grouping.method) {
|
||||
case SortByTypes.Date:
|
||||
return (m: MediaDTO) => this.datePipe.transform(m.metadata.creationDate, 'longDate', m.metadata.creationDateOffset);
|
||||
return (m: MediaDTO) => this.datePipe.transform(m.metadata.creationDate, 'longDate', m.metadata.creationDateOffset ? m.metadata.creationDateOffset : 'UTC');
|
||||
|
||||
case SortByTypes.Name:
|
||||
return (m: MediaDTO) => m.name.at(0).toUpperCase();
|
||||
|
@ -115,16 +115,36 @@ describe('SearchManager', (sqlHelper: DBTestHelper) => {
|
||||
subDir2 = TestHelper.getDirectoryEntry(directory, 'Return of the Jedi');
|
||||
p = TestHelper.getPhotoEntry1(directory);
|
||||
p.metadata.creationDate = Date.now();
|
||||
p.metadata.creationDateOffset = "+02:00";
|
||||
p2 = TestHelper.getPhotoEntry2(directory);
|
||||
p2.metadata.creationDate = Date.now() - 60 * 60 * 24 * 1000;
|
||||
p2.metadata.creationDateOffset = "+02:00";
|
||||
v = TestHelper.getVideoEntry1(directory);
|
||||
v.metadata.creationDate = Date.now() - 60 * 60 * 24 * 7 * 1000;
|
||||
v.metadata.creationDateOffset = "+02:00";
|
||||
gpx = TestHelper.getRandomizedGPXEntry(directory);
|
||||
p4 = TestHelper.getPhotoEntry4(subDir2);
|
||||
p4.metadata.creationDate = Date.now() - 60 * 60 * 24 * 366 * 1000;
|
||||
let d = new Date();
|
||||
//set creation date to one year and one day earlier
|
||||
p4.metadata.creationDate = d.getTime() - 60 * 60 * 24 * (Utils.isDateFromLeapYear(d) ? 367 : 366) * 1000;
|
||||
p4.metadata.creationDateOffset = "+02:00";
|
||||
const pFaceLessTmp = TestHelper.getPhotoEntry3(subDir);
|
||||
delete pFaceLessTmp.metadata.faces;
|
||||
pFaceLessTmp.metadata.creationDate = Date.now() - 60 * 60 * 24 * 32 * 1000;
|
||||
d = new Date();
|
||||
//we create a date 1 month and 1 day before now
|
||||
if ([1, 3, 5, 7, 8, 10, 0].includes(d.getMonth())) {
|
||||
//Now is a month after a long month: feb (1), april (3), june (5), august(7), september(8), november (10), january (0)
|
||||
pFaceLessTmp.metadata.creationDate = d.getTime() - 60 * 60 * 24 * 32 * 1000;
|
||||
} 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";
|
||||
|
||||
dir = await DBTestHelper.persistTestDir(directory);
|
||||
subDir = dir.directories[0];
|
||||
@ -937,13 +957,16 @@ describe('SearchManager', (sqlHelper: DBTestHelper) => {
|
||||
await setUpSqlDB();
|
||||
p5 = TestHelper.getBasePhotoEntry(subDir2, 'p5-23h-ago.jpg');
|
||||
p5.metadata.creationDate = Date.now() - 60 * 60 * 24 * 1000 - 1000;
|
||||
//p5.metadata.creationDateOffset = "+02:00";
|
||||
p6 = TestHelper.getBasePhotoEntry(subDir2, 'p6-300d-ago.jpg');
|
||||
p6.metadata.creationDate = Date.now() - 60 * 60 * 24 * 300 * 1000;
|
||||
//p6.metadata.creationDateOffset = "+02:00";
|
||||
p7 = TestHelper.getBasePhotoEntry(subDir2, 'p7-1y-1min-ago.jpg');
|
||||
const d = new Date();
|
||||
d.setUTCFullYear(d.getUTCFullYear() - 1);
|
||||
d.setUTCMinutes(d.getUTCMinutes() - 1);
|
||||
p7.metadata.creationDate = d.getTime();
|
||||
//p7.metadata.creationDateOffset = "+02:00";
|
||||
|
||||
subDir2 = await DBTestHelper.persistTestDir(subDir2) as any;
|
||||
p4 = subDir2.media[0];
|
||||
|
Loading…
Reference in New Issue
Block a user