From 8b825ea98e2d183a51a9d48ea014eea6c008f7e6 Mon Sep 17 00:00:00 2001 From: Miltiadis Vasilakis Date: Wed, 26 Feb 2025 15:23:28 +0200 Subject: [PATCH] Simplify RecognizerController.Update.Kind --- ZShare/ViewModels/ExtensionViewModel.swift | 2 +- Zotero/Controllers/RecognizerController.swift | 8 ++------ Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ZShare/ViewModels/ExtensionViewModel.swift b/ZShare/ViewModels/ExtensionViewModel.swift index 86e4ebee7..fa4cdc9e2 100644 --- a/ZShare/ViewModels/ExtensionViewModel.swift +++ b/ZShare/ViewModels/ExtensionViewModel.swift @@ -549,7 +549,7 @@ final class ExtensionViewModel { case .cancelled: updateState(with: .processed) - case .recognitionInProgress, .remoteRecognitionInProgress, .identifierLookupInProgress: + case .inProgress: updateState(with: .decoding) case .translated(let item): diff --git a/Zotero/Controllers/RecognizerController.swift b/Zotero/Controllers/RecognizerController.swift index 26aba09e6..ae32fb1b1 100644 --- a/Zotero/Controllers/RecognizerController.swift +++ b/Zotero/Controllers/RecognizerController.swift @@ -72,9 +72,7 @@ final class RecognizerController { case failed(Error) case cancelled case enqueued - case recognitionInProgress - case remoteRecognitionInProgress(data: [String: Any]) - case identifierLookupInProgress(response: RemoteRecognizerResponse, identifier: String) + case inProgress case translated(itemResponse: ItemResponse) case createdParent(item: RItem) } @@ -179,7 +177,7 @@ final class RecognizerController { func start(task: Task, subject: PublishSubject) { subjectsByTask[task] = subject statesByTask[task] = .recognitionInProgress - emmitUpdate(for: task, subject: subject, kind: .recognitionInProgress) + emmitUpdate(for: task, subject: subject, kind: .inProgress) pdfWorkerController.queue(work: PDFWorkerController.PDFWork(file: task.file, kind: .recognizer)) .subscribe(onNext: { update in @@ -225,7 +223,6 @@ final class RecognizerController { return } statesByTask[task] = .remoteRecognitionInProgress(data: data) - emmitUpdate(for: task, subject: subject, kind: .remoteRecognitionInProgress(data: data)) apiClient.send(request: RecognizerRequest(parameters: data)).subscribe( onSuccess: { (response: (RemoteRecognizerResponse, HTTPURLResponse)) in @@ -327,7 +324,6 @@ final class RecognizerController { enqueueNextIdentifierLookup(for: task) return } - emmitUpdate(for: task, subject: subject, kind: .identifierLookupInProgress(response: response, identifier: identifier)) lookupWebViewHandler.lookUp(identifier: identifier) func getLookupWebViewHandler(for task: Task) -> LookupWebViewHandler? { diff --git a/Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift b/Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift index ea86f895c..bdc0e076f 100644 --- a/Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift +++ b/Zotero/Scenes/Detail/Items/Models/ItemCellModel.swift @@ -142,7 +142,7 @@ struct ItemCellModel { text = creatorSummary(for: item) animated = false - case .enqueued, .recognitionInProgress, .remoteRecognitionInProgress, .identifierLookupInProgress, .translated: + case .enqueued, .inProgress, .translated: text = L10n.Items.retrievingMetadata animated = true }