* improve search speed

* improve search accuracy

Author: underthestars-zhy

IconChanger.xcodeproj/project.pbxproj

@@ -14,6 +14,8 @@
 		900D1CF8281936C7007ABB12 /* FullDiskPermision.swift in Sources */ = {isa = PBXBuildFile; fileRef = 900D1CF7281936C7007ABB12 /* FullDiskPermision.swift */; };
 		900D1CFA281938D6007ABB12 /* IconList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 900D1CF9281938D6007ABB12 /* IconList.swift */; };
 		9017B5F8294DBBA9005709C6 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = 9017B5F7294DBBA9005709C6 /* Sparkle */; };
+		9017B5FA294ED626005709C6 /* IconRes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9017B5F9294ED626005709C6 /* IconRes.swift */; };
+		9017B5FC294EDAB4005709C6 /* LocalImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9017B5FB294EDAB4005709C6 /* LocalImageView.swift */; };
 		9053434F286B2A6800237F98 /* AutoUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9053434E286B2A6800237F98 /* AutoUpdater.swift */; };
 		90534352286C8BDA00237F98 /* fileicon in Resources */ = {isa = PBXBuildFile; fileRef = 90534351286C8BDA00237F98 /* fileicon */; };
 		9053438B287550C200237F98 /* helper.sh in Resources */ = {isa = PBXBuildFile; fileRef = 9053438A287534C300237F98 /* helper.sh */; };
@@ -44,6 +46,8 @@
 		900D1CEF281934C8007ABB12 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		900D1CF7281936C7007ABB12 /* FullDiskPermision.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FullDiskPermision.swift; sourceTree = "<group>"; };
 		900D1CF9281938D6007ABB12 /* IconList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconList.swift; sourceTree = "<group>"; };
+		9017B5F9294ED626005709C6 /* IconRes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconRes.swift; sourceTree = "<group>"; };
+		9017B5FB294EDAB4005709C6 /* LocalImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalImageView.swift; sourceTree = "<group>"; };
 		9053434D286B2A2900237F98 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		9053434E286B2A6800237F98 /* AutoUpdater.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutoUpdater.swift; sourceTree = "<group>"; };
 		90534350286B441900237F98 /* sparkle.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = sparkle.xml; sourceTree = "<group>"; };
@@ -128,6 +132,8 @@
 				90B57C21286ACBA700EE52D3 /* StringTest.playground */,
 				90534350286B441900237F98 /* sparkle.xml */,
 				9053438A287534C300237F98 /* helper.sh */,
+				9017B5F9294ED626005709C6 /* IconRes.swift */,
+				9017B5FB294EDAB4005709C6 /* LocalImageView.swift */,
 			);
 			path = IconChanger;
 			sourceTree = "<group>";
@@ -241,7 +247,9 @@
 				900D1CEB281934C7007ABB12 /* ContentView.swift in Sources */,
 				908A792C281A759A00951B15 /* SettingView.swift in Sources */,
 				908A790B281A128700951B15 /* Request.swift in Sources */,
+				9017B5FA294ED626005709C6 /* IconRes.swift in Sources */,
 				908A78FB2819640800951B15 /* IconManager.swift in Sources */,
+				9017B5FC294EDAB4005709C6 /* LocalImageView.swift in Sources */,
 				90B57B8028695BDF00EE52D3 /* AliasName.swift in Sources */,
 				900D1CE9281934C7007ABB12 /* IconChangerApp.swift in Sources */,
 				900D1CFA281938D6007ABB12 /* IconList.swift in Sources */,

IconChanger/ChangeView.swift

@@ -14,8 +14,9 @@ struct ChangeView: View {
                  GridItem(.flexible(), alignment: .top),
                  GridItem(.flexible(), alignment: .top)]
 
-    @State var icons: [URL] = []
+    @State var icons: [IconRes] = []
     @State var inIcons: [URL] = []
+    @State var showProgress = false
     let setPath: LaunchPadManagerDBHelper.AppInfo
 
     @Environment(\.presentationMode) var presentationMode
