From a929a133d6bffa1b231e2048dcf6a3eb5c895dfc Mon Sep 17 00:00:00 2001
From: llama <gh@siid.sh>
Date: Tue, 18 Nov 2025 21:21:08 +0800
Subject: [PATCH] use wrapper struct

---
 rslib/src/import_export/package/apkg/import/media.rs | 3 ++-
 rslib/src/media/mod.rs                               | 6 +++---
 rslib/src/sync/media/database/client/mod.rs          | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/rslib/src/import_export/package/apkg/import/media.rs b/rslib/src/import_export/package/apkg/import/media.rs
index 32bf7c807..20543e074 100644
--- a/rslib/src/import_export/package/apkg/import/media.rs
+++ b/rslib/src/import_export/package/apkg/import/media.rs
@@ -17,6 +17,7 @@ use crate::import_export::package::media::SafeMediaEntry;
 use crate::import_export::ImportProgress;
 use crate::media::files::add_hash_suffix_to_file_stem;
 use crate::media::files::sha1_of_reader;
+use crate::media::Checksums;
 use crate::prelude::*;
 use crate::progress::ThrottlingProgressHandler;
 
@@ -75,7 +76,7 @@ impl Context<'_> {
 fn prepare_media(
     media_entries: Vec<SafeMediaEntry>,
     archive: &mut ZipArchive<File>,
-    existing_sha1s: &HashMap<String, Sha1Hash>,
+    existing_sha1s: &Checksums,
     progress: &mut ThrottlingProgressHandler<ImportProgress>,
 ) -> Result<MediaUseMap> {
     let mut media_map = MediaUseMap::default();
diff --git a/rslib/src/media/mod.rs b/rslib/src/media/mod.rs
index 259dd52f8..8a599fbec 100644
--- a/rslib/src/media/mod.rs
+++ b/rslib/src/media/mod.rs
@@ -6,7 +6,6 @@ pub mod files;
 mod service;
 
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::path::Path;
 use std::path::PathBuf;
 
@@ -22,6 +21,7 @@ use crate::progress::ThrottlingProgressHandler;
 use crate::sync::http_client::HttpSyncClient;
 use crate::sync::login::SyncAuth;
 use crate::sync::media::database::client::changetracker::ChangeTracker;
+pub use crate::sync::media::database::client::Checksums;
 use crate::sync::media::database::client::MediaDatabase;
 use crate::sync::media::database::client::MediaEntry;
 use crate::sync::media::progress::MediaSyncProgress;
@@ -157,7 +157,7 @@ impl MediaManager {
     pub fn all_checksums_after_checking(
         &self,
         progress: impl FnMut(usize) -> bool,
-    ) -> Result<HashMap<String, Sha1Hash>> {
+    ) -> Result<Checksums> {
         ChangeTracker::new(&self.media_folder, progress).register_changes(&self.db)?;
         self.db.all_registered_checksums()
     }
@@ -176,7 +176,7 @@ impl MediaManager {
 
     /// All checksums without registering changes first.
     #[cfg(test)]
-    pub(crate) fn all_checksums_as_is(&self) -> HashMap<String, [u8; 20]> {
+    pub(crate) fn all_checksums_as_is(&self) -> Checksums {
         self.db.all_registered_checksums().unwrap()
     }
 }
diff --git a/rslib/src/sync/media/database/client/mod.rs b/rslib/src/sync/media/database/client/mod.rs
index 21e57ab26..fe3e7c840 100644
--- a/rslib/src/sync/media/database/client/mod.rs
+++ b/rslib/src/sync/media/database/client/mod.rs
@@ -189,11 +189,12 @@ delete from media where fname=?",
     }
 
     /// Returns all filenames and checksums, where the checksum is not null.
-    pub(crate) fn all_registered_checksums(&self) -> error::Result<HashMap<String, Sha1Hash>> {
+    pub(crate) fn all_registered_checksums(&self) -> error::Result<Checksums> {
         self.db
             .prepare("SELECT fname, csum FROM media WHERE csum IS NOT NULL")?
             .query_and_then([], row_to_name_and_checksum)?
-            .collect()
+            .collect::<error::Result<_>>()
+            .map(Checksums)
     }
 
     pub(crate) fn force_resync(&self) -> error::Result<()> {