From c65d1818ed77452d12d4c9d228e11bd28997c569 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Fri, 29 Apr 2022 10:39:56 +0200
Subject: [PATCH] =?UTF-8?q?ImportProgress::Collection=20=E2=86=92=20Import?=
 =?UTF-8?q?Progress::File?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ftl/core/importing.ftl                             | 1 +
 rslib/src/backend/progress.rs                      | 2 +-
 rslib/src/import_export/mod.rs                     | 2 +-
 rslib/src/import_export/package/apkg/import/mod.rs | 4 ++--
 rslib/src/import_export/package/colpkg/import.rs   | 6 +++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ftl/core/importing.ftl b/ftl/core/importing.ftl
index 027ea6d6d..27077eabc 100644
--- a/ftl/core/importing.ftl
+++ b/ftl/core/importing.ftl
@@ -78,6 +78,7 @@ importing-processed-media-file =
        *[other] Imported { $count } media files
     }
 importing-importing-collection = Importing collection...
+importing-importing-file = Importing file...
 importing-failed-to-import-media-file = Failed to import media file: { $debugInfo }
 importing-processed-notes =
     { $count ->
diff --git a/rslib/src/backend/progress.rs b/rslib/src/backend/progress.rs
index 7f7a26afb..733d06a67 100644
--- a/rslib/src/backend/progress.rs
+++ b/rslib/src/backend/progress.rs
@@ -108,7 +108,7 @@ pub(super) fn progress_to_proto(progress: Option<Progress>, tr: &I18n) -> pb::Pr
             }
             Progress::Import(progress) => pb::progress::Value::Importing(
                 match progress {
-                    ImportProgress::Collection => tr.importing_importing_collection(),
+                    ImportProgress::File => tr.importing_importing_file(),
                     ImportProgress::Media(n) => tr.importing_processed_media_file(n),
                     ImportProgress::MediaCheck(n) => tr.media_check_checked(n),
                     ImportProgress::Notes(n) => tr.importing_processed_notes(n),
diff --git a/rslib/src/import_export/mod.rs b/rslib/src/import_export/mod.rs
index 6f23ce304..bf59fd1cc 100644
--- a/rslib/src/import_export/mod.rs
+++ b/rslib/src/import_export/mod.rs
@@ -9,7 +9,7 @@ use crate::prelude::*;
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum ImportProgress {
-    Collection,
+    File,
     Media(usize),
     MediaCheck(usize),
     Notes(usize),
diff --git a/rslib/src/import_export/package/apkg/import/mod.rs b/rslib/src/import_export/package/apkg/import/mod.rs
index 6b6e8370a..112b6d8ad 100644
--- a/rslib/src/import_export/package/apkg/import/mod.rs
+++ b/rslib/src/import_export/package/apkg/import/mod.rs
@@ -42,7 +42,7 @@ impl Collection {
         path: impl AsRef<Path>,
         progress_fn: &mut ProgressFn,
     ) -> Result<OpOutput<NoteLog>> {
-        progress_fn(ImportProgress::Collection)?;
+        progress_fn(ImportProgress::File)?;
         let file = File::open(path)?;
         let archive = ZipArchive::new(file)?;
 
@@ -79,7 +79,7 @@ impl<'a> Context<'a> {
 
     fn import(&mut self) -> Result<NoteLog> {
         let mut media_map = self.prepare_media()?;
-        (self.progress_fn)(ImportProgress::Collection)?;
+        (self.progress_fn)(ImportProgress::File)?;
         let note_imports = self.import_notes_and_notetypes(&mut media_map)?;
         let imported_decks = self.import_decks_and_configs()?;
         self.import_cards_and_revlog(&note_imports.id_map, &imported_decks)?;
diff --git a/rslib/src/import_export/package/colpkg/import.rs b/rslib/src/import_export/package/colpkg/import.rs
index 1b57340d8..37a4a3753 100644
--- a/rslib/src/import_export/package/colpkg/import.rs
+++ b/rslib/src/import_export/package/colpkg/import.rs
@@ -33,7 +33,7 @@ pub fn import_colpkg(
     mut progress_fn: impl FnMut(ImportProgress) -> Result<()>,
     log: &Logger,
 ) -> Result<()> {
-    progress_fn(ImportProgress::Collection)?;
+    progress_fn(ImportProgress::File)?;
     let col_path = PathBuf::from(target_col_path);
     let mut tempfile = tempfile_in_parent_of(&col_path)?;
 
@@ -42,9 +42,9 @@ pub fn import_colpkg(
     let meta = Meta::from_archive(&mut archive)?;
 
     copy_collection(&mut archive, &mut tempfile, &meta)?;
-    progress_fn(ImportProgress::Collection)?;
+    progress_fn(ImportProgress::File)?;
     check_collection_and_mod_schema(tempfile.path())?;
-    progress_fn(ImportProgress::Collection)?;
+    progress_fn(ImportProgress::File)?;
 
     restore_media(
         &meta,