From db17f0027c0ced6ceddd779ed0bd4a4f4a79f6c2 Mon Sep 17 00:00:00 2001
From: Zyrouge <hello@zyrouge.me>
Date: Sat, 12 Oct 2024 14:06:41 +0530
Subject: [PATCH] check if other icons exist within app dir

---
 core/appimage.go | 15 +++++++++------
 utils/files.go   | 10 ++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/core/appimage.go b/core/appimage.go
index 21adfc8..076b9c2 100644
--- a/core/appimage.go
+++ b/core/appimage.go
@@ -47,7 +47,11 @@ func (deflated *DeflatedAppImage) ExtractMetadata() (*DeflatedAppImageMetadata,
 		return nil, err
 	}
 	desktopPath := path.Join(deflated.AppDir, fmt.Sprintf("%s.desktop", execName))
-	iconPath := path.Join(deflated.AppDir, ".DirIcon")
+	_, iconPath := utils.FindFileInDir(deflated.AppDir, []string{
+		".DirIcon",
+		fmt.Sprintf("%s.png", execName),
+		fmt.Sprintf("%s.jpg", execName),
+	})
 	metadata := &DeflatedAppImageMetadata{
 		DeflatedAppImage: deflated,
 		ExecName:         execName,
@@ -72,13 +76,12 @@ func (deflated *DeflatedAppImage) ExtractExecName() (string, error) {
 }
 
 func (metadata *DeflatedAppImageMetadata) CopyIconFile(paths *AppPaths) error {
+	if metadata.IconPath == "" {
+		return nil
+	}
 	src, err := os.Open(metadata.IconPath)
 	if err != nil {
-		pngPath := path.Join(metadata.AppDir, fmt.Sprintf("%s.png", metadata.ExecName))
-		src, err = os.Open(pngPath)
-		if err != nil {
-			return err
-		}
+		return err
 	}
 	defer src.Close()
 	dest, err := os.Create(paths.Icon)
diff --git a/utils/files.go b/utils/files.go
index 20dcba2..e9ef92a 100644
--- a/utils/files.go
+++ b/utils/files.go
@@ -86,3 +86,13 @@ func WriteJsonFileAtomic[T any](name string, data *T) error {
 	}
 	return WriteFileAtomic(name, json)
 }
+
+func FindFileInDir(dir string, names []string) (bool, string) {
+	for _, x := range names {
+		p := path.Join(dir, x)
+		if _, err := os.Lstat(p); err == nil {
+			return true, p
+		}
+	}
+	return false, ""
+}