Fix importing emojis not working.

ginsudev · Jan 4, 2023 · 302b032 · 302b032
1 parent 172643f
commit 302b032
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/WDBFontOverwrite/ContentView.ViewModel.swift b/WDBFontOverwrite/ContentView.ViewModel.swift
@@ -102,14 +102,27 @@ extension ContentView {
         ]
 
         func batchOverwriteFonts() async {
+            guard selectedCustomFontType == .font else {
+                // Overwrite emoji
+                let emojiFont = FontMap.emojiCustomFont
+                overwriteWithCustomFont(
+                    name: emojiFont.localPath,
+                    targetPath: emojiFont.targetPath,
+                    progress: progress
+                ) {
+                    self.progress = nil
+                    self.message = $0
+                }
+                return
+            }
+
             let fileManager = FileManager.default
             let documentsDirectory = fileManager.urls(
                 for: .documentDirectory,
                 in: .userDomainMask
             )[0]
             do {
-                let fonts = try fileManager.contentsOfDirectory(atPath: documentsDirectory.relativePath)
-                print(fonts)
+                let fonts = try fileManager.contentsOfDirectory(atPath: documentsDirectory.relativePath).filter({!$0.contains("AppleColorEmoji")})
                 for font in fonts {
                     let key = FontMap.key(forFont: font)
                     if let customFont = FontMap.fontMap[key] {

diff --git a/WDBFontOverwrite/ContentView.swift b/WDBFontOverwrite/ContentView.swift
@@ -29,7 +29,7 @@ struct ContentView: View {
         .navigationViewStyle(.stack)
         .sheet(isPresented: $viewModel.importPresented) {
             DocumentPicker(
-                importType: viewModel.importType,
+                importType: viewModel.selectedCustomFontType,
                 ttcRepackMode: viewModel.importTTCRepackMode
             ) {
                 viewModel.message = $0

diff --git a/WDBFontOverwrite/FontMap.swift b/WDBFontOverwrite/FontMap.swift
@@ -10,7 +10,7 @@ import Foundation
 struct FontMap {
     static var fontMap = [String: CustomFont]()
 
-    static var emojiCustomFont = CustomFont(
+    static let emojiCustomFont = CustomFont(
         name: "Emoji",
         targetPath: .many([
             "/System/Library/Fonts/CoreAddition/AppleColorEmoji-160px.ttc",