close ZIM files

kiwix · Oct 18, 2024 · 5f67f92 · 5f67f92
1 parent c78d229
commit 5f67f92
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/SwiftUI/Patches.swift b/SwiftUI/Patches.swift
@@ -71,6 +71,7 @@ extension Notification.Name {
     static let alert = Notification.Name("alert")
     static let openFiles = Notification.Name("openFiles")
     static let openURL = Notification.Name("openURL")
+    static let closeZIM = Notification.Name("closeZIM")
     static let exportFileData = Notification.Name("exportFileData")
     static let saveContent = Notification.Name("saveContent")
     static let toggleSidebar = Notification.Name("toggleSidebar")
@@ -93,6 +94,12 @@ extension NotificationCenter {
         )
     }
 
+    static func closeZIM(_ zimId: UUID) {
+        NotificationCenter.default.post(name: .closeZIM,
+                                        object: nil,
+                                        userInfo: ["zimId": zimId])
+    }
+
     static func openFiles(_ urls: [URL], context: OpenFileContext) {
         NotificationCenter.default.post(name: .openFiles, object: nil, userInfo: ["urls": urls, "context": context])
     }

diff --git a/ViewModel/BrowserViewModel.swift b/ViewModel/BrowserViewModel.swift
@@ -91,6 +91,8 @@ final class BrowserViewModel: NSObject, ObservableObject,
 #endif
     let webView: WKWebView
     private var isLoadingObserver: NSKeyValueObservation?
+    private let closeZimPublisher = NotificationCenter.default.publisher(for: .closeZIM)
+    private var cancellables = Set<AnyCancellable>()
     private var canGoBackObserver: NSKeyValueObservation?
     private var canGoForwardObserver: NSKeyValueObservation?
     private var titleURLObserver: AnyCancellable?
@@ -171,6 +173,24 @@ final class BrowserViewModel: NSObject, ObservableObject,
                 }
             }
         }
+        closeZimPublisher.sink { [weak self] notification in
+            guard let zimIdToClose = notification.userInfo?["zimId"] as? UUID else {
+                return
+            }
+            guard let url = self?.url, url.isZIMURL,
+                  let currentHost = url.host(),
+                  let currentZimId = UUID(uuidString: currentHost),
+                  zimIdToClose == currentZimId else {
+                return
+            }
+            Task {
+                await self?.webView.closeAllMediaPresentations()
+                #if os(macOS)
+                self?.webView.window?.close()
+                #endif
+            }
+        }.store(in: &cancellables)
+
     }
 
     /// Get the webpage in a binary format

diff --git a/Views/Library/ZimFileDetail.swift b/Views/Library/ZimFileDetail.swift
@@ -143,7 +143,9 @@ struct ZimFileDetail: View {
                 message: Text("zim_file.action.unlink.message".localized),
                 primaryButton: .destructive(Text("zim_file.action.unlink.button.title".localized)) {
                     Task {
+                        let tabIds = zimFile.tabs.map { $0.objectID }
                         await LibraryOperations.unlink(zimFileID: zimFile.fileID)
+                        closeZIM(zimFileId: zimFile.fileID)
                         #if os(iOS)
                         dismiss()
                         #endif
@@ -154,6 +156,11 @@ struct ZimFileDetail: View {
         }
     }
 
+    @MainActor
+    func closeZIM(zimFileId: UUID) {
+        NotificationCenter.closeZIM(zimFileId)
+    }
+
     var deleteAction: some View {
         Action(title: "zim_file.action.delete.title".localized, isDestructive: true) {
             isPresentingDeleteAlert = true
@@ -164,6 +171,7 @@ struct ZimFileDetail: View {
                 primaryButton: .destructive(Text("zim_file.action.delete.button.title".localized)) {
                     Task {
                         await LibraryOperations.delete(zimFileID: zimFile.fileID)
+                        closeZIM(zimFileId: zimFile.fileID)
                         #if os(iOS)
                         dismiss()
                         #endif