Replaces NativeImage by Sharp

angular.webpack.js

@@ -8,7 +8,6 @@ module.exports = {
         fs: 'commonjs fs',
         assert: 'commonjs assert',
         crypto: 'commonjs crypto',
-        fs: 'commonjs fs',
         http: 'commonjs http',
         https: 'commonjs https',
         os: 'commonjs os',
@@ -21,5 +20,6 @@ module.exports = {
         net: 'commonjs net',
         querystring: 'commonjs querystring',
         url: 'commonjs url',
+        sharp: 'commonjs sharp',
     },
 };

main/common/image-processor.js

@@ -16,12 +16,12 @@ class ImageProcessor {
     }
 
     async resizeAndWriteImageAsync(imageBuffer, imagePath, maxWidth, maxHeight, jpegQuality) {
-        sharp(imageBuffer)
+        await sharp(imageBuffer)
             .resize(maxWidth, maxHeight)
             .jpeg({
                 quality: jpegQuality,
             })
-            .toFile(imagePath, (err, info) => {});
+            .toFile(imagePath);
     }
 }
 

src/app/app.module.ts

@@ -169,8 +169,6 @@ import { SubfolderNamePipe } from './ui/pipes/subfolder-name.pipe';
 import { SubfoldersFilterPipe } from './ui/pipes/subfolders-filter.pipe';
 import { TracksFilterPipe } from './ui/pipes/tracks-filter.pipe';
 import { ZeroToBlankPipe } from './ui/pipes/zero-to-blank.pipe';
-import { AlbumArtworkCacheIdFactory } from './services/album-artwork-cache/album-artwork-cache-id-factory';
-import { AlbumArtworkCacheService } from './services/album-artwork-cache/album-artwork-cache.service';
 import { AlbumService } from './services/album/album-service';
 import { AppearanceService } from './services/appearance/appearance.service';
 import { DefaultThemesCreator } from './services/appearance/default-themes-creator';
@@ -252,7 +250,6 @@ import { UpdateServiceBase } from './services/update/update.service.base';
 import { TranslatorServiceBase } from './services/translator/translator.service.base';
 import { IndexingServiceBase } from './services/indexing/indexing.service.base';
 import { NavigationServiceBase } from './services/navigation/navigation.service.base';
-import { AlbumArtworkCacheServiceBase } from './services/album-artwork-cache/album-artwork-cache.service.base';
 import { ApplicationServiceBase } from './services/application/application.service.base';
 import { AZLyricsApi } from './common/api/lyrics/a-z-lyrics.api';
 import { ChartLyricsApi } from './common/api/lyrics/chart-lyrics.api';
@@ -503,7 +500,6 @@ export function appInitializerFactory(translate: TranslateService, injector: Inj
         FileMetadataFactory,
         AlbumKeyGenerator,
         MimeTypes,
-        AlbumArtworkCacheIdFactory,
         ImageProcessor,
         CachedAlbumArtworkGetter,
         LastfmApi,
@@ -581,7 +577,6 @@ export function appInitializerFactory(translate: TranslateService, injector: Inj
         { provide: TrackRepositoryBase, useClass: TrackRepository },
         { provide: FolderRepositoryBase, useClass: FolderRepository },
         { provide: ApplicationServiceBase, useClass: ApplicationService },
-        { provide: AlbumArtworkCacheServiceBase, useClass: AlbumArtworkCacheService },
         { provide: NavigationServiceBase, useClass: NavigationService },
         { provide: IndexingServiceBase, useClass: IndexingService },
         { provide: TranslatorServiceBase, useClass: TranslatorService },

src/app/common/image-processor.ts

@@ -1,44 +1,33 @@
 import { Injectable } from '@angular/core';
-import { nativeImage, NativeImage, Size } from 'electron';
-import * as fs from 'fs-extra';
 import fetch from 'node-fetch';
 import { FileAccessBase } from './io/file-access.base';
+import sharp from 'sharp';
 
 @Injectable()
 export class ImageProcessor {
     public constructor(private fileAccess: FileAccessBase) {}
 
-    public async convertImageBufferToFileAsync(imageBuffer: Buffer, imagePath: string): Promise<void> {
-        await fs.writeFile(imagePath, imageBuffer);
-    }
-
     public async convertLocalImageToBufferAsync(imagePath: string): Promise<Buffer> {
-        const imageBuffer: Buffer = await this.fileAccess.getFileContentAsBufferAsync(imagePath);
-
-        return imageBuffer;
+        return await this.fileAccess.getFileContentAsBufferAsync(imagePath);
     }
 
     public async convertOnlineImageToBufferAsync(imageUrl: string): Promise<Buffer> {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
         const response: Response = (await fetch(imageUrl)) as Response;
         const imageArrayBuffer: ArrayBuffer = await response.arrayBuffer();
-        const imageBuffer: Buffer = Buffer.from(imageArrayBuffer);
-
-        return imageBuffer;
+        return Buffer.from(imageArrayBuffer);
     }
 
     public convertBufferToImageUrl(imageBuffer: Buffer): string {
         return 'data:image/png;base64,' + imageBuffer.toString('base64');
     }
 
-    public resizeImage(imageBuffer: Buffer, maxWidth: number, maxHeight: number, jpegQuality: number): Buffer {
-        let image: NativeImage = nativeImage.createFromBuffer(imageBuffer);
-        const imageSize: Size = image.getSize();
-
-        if (imageSize.width > maxWidth || imageSize.height > maxHeight) {
-            image = image.resize({ width: maxWidth, height: maxHeight, quality: 'best' });
-        }
-
-        return image.toJPEG(jpegQuality);
+    public async resizeImageAsync(imageBuffer: Buffer, maxWidth: number, maxHeight: number, jpegQuality: number): Promise<Buffer> {
+        return await sharp(imageBuffer)
+            .resize(maxWidth, maxHeight)
+            .jpeg({
+                quality: jpegQuality,
+            })
+            .toBuffer();
     }
 }