Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[ensu] Avoid blocking startup during model migration

setalp58ff83d6cd08
diff --git a/apple/apps/ensu/Ensu/EnsuApp.swift b/apple/apps/ensu/Ensu/EnsuApp.swift
index fc391fa240..73b97e94e8 100644
--- a/apple/apps/ensu/Ensu/EnsuApp.swift
+++ b/apple/apps/ensu/Ensu/EnsuApp.swift
@@ -2,17 +2,17 @@ import SwiftUI
@main
struct EnsuApp: App {
- private let assetStore: AssetStore
+ private let assetStoreTask: Task<AssetStore, Never>
init() {
EnsuLogging.shared.start()
AssetStore.registerBackgroundTask()
- assetStore = AssetStore()
+ assetStoreTask = Task { await AssetStore() }
}
var body: some Scene {
WindowGroup {
- RootView(assetStore: assetStore)
+ RootView(assetStoreTask: assetStoreTask)
}
}
}
diff --git a/apple/apps/ensu/Ensu/RootView.swift b/apple/apps/ensu/Ensu/RootView.swift
index 586ff0becd..1d67648921 100644
--- a/apple/apps/ensu/Ensu/RootView.swift
+++ b/apple/apps/ensu/Ensu/RootView.swift
@@ -1,16 +1,24 @@
import SwiftUI
struct RootView: View {
- let assetStore: AssetStore
+ let assetStoreTask: Task<AssetStore, Never>
+ @State private var assetStore: AssetStore?
var body: some View {
ZStack {
EnsuColor.backgroundBase
.ignoresSafeArea()
- HomeView(assetStore: assetStore)
+ if let assetStore {
+ HomeView(assetStore: assetStore)
+ } else {
+ ProgressView()
+ }
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.tint(EnsuColor.action)
+ .task {
+ assetStore = await assetStoreTask.value
+ }
}
}
diff --git a/apple/apps/ensu/Ensu/Services/AssetStore.swift b/apple/apps/ensu/Ensu/Services/AssetStore.swift
index 9b0f9f4414..e604a77eaa 100644
--- a/apple/apps/ensu/Ensu/Services/AssetStore.swift
+++ b/apple/apps/ensu/Ensu/Services/AssetStore.swift
@@ -7,7 +7,7 @@ final class AssetStore: @unchecked Sendable {
private let core: AssetStoreCore
@MainActor
- init() {
+ init() async {
let baseDir = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first
?? FileManager.default.temporaryDirectory
var assetsDir = baseDir.appendingPathComponent("assets", isDirectory: true)
@@ -21,15 +21,15 @@ final class AssetStore: @unchecked Sendable {
let legacyModelUrl = pendingSelection && settings.bool(forKey: "ensu.model.use_custom")
? settings.string(forKey: "ensu.model.url")
: nil
- let presetId = migrateEnsuAssets(
- assetsDir: assetsDir.path,
- legacy: LegacyAssets(
- llmDir: baseDir.appendingPathComponent("llm", isDirectory: true).path,
- transcriptionDir: baseDir.appendingPathComponent("transcription", isDirectory: true).path,
- modelUrl: legacyModelUrl,
- mmprojUrl: settings.string(forKey: "ensu.model.mmproj")
- )
+ let legacy = LegacyAssets(
+ llmDir: baseDir.appendingPathComponent("llm", isDirectory: true).path,
+ transcriptionDir: baseDir.appendingPathComponent("transcription", isDirectory: true).path,
+ modelUrl: legacyModelUrl,
+ mmprojUrl: settings.string(forKey: "ensu.model.mmproj")
)
+ let presetId = await Task.detached(priority: .userInitiated) { [assetsDir] in
+ migrateEnsuAssets(assetsDir: assetsDir.path, legacy: legacy)
+ }.value
if pendingSelection {
settings.set(presetId ?? "", forKey: "ensu.model.id")
}
diff --git a/rust/crates/ensu/src/model/migrations.rs b/rust/crates/ensu/src/model/migrations.rs
index db83ec14a8..e834754bda 100644
--- a/rust/crates/ensu/src/model/migrations.rs
+++ b/rust/crates/ensu/src/model/migrations.rs
@@ -204,12 +204,12 @@ fn adopt_flat_targets(store: &AssetStore, targets: &[LlmMigration], flat_dir: &P
_ => None,
}
})
- .collect::<Vec<_>>();
- if sources.iter().any(Option::is_none) {
+ .collect::<Option<Vec<_>>>();
+ let Some(sources) = sources else {
continue;
- }
+ };
for (file, source) in target.files.iter().zip(sources) {
- if let Some(Some(source)) = source {
+ if let Some(source) = source {
complete &= move_file(&source, &destination.join(file.name));
}
}