@@ -32,12 +33,19 @@ struct ChangeView: View {
                         ProgressView()
                     }
                 } else {
-                    LazyVGrid(columns: rules) {
-                        ForEach(icons, id: \.self) { icon in
-                            ImageView(url: icon, setPath: setPath)
+                    ZStack {
+                        LazyVGrid(columns: rules) {
+                            ForEach(icons, id: \.self) { icon in
+                                ImageView(icon: icon, setPath: setPath, showPro: $showProgress)
+                            }
+
+                            Spacer()
                         }
+                        .disabled(showProgress)
 
-                        Spacer()
+                        if showProgress {
+                            ProgressView()
+                        }
                     }
                 }
             }
@@ -48,7 +56,7 @@ struct ChangeView: View {
             ScrollView(showsIndicators: false) {
                 LazyVGrid(columns: rules) {
                     ForEach(inIcons, id: \.self) { icon in
-                        ImageView(url: icon, setPath: setPath)
+                        LocalImageView(url: icon, setPath: setPath)
                     }
 
                     Spacer()

IconChanger/IconList.swift

@@ -29,9 +29,6 @@ struct IconList: View {
                     ForEach(iconManager.apps, id: \.url) { app in
                         IconView(app: app, setPath: $setPath, searchText: $searchText, setAlias: $setAlias)
                     }
-                    .onAppear {
-                        print(iconManager.apps.map(\.name))
-                    }
                 }
             }
         }

IconChanger/IconManager.swift

@@ -160,20 +160,20 @@ class IconManager: ObservableObject {
         return String(url[count..<endCount] ?? "")
     }
 
-    func getIcons(_ app: LaunchPadManagerDBHelper.AppInfo) async throws -> [URL] {
+    func getIcons(_ app: LaunchPadManagerDBHelper.AppInfo) async throws -> [IconRes] {
         let appName = app.name
         let urlName = AliasName.getNames(for: app.url.deletingPathExtension().lastPathComponent) ?? app.url.deletingPathExtension().lastPathComponent
         let bundleName = try getAppBundleName(app)
 
-        var urls = [URL]()
+        var res = [IconRes]()
 
-        urls.append(contentsOf: try await MyQueryRequestController().sendRequest(appName))
-        urls.append(contentsOf: try await MyQueryRequestController().sendRequest(urlName))
+        res.append(contentsOf: try await MyQueryRequestController().sendRequest(appName))
+        res.append(contentsOf: try await MyQueryRequestController().sendRequest(urlName))
         if let bundleName {
-            urls.append(contentsOf: try await MyQueryRequestController().sendRequest(bundleName))
+            res.append(contentsOf: try await MyQueryRequestController().sendRequest(bundleName))
         }
 
-        return Set(urls).map { $0 }
+        return Set(res).map { $0 }
     }
 
     func getAppBundleName(_ app: LaunchPadManagerDBHelper.AppInfo) throws -> String? {

IconChanger/IconRes.swift

@@ -0,0 +1,15 @@
+//
+//  IconRes.swift
+//  IconChanger
+//
+//  Created by 朱浩宇 on 2022/12/18.
+//
+
+import Foundation
+
+struct IconRes: Hashable {
+    let appName: String
+    let icnsUrl: URL
+    let lowResPngUrl: URL
+    let downloads: Int
+}

IconChanger/ImageView.swift

@@ -9,24 +9,36 @@ import SwiftUI
 import LaunchPadManagerDBHelper
 
 struct ImageView: View {
-    let url: URL
+    let icon: IconRes
     let setPath: LaunchPadManagerDBHelper.AppInfo
+    @State var preveiw: NSImage?
 
-    @State var nsimage: NSImage?
+    @Binding var showPro: Bool
 
     @Environment(\.presentationMode) var presentationMode
 
     var body: some View {
-        if let nsimage = nsimage {
-            Image(nsImage: nsimage)
+        if let preveiw = preveiw {
+            Image(nsImage: preveiw)
                 .resizable()
                 .scaledToFit()
                 .onTapGesture {
-                    do {
-                        try IconManager.shared.setImage(nsimage, app: setPath)
-                        presentationMode.wrappedValue.dismiss()
-                    } catch {
-                        print(error)
+                    Task {
+                        do {
+                            showPro = true
+
+                            guard let nsimage = try await MyRequestController().sendRequest(icon.icnsUrl) else {
+                                showPro = false
+                                return
+                            }
+                            try IconManager.shared.setImage(nsimage, app: setPath)
+
+                            showPro = false
+                            presentationMode.wrappedValue.dismiss()
+
+                        } catch {
+                            print(error)
+                        }
                     }
                 }
         } else {
@@ -38,7 +50,7 @@ struct ImageView: View {
                 }
                 .task {
                     do {
-                        nsimage = try await MyRequestController().sendRequest(url)
+                        preveiw = try await MyRequestController().sendRequest(icon.lowResPngUrl)
                     } catch {
                         print(error)
                     }

IconChanger/LocalImageView.swift

@@ -0,0 +1,60 @@
+//
+//  LocalImageView.swift
+//  IconChanger
+//
+//  Created by 朱浩宇 on 2022/12/18.
+//
+
+import SwiftUI
+import LaunchPadManagerDBHelper
+
+struct LocalImageView: View {
+    let url: URL
+    let setPath: LaunchPadManagerDBHelper.AppInfo
+
+    @State var nsimage: NSImage?
+
+    @Environment(\.presentationMode) var presentationMode
+
+    var body: some View {
+        if let nsimage = nsimage {
+            Image(nsImage: nsimage)
+                .resizable()
+                .scaledToFit()
+                .onTapGesture {
+                    do {
+                        try IconManager.shared.setImage(nsimage, app: setPath)
+                        presentationMode.wrappedValue.dismiss()
+                    } catch {
+                        print(error)
+                    }
+                }
+        } else {
+            Image("Unknown")
+                .resizable()
+                .scaledToFit()
+                .overlay {
+                    ProgressView()
+                }
+                .task {
+                    do {
+                        nsimage = try await MyRequestController().sendRequest(url)
+                    } catch {
+                        print(error)
+                    }
+                }
+        }
+    }
+
+    func saveImage(_ image: NSImage) -> Data? {
+        guard
+            let cgImage = image.cgImage(forProposedRect: nil, context: nil, hints: nil)
+            else { return nil } // TODO: handle error
+        let newRep = NSBitmapImageRep(cgImage: cgImage)
+        newRep.size = image.size // if you want the same size
+        guard
+            let pngData = newRep.representation(using: .png, properties: [:])
+            else { return nil } // TODO: handle error
+        return pngData
+    }
+}

IconChanger/Request.swift

@@ -55,7 +55,7 @@ class MyRequestController {
 }
 
 class MyQueryRequestController {
-    func sendRequest(_ query: String) async throws -> [URL] {
+    func sendRequest(_ query: String) async throws -> [IconRes] {
         /* Configure session, choose between:
          * defaultSessionConfiguration
          * ephemeralSessionConfiguration
@@ -102,13 +102,21 @@ class MyQueryRequestController {
 
         let json = try JSON(data: data)
         print(json)
-        let hits = json["hits"].arrayValue
+        let res = json["hits"].arrayValue.compactMap { hit in
+            if let lowResPngUrl = hit["lowResPngUrl"].url, let icnsUrl = hit["icnsUrl"].url {
+                return IconRes(appName: hit["appName"].stringValue, icnsUrl: icnsUrl, lowResPngUrl: lowResPngUrl, downloads: hit["downloads"].intValue)
+            } else {
+                return nil
+            }
+        }
 
-        return hits.map { json in
-            (Foundation.URL(string: json["icnsUrl"].stringValue), json["downloads"].intValue)
-        }.sorted { hit1, hit2 in
-            hit1.1 > hit2.1
-        }.compactMap(\.0)
+        return res
+            .filter {
+                $0.appName.lowercased().replace(target: " ", withString: "").contains(query.lowercased().replace(target: " ", withString: ""))
+            }
+            .sorted { res1, res2 in
+                res1.downloads > res2.downloads
+            }
     }
 
     func qeuryMix(_ query: String) -> String {