k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-11-14 00:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(synology): journey photos keep their own capture date and place, not the next photo's

Browse Source 
getSynologyAssetInfo asked Browse.Item for the unit id plus one, a fixed
offset that holds on some libraries and on others names the next photo, whose
date and GPS were then stored for the attached one. It now asks for the unit
id, then for the one after, and takes only an item whose own thumbnail belongs
to the requested unit; when neither does, it answers not found instead of a
neighbour's metadata.

Closes #3019
This commit is contained in:
Maurice
2026-11-09 10:47:22 +01:00
parent ffa07b3d05
commit bc2fb1ce2d
2 changed files with 98 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/nest/memories/synology.service.ts
+38 -15
View File
@@ -732,24 +732,47 @@ export class SynologyService {
): Promise<ServiceResult<AssetInfo>> {
const parsedId = this._splitPackedSynologyId(photoId);
if (!parsedId) return fail('Invalid photo ID format', 400);
const infoParams: ApiCallParams = {
api: 'SYNO.Foto.Browse.Item',
method: 'get',
version: 5,
id: `[${Number(parsedId.id) + 1}]`, //for some reason synology wants id moved by one to get image info
additional: ['resolution', 'exif', 'gps', 'address', 'orientation', 'description'],
};
if (passphrase) infoParams.passphrase = passphrase;
const result = await this._requestSynologyApi<{ list: SynologyPhotoItem[] }>(targetUserId, infoParams);
if (!result.success) return result as ServiceResult<AssetInfo>;
// The packed id carries the thumbnail's unit id, while Browse.Item `get`
// wants the item's own id. On most libraries the two are equal; on some the
// item is one further on, which is why this once always asked for unit + 1
// and, on the others, stored the next photo's date and place (#3019). So
// both are asked in turn, and only an item whose own thumbnail is this unit
// counts: never a neighbour's capture time or GPS.
const unit = Number(parsedId.id);
let lastFailure: ServiceResult<AssetInfo> = fail('Photo not found', 404);
for (const itemId of [unit, unit + 1]) {
const infoParams: ApiCallParams = {
api: 'SYNO.Foto.Browse.Item',
method: 'get',
version: 5,
id: `[${itemId}]`,
additional: ['thumbnail', 'resolution', 'exif', 'gps', 'address', 'orientation', 'description'],
};
if (passphrase) infoParams.passphrase = passphrase;
const result = await this._requestSynologyApi<{ list: SynologyPhotoItem[] }>(targetUserId, infoParams);
if (!result.success) {
lastFailure = result as ServiceResult<AssetInfo>;
continue;
}
const metadata = result.data.list?.find((item) => this._isItemOfUnit(item, parsedId.id));
if (!metadata) continue;
const metadata = result.data.list?.[0];
if (!metadata) return fail('Photo not found', 404);
const normalized = this._normalizeSynologyPhotoInfo(metadata);
normalized.id = photoId;
return success(normalized);
}
return lastFailure;
}
const normalized = this._normalizeSynologyPhotoInfo(metadata);
normalized.id = photoId;
return success(normalized);
/**
* Whether an item from Browse.Item is the one behind a unit id: its thumbnail's
* cache key starts with that unit. The key's second half is a timestamp that
* moves when the photo is edited, so the unit alone decides.
*/
private _isItemOfUnit(item: SynologyPhotoItem, unitId: string): boolean {
const key = String(item.additional?.thumbnail?.cache_key ?? '');
return key.split('_')[0] === unitId;
}
async fetchSynologyThumbnailBytes(