Add suffix to imported item name if exists

Flipper/Packages/Core/Sources/Archive/Archive.swift

@@ -162,15 +162,19 @@ extension Archive {
         deletedItems.append(item)
     }
 
-    public func restore(_ item: ArchiveItem) async throws {
-        let newPath = try await mobileArchive.nextAvailablePath(for: item.path)
-        var newItem = try ArchiveItem(
-            filename: newPath.lastComponent ?? "",
+    public func copyIfExists(_ item: ArchiveItem) async throws -> ArchiveItem {
+        let path = try await mobileArchive.nextAvailablePath(for: item.path)
+        return try ArchiveItem(
+            filename: path.lastComponent ?? "",
             properties: item.properties,
             shadowCopy: item.shadowCopy)
-        newItem.status = status(for: newItem)
-        try await upsert(newItem)
-        try await wipe(newItem)
+    }
+
+    public func restore(_ item: ArchiveItem) async throws {
+        var item = try await copyIfExists(item)
+        item.status = status(for: item)
+        try await upsert(item)
+        try await wipe(item)
     }
 
     public func restoreAll() async throws {

Flipper/Packages/Core/Sources/Archive/ArchiveProtocol.swift

@@ -47,10 +47,13 @@ extension ArchiveProtocol {
         // format: name_{Int}.type
         let parts = name.value.split(separator: "_")
 
-        let namePrefix = parts.count >= 2
+        var hasNumberSuffix: Bool {
+            parts.count >= 2 && Int(parts.last.unsafelyUnwrapped) != nil
+        }
+        let namePrefix = hasNumberSuffix
             ? parts.dropLast().joined(separator: "_")
             : parts.joined(separator: "_")
-        var number = parts.count >= 2
+        var number = hasNumberSuffix
             ? Int(parts.last.unsafelyUnwrapped) ?? 1
             : 1
 

Flipper/Packages/Core/Sources/State/AppState.swift

@@ -239,7 +239,8 @@ public class AppState {
 
     private func onOpenKeyURL(_ url: URL) async throws {
         let item = try await Sharing.importKey(from: url)
-        importQueue = [item]
+        let newItem = try await archive.copyIfExists(item)
+        importQueue = [newItem]
         logger.info("key url opened")
     }
 

Flipper/Packages/UI/Sources/Archive/ArchiveViewModel.swift

@@ -37,7 +37,7 @@ class ArchiveViewModel: ObservableObject {
     @Published var showSearchView = false
     @Published var hasImportedItem = false
 
-    var importedItem: ArchiveItem? {
+    var importedItem: ArchiveItem {
         appState.importQueue.removeFirst()
     }
 

Flipper/Packages/UI/Sources/Archive/Import/ImportViewModel.swift

@@ -20,9 +20,9 @@ class ImportViewModel: ObservableObject {
     let appState: AppState = .shared
     var dismissPublisher = PassthroughSubject<Void, Never>()
 
-    init(item: ArchiveItem?) {
-        self.item = item ?? .none
-        self.backup = item ?? .none
+    init(item: ArchiveItem) {
+        self.item = item
+        self.backup = item
         recordImport()
     }