neon443/StickerSlack
1
0
Fork 0
mirror of https://github.com/neon443/StickerSlack.git synced 2026-03-11 13:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

added trie to emojihoarder

Browse Source 
added buildtrie() to build trie
added time calculation for trie building
optimised trie building in TrieTestingView
This commit is contained in:
neon443
2025-11-03 16:24:08 +00:00
parent 6507caa635
commit f6f73b641d
3 changed files with 96 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
StickerSlack/Emoji/Trie.swift
View File

@@ -93,11 +93,15 @@ struct TrieTestingView: View {
var body: some View { var body: some View {
VStack { VStack {
Button("reset", role: .destructive) {
trie.root = TrieNode()
}
Button("add emojis!") { Button("add emojis!") {
for name in hoarder.emojis.map({ $0.name }) { let start = Date().timeIntervalSince1970
trie.insert(word: name) for emoji in hoarder.emojis {
trie.insert(word: emoji.name)
} }
print("done!") print("done!", Date().timeIntervalSince1970-start)
} }
.buttonStyle(.borderedProminent) .buttonStyle(.borderedProminent)

62
StickerSlack/EmojiHoarder.swift
View File

@@ -18,19 +18,22 @@ class EmojiHoarder: ObservableObject {
private let decoder = JSONDecoder() private let decoder = JSONDecoder()
@Published var emojis: [Emoji] = [] @Published var emojis: [Emoji] = []
@Published var filteredEmojis: [Emoji] = [] @Published var trie: Trie = Trie()
@Published var filteredEmojis: [String] = []
@Published var prefix: Int = 100 @Published var prefix: Int = 100
init(localOnly: Bool = false) { init(localOnly: Bool = false) {
let localDB = loadLocalDB() let localDB = loadLocalDB()
withAnimation { self.emojis = localDB } withAnimation { self.emojis = localDB }
withAnimation { self.filteredEmojis = localDB } buildTrie()
withAnimation { self.filteredEmojis = [] }
guard !localOnly else { return } guard !localOnly else { return }
Task.detached { Task.detached {
print("start loading remote db") print("start loading remote db")
await self.loadRemoteDB() await self.loadRemoteDB()
print("end") print("end")
await self.buildTrie()
} }
} }
@@ -62,6 +65,14 @@ class EmojiHoarder: ObservableObject {
try! data.write(to: EmojiHoarder.localEmojiDB) try! data.write(to: EmojiHoarder.localEmojiDB)
} }
func buildTrie() {
let start = Date().timeIntervalSince1970
for emoji in emojis {
trie.insert(word: emoji.name)
}
print("done building trie in", Date().timeIntervalSince1970-start)
}
nonisolated nonisolated
func loadLocalDB() -> [Emoji] { func loadLocalDB() -> [Emoji] {
if let localEmojiDB = try? Data(contentsOf: EmojiHoarder.localEmojiDB) { if let localEmojiDB = try? Data(contentsOf: EmojiHoarder.localEmojiDB) {
@@ -75,7 +86,6 @@ class EmojiHoarder: ObservableObject {
async let fetched = self.fetchRemoteDB() async let fetched = self.fetchRemoteDB()
if let fetched = await fetched { if let fetched = await fetched {
withAnimation { self.emojis = fetched } withAnimation { self.emojis = fetched }
withAnimation { self.filteredEmojis = fetched }
} }
} }
@@ -97,38 +107,28 @@ class EmojiHoarder: ObservableObject {
guard let fetched = await self.fetchRemoteDB() else { return } guard let fetched = await self.fetchRemoteDB() else { return }
DispatchQueue.main.async { DispatchQueue.main.async {
withAnimation { self.emojis = fetched } withAnimation { self.emojis = fetched }
withAnimation { self.filteredEmojis = fetched }
} }
} }
func filterEmojis(by searchTerm: String) { func filterEmojis(by searchTerm: String) {
guard !searchTerm.isEmpty else { filteredEmojis = trie.search(prefix: searchTerm)
withAnimation(.interactiveSpring) { self.filteredEmojis = Array(emojis) }
return
}
Task.detached {
let filtered = await self.emojis.filter { $0.name.localizedCaseInsensitiveContains(searchTerm) }
DispatchQueue.main.async {
withAnimation(.interactiveSpring) { self.filteredEmojis = Array(filtered) }
}
}
} }
func filterEmojis(byCategory category: FilterCategory, searchTerm: String) { // func filterEmojis(byCategory category: FilterCategory, searchTerm: String) {
guard category != .none else { // guard category != .none else {
filterEmojis(by: searchTerm) // filterEmojis(by: searchTerm)
return // return
} // }
self.filterEmojis(by: searchTerm) // self.filterEmojis(by: searchTerm)
DispatchQueue.main.async { // DispatchQueue.main.async {
switch category { // switch category {
case .none: // case .none:
fallthrough // fallthrough
case .downloaded: // case .downloaded:
withAnimation(.interactiveSpring) { self.filteredEmojis = self.filteredEmojis.filter { $0.isLocal } } // withAnimation(.interactiveSpring) { self.filteredEmojis = self.filteredEmojis.filter { $0.isLocal } }
case .notDownloaded: // case .notDownloaded:
withAnimation(.interactiveSpring) { self.filteredEmojis = self.filteredEmojis.filter { !$0.isLocal } } // withAnimation(.interactiveSpring) { self.filteredEmojis = self.filteredEmojis.filter { !$0.isLocal } }
} // }
} // }
} // }
} }

109
StickerSlack/Views/ContentView.swift
View File

@@ -22,17 +22,17 @@ struct ContentView: View {
) )
} }
Button("none") { // Button("none") {
hoarder.filterEmojis(byCategory: .none, searchTerm: searchTerm) // hoarder.filterEmojis(byCategory: .none, searchTerm: searchTerm)
} // }
//
Button("downloaded") { // Button("downloaded") {
hoarder.filterEmojis(byCategory: .downloaded, searchTerm: searchTerm) // hoarder.filterEmojis(byCategory: .downloaded, searchTerm: searchTerm)
} // }
//
Button("not downloaded") { // Button("not downloaded") {
hoarder.filterEmojis(byCategory: .notDownloaded, searchTerm: searchTerm) // hoarder.filterEmojis(byCategory: .notDownloaded, searchTerm: searchTerm)
} // }
Button("delete all images") { Button("delete all images") {
Task.detached { Task.detached {
@@ -42,52 +42,59 @@ struct ContentView: View {
Text("\(hoarder.filteredEmojis.count) Emoji") Text("\(hoarder.filteredEmojis.count) Emoji")
ForEach($hoarder.filteredEmojis, id: \.self) { $emoji in if searchTerm.isEmpty {
HStack { ForEach($hoarder.emojis, id: \.self) { $emoji in
EmojiPreview( HStack {
hoarder: hoarder, EmojiPreview(
emoji: emoji hoarder: hoarder,
) emoji: emoji
.frame(maxWidth: 100, maxHeight: 100) )
Spacer() .frame(maxWidth: 100, maxHeight: 100)
Button("", systemImage: "checkmark") { Spacer()
if let sticker = emoji.sticker { Button("", systemImage: "checkmark") {
if sticker.validate() { if let sticker = emoji.sticker {
print("validation of \(emoji.name) succeeded") if sticker.validate() {
Haptic.success.trigger() print("validation of \(emoji.name) succeeded")
} else { Haptic.success.trigger()
print("validation of \(emoji.name) failed") } else {
Haptic.error.trigger() print("validation of \(emoji.name) failed")
} Haptic.error.trigger()
}
}
.buttonStyle(.plain)
if emoji.isLocal {
Button("", systemImage: "trash") {
emoji.deleteImage()
emoji.refresh()
}
.buttonStyle(.plain)
} else {
Button("", systemImage: "arrow.down.circle") {
Task.detached {
try? await emoji.downloadImage()
await MainActor.run {
emoji.refresh()
} }
} }
} }
.buttonStyle(.plain) .buttonStyle(.plain)
if emoji.isLocal {
Button("", systemImage: "trash") {
emoji.deleteImage()
emoji.refresh()
}
.buttonStyle(.plain)
} else {
Button("", systemImage: "arrow.down.circle") {
Task.detached {
try? await emoji.downloadImage()
await MainActor.run {
emoji.refresh()
}
}
}
.buttonStyle(.plain)
}
}
.swipeActions(edge: .trailing, allowsFullSwipe: true) {
if emoji.isLocal {
Button("Remove", systemImage: "trash") {
emoji.deleteImage()
emoji.refresh()
}
.tint(.red)
}
} }
} }
.swipeActions(edge: .trailing, allowsFullSwipe: true) { } else {
if emoji.isLocal { ForEach(hoarder.filteredEmojis, id: \.self) { name in
Button("Remove", systemImage: "trash") { Text(name)
emoji.deleteImage() // EmojiPreview(hoarder: hoarder, emoji: hoarder.emojis.first!)
emoji.refresh()
}
.tint(.red)
}
} }
} }
} }