Merge thumbnail and photo preview (generated photo) handling #806

bpatrik · Jan 3, 2024 · 13e828d · 13e828d
1 parent 0395fa8
commit 13e828d
Show file tree

Hide file tree

Showing 26 changed files with 523 additions and 644 deletions.
diff --git a/src/backend/middlewares/thumbnail/PhotoConverterMWs.ts b/src/backend/middlewares/thumbnail/PhotoConverterMWs.ts
diff --git a/src/backend/middlewares/thumbnail/ThumbnailGeneratorMWs.ts b/src/backend/middlewares/thumbnail/ThumbnailGeneratorMWs.ts
@@ -14,7 +14,7 @@ import {PersonEntry} from '../../model/database/enitites/PersonEntry';
 
 export class ThumbnailGeneratorMWs {
   private static ThumbnailMapEntries =
-      Config.Media.Thumbnail.generateThumbnailMapEntries();
+      Config.Media.Photo.generateThumbnailMapEntries();
 
   @ServerTime('2.th', 'Thumbnail decoration')
   public static async addThumbnailInformation(
@@ -34,7 +34,7 @@ export class ThumbnailGeneratorMWs {
 
       // regenerate in case the list change since startup
       ThumbnailGeneratorMWs.ThumbnailMapEntries =
-          Config.Media.Thumbnail.generateThumbnailMapEntries();
+          Config.Media.Photo.generateThumbnailMapEntries();
       if (cw.directory) {
         ThumbnailGeneratorMWs.addThInfoTODir(cw.directory);
       }
@@ -67,7 +67,7 @@ export class ThumbnailGeneratorMWs {
 
     let erroredItem: PersonEntry = null;
     try {
-      const size: number = Config.Media.Thumbnail.personThumbnailSize;
+      const size: number = Config.Media.Photo.personThumbnailSize;
 
       const persons: PersonEntry[] = req.resultPipe as PersonEntry[];
 
@@ -147,11 +147,11 @@ export class ThumbnailGeneratorMWs {
       const mediaPath = req.resultPipe as string;
       let size: number =
           parseInt(req.params.size, 10) ||
-          Config.Media.Thumbnail.thumbnailSizes[0];
+          Config.Media.Photo.thumbnailSizes[0];
 
       // validate size
-      if (Config.Media.Thumbnail.thumbnailSizes.indexOf(size) === -1) {
-        size = Config.Media.Thumbnail.thumbnailSizes[0];
+      if (Config.Media.Photo.thumbnailSizes.indexOf(size) === -1) {
+        size = Config.Media.Photo.thumbnailSizes[0];
       }
 
       try {
@@ -188,7 +188,7 @@ export class ThumbnailGeneratorMWs {
 
       // load parameters
       const mediaPath = req.resultPipe as string;
-      const size: number = Config.Media.Thumbnail.iconSize;
+      const size: number = Config.Media.Photo.iconSize;
 
       try {
         req.resultPipe = await PhotoProcessing.generateThumbnail(