feat: support for multiple sums in file

Author: mkzws

libprotonup/src/downloads.rs

@@ -43,18 +43,21 @@ impl Release {
         };
         for asset in &self.assets {
             if asset.name.contains("sha512") {
+                download.file_name = asset.name.clone();
                 download.hash_sum = Some(hashing::HashSums {
                     sum_content: asset.browser_download_url.clone(),
                     sum_type: hashing::HashSumType::Sha512,
                 })
             } else if asset.name.contains("sha256") {
+                download.file_name = asset.name.clone();
                 download.hash_sum = Some(hashing::HashSums {
                     sum_content: asset.browser_download_url.clone(),
                     sum_type: hashing::HashSumType::Sha256,
                 })
             } else if compat_tool.filter_asset(asset.dowload_file_name().as_str())
                 && files::check_supported_extension(asset.name.clone()).is_ok()
             {
+                download.file_name = asset.name.clone();
                 download
                     .download_url
                     .clone_from(&asset.browser_download_url);
@@ -107,6 +110,8 @@ pub async fn list_releases(compat_tool: &CompatTool) -> Result<ReleaseList, reqw
 /// Contains all the information needed to download the corresponding release from GitHub
 #[derive(Default, Debug, PartialEq, Clone)]
 pub struct Download {
+    /// file name should be used to verify checksums if available
+    pub file_name: String,
     /// for what app this dowload is
     pub for_app: apps::AppInstallations,
     /// the tag from the Forge
@@ -233,6 +238,7 @@ mod tests {
             // "GE-Proton
             (
                 Download {
+                    file_name: "GE-Proton9-27.tar.gz".to_owned(),
                     version: "GE-Proton9-27".to_owned(),
                     hash_sum: None,
                     for_app: apps::AppInstallations::Steam,
@@ -245,6 +251,7 @@ mod tests {
             // WineGE
             (
                 Download {
+                    file_name: "wine-lutris-GE-Proton8-26-x86_64.tar.xz".to_owned(),
                     version: "GE-Proton8-26".to_owned(),
                     for_app: apps::AppInstallations::Steam,
                     hash_sum: None,

libprotonup/src/files.rs

@@ -390,6 +390,7 @@ mod test {
         );
 
         let d = Download {
+            file_name: "test".to_owned(),
             for_app: AppInstallations::Steam,
             version: "new_top_123".to_owned(),
             hash_sum: None,

libprotonup/src/hashing.rs

@@ -17,14 +17,21 @@ pub enum HashSumType {
 
 /// Checks the downloaded file integrity with the sha512sum
 pub async fn hash_check_file<R: AsyncRead + Unpin + ?Sized>(
+    file_name: &str,
     reader: &mut R,
     git_hash: HashSums,
 ) -> Result<bool> {
-    // TODO: this assumes there is only one file in the checksum
-    let (expected_hash, _) = git_hash
+    // find line with the file name
+    let expeted_hash_line = git_hash
         .sum_content
-        .as_str()
+        .lines()
+        .find(|line| line.contains(file_name));
+
+    let (expected_hash, _) = expeted_hash_line
+        // if no line found with the file name, assume the content is only the sum
+        .unwrap_or(&git_hash.sum_content)
         .rsplit_once(' ')
+        // if the split fails, assume the content is only the sum without any spaces
         .unwrap_or((&git_hash.sum_content, ""));
 
     match git_hash.sum_type {
@@ -88,6 +95,7 @@ mod test {
 
         assert!(
             super::hash_check_file(
+                "",
                 &mut &test_data[..],
                 HashSums {
                     sum_content: hash,
@@ -103,6 +111,7 @@ mod test {
 
         assert!(
             super::hash_check_file(
+                "",
                 &mut &test_data[..],
                 HashSums {
                     sum_content: hash,

libprotonup/src/sources.ron

@@ -69,7 +69,7 @@
         forge: GitHub,
         repository_account: "kron4ek",
         repository_name: "Wine-Builds",
-        tool_type: Runtime,
+        tool_type: WineBased,
         compatible_applications: [Lutris],
         release_asset_filter : Some(r"^wine-\d+\.\d+(?:\.\d+)?-amd64\.tar\.xz$"),
         file_name_template: Some("kron4ek-wine-{version}")

protonup-rs/src/download.rs

@@ -106,6 +106,7 @@ pub(crate) async fn download_file(
 }
 
 pub(crate) async fn validate_file(
+    file_name: &str,
     path: &Path,
     hash: hashing::HashSums,
     multi_progress: MultiProgress,
@@ -117,6 +118,7 @@ pub(crate) async fn validate_file(
     let hash_progress_bar = init_hash_progress(path, multi_progress).await?;
 
     if !hashing::hash_check_file(
+        file_name,
         &mut hash_progress_bar.wrap_async_read(BufReader::new(file)),
         hash,
     )
@@ -368,7 +370,7 @@ async fn download_validate_unpack(
                 sum_type: git_hash_sum.sum_type,
             };
 
-            validate_file(&file, hash_sum, multi_progress.clone()).await?;
+            validate_file(&download.file_name, &file, hash_sum, multi_progress.clone()).await?;
         }
         None => {
             println!("No sum files available, skipping");