Skip to content

High performance self-hosted photo and video management solution.

fix(server): double extension when filename has uppercase extension (#17226)

Alexb8b2898c8713
diff --git a/server/src/services/storage-template.service.spec.ts b/server/src/services/storage-template.service.spec.ts
index 6bfabe2e8c..edff406b48 100644
--- a/server/src/services/storage-template.service.spec.ts
+++ b/server/src/services/storage-template.service.spec.ts
@@ -548,4 +548,102 @@ describe(StorageTemplateService.name, () => {
expect(mocks.asset.update).not.toHaveBeenCalled();
});
});
+
+ describe('file rename correctness', () => {
+ it('should not create double extensions when filename has lower extension', async () => {
+ const asset = assetStub.storageAsset({
+ originalPath: 'upload/library/user-id/2022/2022-06-19/IMG_7065.heic',
+ originalFileName: 'IMG_7065.HEIC',
+ });
+ mocks.asset.streamStorageTemplateAssets.mockReturnValue(makeStream([asset]));
+ mocks.user.getList.mockResolvedValue([userStub.storageLabel]);
+ mocks.move.create.mockResolvedValue({
+ id: '123',
+ entityId: asset.id,
+ pathType: AssetPathType.ORIGINAL,
+ oldPath: 'upload/library/user-id/2022/2022-06-19/IMG_7065.heic',
+ newPath: 'upload/library/user-id/2023/2023-02-23/IMG_7065.heic',
+ });
+
+ await sut.handleMigration();
+
+ expect(mocks.asset.streamStorageTemplateAssets).toHaveBeenCalled();
+ expect(mocks.storage.rename).toHaveBeenCalledWith(
+ 'upload/library/user-id/2022/2022-06-19/IMG_7065.heic',
+ 'upload/library/label-1/2022/2022-06-19/IMG_7065.heic',
+ );
+ });
+
+ it('should not create double extensions when filename has uppercase extension', async () => {
+ const asset = assetStub.storageAsset({
+ originalPath: 'upload/library/user-id/2022/2022-06-19/IMG_7065.HEIC',
+ originalFileName: 'IMG_7065.HEIC',
+ });
+ mocks.asset.streamStorageTemplateAssets.mockReturnValue(makeStream([asset]));
+ mocks.user.getList.mockResolvedValue([userStub.storageLabel]);
+ mocks.move.create.mockResolvedValue({
+ id: '123',
+ entityId: asset.id,
+ pathType: AssetPathType.ORIGINAL,
+ oldPath: 'upload/library/user-id/2022/2022-06-19/IMG_7065.HEIC',
+ newPath: 'upload/library/user-id/2023/2023-02-23/IMG_7065.heic',
+ });
+
+ await sut.handleMigration();
+
+ expect(mocks.asset.streamStorageTemplateAssets).toHaveBeenCalled();
+ expect(mocks.storage.rename).toHaveBeenCalledWith(
+ 'upload/library/user-id/2022/2022-06-19/IMG_7065.HEIC',
+ 'upload/library/label-1/2022/2022-06-19/IMG_7065.heic',
+ );
+ });
+
+ it('should normalize the filename to lowercase (JPEG > jpg)', async () => {
+ const asset = assetStub.storageAsset({
+ originalPath: 'upload/library/user-id/2022/2022-06-19/IMG_7065.JPEG',
+ originalFileName: 'IMG_7065.JPEG',
+ });
+ mocks.asset.streamStorageTemplateAssets.mockReturnValue(makeStream([asset]));
+ mocks.user.getList.mockResolvedValue([userStub.storageLabel]);
+ mocks.move.create.mockResolvedValue({
+ id: '123',
+ entityId: asset.id,
+ pathType: AssetPathType.ORIGINAL,
+ oldPath: 'upload/library/user-id/2022/2022-06-19/IMG_7065.JPEG',
+ newPath: 'upload/library/user-id/2023/2023-02-23/IMG_7065.jpg',
+ });
+
+ await sut.handleMigration();
+
+ expect(mocks.asset.streamStorageTemplateAssets).toHaveBeenCalled();
+ expect(mocks.storage.rename).toHaveBeenCalledWith(
+ 'upload/library/user-id/2022/2022-06-19/IMG_7065.JPEG',
+ 'upload/library/label-1/2022/2022-06-19/IMG_7065.jpg',
+ );
+ });
+
+ it('should normalize the filename to lowercase (JPG > jpg)', async () => {
+ const asset = assetStub.storageAsset({
+ originalPath: 'upload/library/user-id/2022/2022-06-19/IMG_7065.JPG',
+ originalFileName: 'IMG_7065.JPG',
+ });
+ mocks.asset.streamStorageTemplateAssets.mockReturnValue(makeStream([asset]));
+ mocks.user.getList.mockResolvedValue([userStub.storageLabel]);
+ mocks.move.create.mockResolvedValue({
+ id: '123',
+ entityId: asset.id,
+ pathType: AssetPathType.ORIGINAL,
+ oldPath: 'upload/library/user-id/2022/2022-06-19/IMG_7065.JPG',
+ newPath: 'upload/library/user-id/2023/2023-02-23/IMG_7065.jpg',
+ });
+
+ await sut.handleMigration();
+
+ expect(mocks.asset.streamStorageTemplateAssets).toHaveBeenCalled();
+ expect(mocks.storage.rename).toHaveBeenCalledWith(
+ 'upload/library/user-id/2022/2022-06-19/IMG_7065.JPG',
+ 'upload/library/label-1/2022/2022-06-19/IMG_7065.jpg',
+ );
+ });
+ });
});
diff --git a/server/src/services/storage-template.service.ts b/server/src/services/storage-template.service.ts
index 1a0d4f4644..07bac9839a 100644
--- a/server/src/services/storage-template.service.ts
+++ b/server/src/services/storage-template.service.ts
@@ -220,9 +220,11 @@ export class StorageTemplateService extends BaseService {
const { storageLabel, filename } = metadata;
try {
+ const filenameWithoutExtension = path.basename(filename, path.extname(filename));
+
const source = asset.originalPath;
let extension = path.extname(source).split('.').pop() as string;
- const sanitized = sanitize(path.basename(filename, `.${extension}`));
+ const sanitized = sanitize(path.basename(filenameWithoutExtension, `.${extension}`));
extension = extension?.toLowerCase();
const rootPath = StorageCore.getLibraryFolder({ id: asset.ownerId, storageLabel });