fossilfranv/pigallery2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improving bestfit photo

Browse Source
This commit is contained in:
Patrik J. Braun 2019-12-23 12:09:41 +01:00
parent 9e7e66a4aa
commit 5bb17294ec
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/middlewares/thumbnail/PhotoConverterMWs.ts
View File

@ -23,10 +23,12 @@ export class PhotoConverterMWs {
return next(); return next();
} }
if (Config.Server.Media.Photo.Converting.onTheFly) { if (Config.Server.Media.Photo.Converting.onTheFly === true) {
req.resultPipe = await PhotoProcessing.convertPhoto(fullMediaPath, req.resultPipe = await PhotoProcessing.convertPhoto(fullMediaPath,
Config.Server.Media.Photo.Converting.resolution); Config.Server.Media.Photo.Converting.resolution);
return next();
} }
// not converted and won't be now // not converted and won't be now
return res.redirect(req.originalUrl.slice(0, -1 * '\\bestFit'.length)); return res.redirect(req.originalUrl.slice(0, -1 * '\\bestFit'.length));
} }

2
src/backend/model/threading/ThumbnailWorker.ts
View File

@ -185,7 +185,7 @@ export class ImageRendererFactory {
const sharp = require('sharp'); const sharp = require('sharp');
sharp.cache(false); sharp.cache(false);
return async (input: RendererInput): Promise<void> => { 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 image: Sharp = sharp(input.mediaPath, {failOnError: false});
const metadata: Metadata = await image.metadata(); const metadata: Metadata = await image.metadata();

5
src/frontend/app/ui/gallery/MediaIcon.ts
View File

@ -40,10 +40,7 @@ export class MediaIcon {
} }
getBestFitMediaPath() { getBestFitMediaPath() {
return Utils.concatUrls(Config.Client.urlBase, return Utils.concatUrls(this.getMediaPath(), '/bestFit');
'/api/gallery/content/',
this.media.directory.path, this.media.directory.name, this.media.name,
'/bestFit');
} }

2
src/frontend/app/ui/gallery/lightbox/media/media.lightbox.gallery.component.ts
View File

@ -29,7 +29,7 @@ export class GalleryLightboxMediaComponent implements OnChanges {
thumbnailSrc: string = null; thumbnailSrc: string = null;
photo = { photo = {
src: <string>null, src: <string>null,
isBestFit: false isBestFit: <boolean>null
}; };
public transcodeNeedVideos = SupportedFormats.TranscodeNeed.Videos; public transcodeNeedVideos = SupportedFormats.TranscodeNeed.Videos;
private mediaLoaded = false; private mediaLoaded = false;