From 5bb17294ecdb0a2c38932cee2e701d21752bfb10 Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bra.patrik@gmail.com>
Date: Mon, 23 Dec 2019 12:09:41 +0100
Subject: [PATCH] improving bestfit photo

---
 src/backend/middlewares/thumbnail/PhotoConverterMWs.ts       | 4 +++-
 src/backend/model/threading/ThumbnailWorker.ts               | 2 +-
 src/frontend/app/ui/gallery/MediaIcon.ts                     | 5 +----
 .../lightbox/media/media.lightbox.gallery.component.ts       | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/backend/middlewares/thumbnail/PhotoConverterMWs.ts b/src/backend/middlewares/thumbnail/PhotoConverterMWs.ts
index 8dd54fb..345b238 100644
--- a/src/backend/middlewares/thumbnail/PhotoConverterMWs.ts
+++ b/src/backend/middlewares/thumbnail/PhotoConverterMWs.ts
@@ -23,10 +23,12 @@ export class PhotoConverterMWs {
       return next();
     }
 
-    if (Config.Server.Media.Photo.Converting.onTheFly) {
+    if (Config.Server.Media.Photo.Converting.onTheFly === true) {
       req.resultPipe = await PhotoProcessing.convertPhoto(fullMediaPath,
         Config.Server.Media.Photo.Converting.resolution);
+      return next();
     }
+
     // not converted and won't be now
     return res.redirect(req.originalUrl.slice(0, -1 * '\\bestFit'.length));
   }
diff --git a/src/backend/model/threading/ThumbnailWorker.ts b/src/backend/model/threading/ThumbnailWorker.ts
index 350aef8..a7911c6 100644
--- a/src/backend/model/threading/ThumbnailWorker.ts
+++ b/src/backend/model/threading/ThumbnailWorker.ts
@@ -185,7 +185,7 @@ export class ImageRendererFactory {
     const sharp = require('sharp');
     sharp.cache(false);
     return async (input: RendererInput): Promise<void> => {
-      Logger.silly('[SharpThRenderer] rendering thumbnail:' + input.mediaPath);
+      Logger.silly('[SharpRenderer] rendering photo:' + input.mediaPath + ', size:' + input.size);
       const image: Sharp = sharp(input.mediaPath, {failOnError: false});
       const metadata: Metadata = await image.metadata();
 
diff --git a/src/frontend/app/ui/gallery/MediaIcon.ts b/src/frontend/app/ui/gallery/MediaIcon.ts
index 309ee8e..ee4d213 100644
--- a/src/frontend/app/ui/gallery/MediaIcon.ts
+++ b/src/frontend/app/ui/gallery/MediaIcon.ts
@@ -40,10 +40,7 @@ export class MediaIcon {
   }
 
   getBestFitMediaPath() {
-    return Utils.concatUrls(Config.Client.urlBase,
-      '/api/gallery/content/',
-      this.media.directory.path, this.media.directory.name, this.media.name,
-      '/bestFit');
+    return Utils.concatUrls(this.getMediaPath(), '/bestFit');
   }
 
 
diff --git a/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts b/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
index f525ca6..fda87cc 100644
--- a/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
+++ b/src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
@@ -29,7 +29,7 @@ export class GalleryLightboxMediaComponent implements OnChanges {
   thumbnailSrc: string = null;
   photo = {
     src: <string>null,
-    isBestFit: false
+    isBestFit: <boolean>null
   };
   public transcodeNeedVideos = SupportedFormats.TranscodeNeed.Videos;
   private mediaLoaded = false;