Log failing icon extraction in MacOsApplicationRepository

oliverschwendener · Mar 5, 2024 · db3d519 · db3d519
1 parent f923aeb
commit db3d519
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 24 deletions.
diff --git a/assets/Core/FileImageGenerator/GenericApplicationIcon.png b/assets/Core/FileImageGenerator/GenericApplicationIcon.png
diff --git a/src/main/Core/ImageGenerator/ImageGeneratorModule.ts b/src/main/Core/ImageGenerator/ImageGeneratorModule.ts
@@ -57,8 +57,6 @@ export class ImageGeneratorModule {
                 new MacOsApplicationIconExtractor(
                     dependencyRegistry.get("FileSystemUtility"),
                     dependencyRegistry.get("CommandlineUtility"),
-                    dependencyRegistry.get("AssetPathResolver"),
-                    dependencyRegistry.get("Logger"),
                     cacheFileNameGenerator,
                     cacheFolderPath,
                 ),

diff --git a/src/main/Core/ImageGenerator/MacOsApplicationIconExtractor.ts b/src/main/Core/ImageGenerator/MacOsApplicationIconExtractor.ts
@@ -1,7 +1,5 @@
-import type { AssetPathResolver } from "@Core/AssetPathResolver";
 import type { CommandlineUtility } from "@Core/CommandlineUtility";
 import type { FileSystemUtility } from "@Core/FileSystemUtility";
-import type { Logger } from "@Core/Logger";
 import type { Image } from "@common/Core/Image";
 import { join } from "path";
 import type { CacheFileNameGenerator } from "./CacheFileNameGenerator";
@@ -11,8 +9,6 @@ export class MacOsApplicationIconExtractor implements FileIconExtractor {
     public constructor(
         private readonly fileSystemUtility: FileSystemUtility,
         private readonly commandlineUtility: CommandlineUtility,
-        private readonly assetPathResolver: AssetPathResolver,
-        private readonly logger: Logger,
         private readonly cacheFileNameGenerator: CacheFileNameGenerator,
         private readonly cacheFolder: string,
     ) {}
@@ -49,15 +45,7 @@ export class MacOsApplicationIconExtractor implements FileIconExtractor {
         const iconFileAlreadyExists = await this.fileSystemUtility.pathExists(iconFilePath);
 
         if (!iconFileAlreadyExists) {
-            try {
-                await this.generateAppIcon(applicationFilePath, iconFilePath);
-            } catch (error) {
-                this.logger.warn(
-                    `Unable to generate app icon for "${applicationFilePath}". Reason: ${error}. Using generic app icon instead.`,
-                );
-
-                return this.assetPathResolver.getModuleAssetPath("FileImageGenerator", "GenericApplicationIcon.png");
-            }
+            await this.generateAppIcon(applicationFilePath, iconFilePath);
         }
 
         return iconFilePath;

diff --git a/src/main/Extensions/ApplicationSearch/macOS/MacOsApplicationRepository.ts b/src/main/Extensions/ApplicationSearch/macOS/MacOsApplicationRepository.ts
@@ -21,17 +21,16 @@ export class MacOsApplicationRepository implements ApplicationRepository {
         const filePaths = await this.getAllFilePaths();
         const icons = await this.fileImageGenerator.getImages(filePaths);
 
-        return filePaths
-            .filter((filePath) => !!icons[filePath])
-            .map((filePath) => {
-                const icon = icons[filePath];
+        return filePaths.map((filePath) => {
+            const icon = icons[filePath];
 
-                if (!icon) {
-                    this.logger.warn(`Failed to generate icon for "${filePath}". Using generic icon instead.`);
-                }
+            if (!icon) {
+                console.log(filePath);
+                this.logger.warn(`Failed to generate icon for "${filePath}". Using generic icon instead.`);
+            }
 
-                return new Application(parse(filePath).name, filePath, icon ?? this.getGenericAppIcon());
-            });
+            return new Application(parse(filePath).name, filePath, icon ?? this.getGenericAppIcon());
+        });
     }
 
     private async getAllFilePaths(): Promise<string[]> {