helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix(server): add missing file extensions to library files (#8342)

Browse source 
* fix file extensions

* fix tests

* fix formatting

* fixed bug

* fix merts comments
This commit is contained in:
Jonathan Jogenfors 2024-03-29 03:51:07 +01:00 • committed by GitHub
parent 3f61019ca1
commit ec48fccb30
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 117 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
server/src/services/library.service.ts
View file

@ -443,6 +443,8 @@ export class LibraryService extends EventEmitter {
doRefresh = true;
}
const originalFileName = parse(assetPath).base;
if (!existingAssetEntity) {
// This asset is new to us, read it from disk
this.logger.debug(`Importing new asset: ${assetPath}`);
@ -453,6 +455,12 @@ export class LibraryService extends EventEmitter {
`File modification time has changed, re-importing asset: ${assetPath}. Old mtime: ${existingAssetEntity.fileModifiedAt}. New mtime: ${stats.mtime}`,
);
doRefresh = true;
} else if (existingAssetEntity.originalFileName !== originalFileName) {
// TODO: We can likely remove this check in the second half of 2024 when all assets have likely been re-imported by all users
this.logger.debug(
`Asset is missing file extension, re-importing: ${assetPath}. Current incorrect filename: ${existingAssetEntity.originalFileName}.`,
);
doRefresh = true;
} else if (!job.force && stats && !existingAssetEntity.isOffline) {
// Asset exists on disk and in db and mtime has not changed. Also, we are not forcing refresn. Therefore, do nothing
this.logger.debug(`Asset already exists in database and on disk, will not import: ${assetPath}`);
@ -510,7 +518,7 @@ export class LibraryService extends EventEmitter {
fileModifiedAt: stats.mtime,
localDateTime: stats.mtime,
type: assetType,
originalFileName: parse(assetPath).base,
originalFileName,
sidecarPath,
isReadOnly: true,
isExternal: true,
@ -521,6 +529,7 @@ export class LibraryService extends EventEmitter {
await this.assetRepository.updateAll([existingAssetEntity.id], {
fileCreatedAt: stats.mtime,
fileModifiedAt: stats.mtime,
originalFileName,
});
} else {
// Not importing and not refreshing, do nothing