Move recompression out of download

Author: Mark-Simulacrum

src/main.rs

@@ -161,6 +161,8 @@ impl Context {
         // to do. This represents a scenario where changes have been merged to
         // the stable/beta branch but the version bump hasn't happened yet.
         self.download_artifacts(&rev)?;
+        // Generate recompressed artifacts from the input set.
+        self.recompress(&self.dl_dir())?;
         // The bypass_startup_checks condition is after the function call since we need that
         // function to run even if we wan to discard its output (it fetches and stores the current
         // version we're about to release).
@@ -366,31 +368,18 @@ impl Context {
         // 2. We're making a stable release. The stable release is first signed
         //    with the dev key and then it's signed with the prod key later. We
         //    want the prod key to overwrite the dev key signatures.
-        //
-        // Also, collect paths that need to be recompressed
-        let mut to_recompress = Vec::new();
         for file in dl.read_dir()? {
             let file = file?;
             let path = file.path();
             match path.extension().and_then(|s| s.to_str()) {
-                // Store off the input files for potential recompression.
-                Some("xz") => {
-                    to_recompress.push(path.to_path_buf());
-                }
                 // Delete signature/hash files...
                 Some("asc") | Some("sha256") => {
                     fs::remove_file(&path)?;
                 }
-                Some("gz") if self.config.recompress_gz => {
-                    fs::remove_file(&path)?;
-                }
                 _ => {}
             }
         }
 
-        // Generate recompressed artifacts from the input set.
-        self.recompress(to_recompress)?;
-
         Ok(())
     }
 

src/recompress.rs

@@ -14,12 +14,28 @@ use crate::Context;
 use std::fmt::Write as FmtWrite;
 use std::fs::{self, File};
 use std::io::{self, Read, Write};
-use std::path::PathBuf;
+use std::path::Path;
 use std::time::{Duration, Instant};
 use xz2::read::XzDecoder;
 
 impl Context {
-    pub fn recompress(&self, mut to_recompress: Vec<PathBuf>) -> anyhow::Result<()> {
+    pub fn recompress(&self, directory: &Path) -> anyhow::Result<()> {
+        let mut to_recompress = Vec::new();
+        for file in directory.read_dir()? {
+            let file = file?;
+            let path = file.path();
+            match path.extension().and_then(|s| s.to_str()) {
+                // Store off the input files for potential recompression.
+                Some("xz") => {
+                    to_recompress.push(path.to_path_buf());
+                }
+                Some("gz") if self.config.recompress_gz => {
+                    fs::remove_file(&path)?;
+                }
+                _ => {}
+            }
+        }
+
         println!(
             "starting to recompress {} files across {} threads",
             to_recompress.len(),