format: run cargo fmt

src/changelog.rs

@@ -1,14 +1,18 @@
+use chrono::Local;
+use git2::{Oid, Repository, Sort};
+use regex::Regex;
 use std::fs::File;
 use std::io::{self, BufRead, Read, Write};
 use std::path::Path;
-use regex::Regex;
-use chrono::Local;
-use git2::{Repository, Sort, Oid};
 
 /*
 * Automatically generate a changelog entry from a commit history and previous changelog
 */
-pub fn generate_entry(changelog_file: &str, cwd: Option<&Path>, user_version: Option<&str>) -> Result<(), Box<dyn std::error::Error>> {
+pub fn generate_entry(
+    changelog_file: &str,
+    cwd: Option<&Path>,
+    user_version: Option<&str>,
+) -> Result<(), Box<dyn std::error::Error>> {
     let changelog_path = if let Some(path) = cwd {
         path.join(changelog_file)
     } else {
@@ -28,18 +32,6 @@ pub fn generate_entry(changelog_file: &str, cwd: Option<&Path>, user_version: Op
     let repo = Repository::open(&repo_path)?;
 
     // 3. Find commits since the tag corresponding to the version
-    // We assume the tag format is "debian/<version>" or just "<version>" or "v<version>"
-    // But usually for Debian packages it might be "debian/<version>"
-    // Let's try to find a tag that matches.
-    
-    // For now, let's assume the tag is simply the version string, or debian/version
-    // If we can't find a tag, we might have to error out or take all commits?
-    // Let's try to find the tag.
-    
-    // Actually, usually we want to generate an entry for a NEW version based on changes since the OLD version.
-    // The `changelog_file` passed here is the EXISTING changelog.
-    // So `version` is the PREVIOUS version.
-    // We want to find commits since `version`.
 
     let commits = get_commits_since_version(&repo, &old_version)?;
 
@@ -48,20 +40,6 @@ pub fn generate_entry(changelog_file: &str, cwd: Option<&Path>, user_version: Op
         // return Ok(());
     }
 
-    // 4. Format the new entry
-    // We don't know the NEW version yet, so we might use "UNRELEASED" or increment the version.
-    // For now, let's use "UNRELEASED" and let the user edit it, or maybe we can try to increment it.
-    // The requirement says "Automatically generate a changelog entry".
-    // Usually tools like `dch` add a new entry.
-    
-    // Let's create a new entry with "UNRELEASED" distribution and incremented version?
-    // Or just append to the top.
-    
-    // Let's assume we want to output the new entry to stdout or prepend to file?
-    // The function signature returns (), so maybe it modifies the file.
-    
-    // Let's prepend to the file.
-
     // Compute new version if needed, or use user-supplied one
     let new_version = if let Some(version) = user_version {
         version.to_string()
@@ -71,7 +49,14 @@ pub fn generate_entry(changelog_file: &str, cwd: Option<&Path>, user_version: Op
     };
 
     let (maintainer_name, maintainer_email) = get_maintainer_info()?;
-    let new_entry = format_entry(&package, &new_version, &series, &commits, &maintainer_name, &maintainer_email);
+    let new_entry = format_entry(
+        &package,
+        &new_version,
+        &series,
+        &commits,
+        &maintainer_name,
+        &maintainer_email,
+    );
 
     prepend_to_file(&changelog_path, &new_entry)?;
 
@@ -84,7 +69,12 @@ pub fn generate_entry(changelog_file: &str, cwd: Option<&Path>, user_version: Op
 * Compute the next (most probable) version number of a package, from old version and
 * conditions on changes (is ubuntu upload, is a no change rebuild, is a non-maintainer upload)
 */
-fn compute_new_version(old_version: &str, is_ubuntu: bool, is_rebuild: bool, is_nmu: bool) -> String {
+fn compute_new_version(
+    old_version: &str,
+    is_ubuntu: bool,
+    is_rebuild: bool,
+    is_nmu: bool,
+) -> String {
     if is_ubuntu {
         return increment_suffix(old_version, "ubuntu");
     }
@@ -137,7 +127,9 @@ fn increment_suffix(version: &str, suffix: &str) -> String {
 /*
 * Parse a changelog file first entry header, to obtain (package, version, series)
 */
-fn parse_changelog_header(path: &Path) -> Result<(String, String, String), Box<dyn std::error::Error>> {
+fn parse_changelog_header(
+    path: &Path,
+) -> Result<(String, String, String), Box<dyn std::error::Error>> {
     let file = File::open(path)?;
     let mut reader = io::BufReader::new(file);
     let mut first_line = String::new();
@@ -158,7 +150,10 @@ fn parse_changelog_header(path: &Path) -> Result<(String, String, String), Box<d
 /*
 * Obtain all commit messages as a list since a tagged version in a git repository
 */
-fn get_commits_since_version(repo: &Repository, version: &str) -> Result<Vec<String>, Box<dyn std::error::Error>> {
+fn get_commits_since_version(
+    repo: &Repository,
+    version: &str,
+) -> Result<Vec<String>, Box<dyn std::error::Error>> {
     let mut revwalk = repo.revwalk()?;
     revwalk.set_sorting(Sort::TIME)?;
 
@@ -205,7 +200,7 @@ fn get_commits_since_version(repo: &Repository, version: &str) -> Result<Vec<Str
         let message = commit.message().unwrap_or("").trim();
         let summary = message.lines().next().unwrap_or("").to_string();
         if !summary.is_empty() {
-             commits.push(summary);
+            commits.push(summary);
         }
     }
 
@@ -216,11 +211,21 @@ fn get_commits_since_version(repo: &Repository, version: &str) -> Result<Vec<Str
 * Create a changelog entry from information, i.e. format that information
 * into a changelog entry
 */
-fn format_entry(package: &str, version: &str, series: &str, changes: &[String], maintainer_name: &str, maintainer_email: &str) -> String {
+fn format_entry(
+    package: &str,
+    version: &str,
+    series: &str,
+    changes: &[String],
+    maintainer_name: &str,
+    maintainer_email: &str,
+) -> String {
     let mut entry = String::new();
 
     // Header: package, version and distribution series
-    entry.push_str(&format!("{} ({}) {}; urgency=medium\n\n", package, version, series));
+    entry.push_str(&format!(
+        "{} ({}) {}; urgency=medium\n\n",
+        package, version, series
+    ));
 
     // Changes
     for change in changes {
@@ -232,7 +237,10 @@ fn format_entry(package: &str, version: &str, series: &str, changes: &[String],
 
     // Footer: date, maintainer
     let date = Local::now().format("%a, %d %b %Y %H:%M:%S %z").to_string();
-    entry.push_str(&format!("\n -- {} <{}>  {}\n\n", maintainer_name, maintainer_email, date));
+    entry.push_str(&format!(
+        "\n -- {} <{}>  {}\n\n",
+        maintainer_name, maintainer_email, date
+    ));
 
     return entry;
 }
@@ -272,17 +280,45 @@ mod tests {
     use tempfile::TempDir;
 
     fn setup_repo(dir: &Path) {
-        Command::new("git").arg("init").current_dir(dir).output().unwrap();
+        Command::new("git")
-        Command::new("git").arg("config").arg("user.email").arg("you@example.com").current_dir(dir).output().unwrap();
+            .arg("init")
-        Command::new("git").arg("config").arg("user.name").arg("Your Name").current_dir(dir).output().unwrap();
+            .current_dir(dir)
+            .output()
+            .unwrap();
+        Command::new("git")
+            .arg("config")
+            .arg("user.email")
+            .arg("you@example.com")
+            .current_dir(dir)
+            .output()
+            .unwrap();
+        Command::new("git")
+            .arg("config")
+            .arg("user.name")
+            .arg("Your Name")
+            .current_dir(dir)
+            .output()
+            .unwrap();
     }
 
     fn commit(dir: &Path, message: &str) {
-        Command::new("git").arg("commit").arg("--allow-empty").arg("-m").arg(message).current_dir(dir).output().unwrap();
+        Command::new("git")
+            .arg("commit")
+            .arg("--allow-empty")
+            .arg("-m")
+            .arg(message)
+            .current_dir(dir)
+            .output()
+            .unwrap();
     }
 
     fn tag(dir: &Path, name: &str) {
-        Command::new("git").arg("tag").arg(name).current_dir(dir).output().unwrap();
+        Command::new("git")
+            .arg("tag")
+            .arg(name)
+            .current_dir(dir)
+            .output()
+            .unwrap();
     }
 
     #[test]
@@ -298,7 +334,12 @@ mod tests {
         std::fs::write(&changelog_path, initial_content).unwrap();
 
         // Commit and tag
-        Command::new("git").arg("add").arg(".").current_dir(repo_dir).output().unwrap();
+        Command::new("git")
+            .arg("add")
+            .arg(".")
+            .current_dir(repo_dir)
+            .output()
+            .unwrap();
         commit(repo_dir, "Initial commit");
         tag(repo_dir, "debian/0.1.0-1");
 
@@ -332,36 +373,69 @@ mod tests {
     #[test]
     fn test_compute_new_version() {
         // Debian upload
-        assert_eq!(compute_new_version("15.2.0-8", false, false, false), "15.2.0-9");
+        assert_eq!(
-        assert_eq!(compute_new_version("15.2.0-9", false, false, false), "15.2.0-10");
+            compute_new_version("15.2.0-8", false, false, false),
+            "15.2.0-9"
+        );
+        assert_eq!(
+            compute_new_version("15.2.0-9", false, false, false),
+            "15.2.0-10"
+        );
 
         // Ubuntu upload
-        assert_eq!(compute_new_version("15.2.0-9", true, false, false), "15.2.0-9ubuntu1");
+        assert_eq!(
-        assert_eq!(compute_new_version("15.2.0-9ubuntu1", true, false, false), "15.2.0-9ubuntu2");
+            compute_new_version("15.2.0-9", true, false, false),
+            "15.2.0-9ubuntu1"
+        );
+        assert_eq!(
+            compute_new_version("15.2.0-9ubuntu1", true, false, false),
+            "15.2.0-9ubuntu2"
+        );
 
         // No change rebuild
-        assert_eq!(compute_new_version("15.2.0-9", false, true, false), "15.2.0-9build1");
+        assert_eq!(
-        assert_eq!(compute_new_version("15.2.0-9build1", false, true, false), "15.2.0-9build2");
+            compute_new_version("15.2.0-9", false, true, false),
+            "15.2.0-9build1"
+        );
+        assert_eq!(
+            compute_new_version("15.2.0-9build1", false, true, false),
+            "15.2.0-9build2"
+        );
 
         // Rebuild of Ubuntu version
-        assert_eq!(compute_new_version("15.2.0-9ubuntu1", false, true, false), "15.2.0-9ubuntu1build1");
+        assert_eq!(
+            compute_new_version("15.2.0-9ubuntu1", false, true, false),
+            "15.2.0-9ubuntu1build1"
+        );
 
         // NMU
         // Native
         assert_eq!(compute_new_version("1.0", false, false, true), "1.0+nmu1");
-        assert_eq!(compute_new_version("1.0+nmu1", false, false, true), "1.0+nmu2");
+        assert_eq!(
+            compute_new_version("1.0+nmu1", false, false, true),
+            "1.0+nmu2"
+        );
 
         // Non-native
         assert_eq!(compute_new_version("1.0-1", false, false, true), "1.0-1.1");
-        assert_eq!(compute_new_version("1.0-1.1", false, false, true), "1.0-1.2");
+        assert_eq!(
+            compute_new_version("1.0-1.1", false, false, true),
+            "1.0-1.2"
+        );
 
         // NMU of NMU?
-        assert_eq!(compute_new_version("1.0-1.2", false, false, true), "1.0-1.3");
+        assert_eq!(
+            compute_new_version("1.0-1.2", false, false, true),
+            "1.0-1.3"
+        );
 
         // Native package uploads
         assert_eq!(compute_new_version("1.0", false, false, false), "1.1");
         assert_eq!(compute_new_version("1.0.5", false, false, false), "1.0.6");
-        assert_eq!(compute_new_version("20241126", false, false, false), "20241127");
+        assert_eq!(
+            compute_new_version("20241126", false, false, false),
+            "20241127"
+        );
     }
 
     #[test]

src/get.rs

@@ -1,19 +1,25 @@
+use std::cmp::min;
 use std::error::Error;
 use std::path::Path;
-use std::cmp::min;
 
 use pkh::package_info;
 use pkh::package_info::PackageInfo;
 
 use std::process::Command;
 
-use log::{debug};
+use log::debug;
 
 use regex::Regex;
 
 use pkh::ProgressCallback;
 
-fn clone_repo(url: &str, package: &str, branch: Option<&str>, cwd: Option<&Path>, progress: ProgressCallback<'_>) -> Result<(), Box<dyn Error>> {
+fn clone_repo(
+    url: &str,
+    package: &str,
+    branch: Option<&str>,
+    cwd: Option<&Path>,
+    progress: ProgressCallback<'_>,
+) -> Result<(), Box<dyn Error>> {
     let target_path = if let Some(path) = cwd {
         path.join(package)
     } else {
@@ -23,7 +29,12 @@ fn clone_repo(url: &str, package: &str, branch: Option<&str>, cwd: Option<&Path>
     let mut callbacks = git2::RemoteCallbacks::new();
     if let Some(ref progress_cb) = progress {
         callbacks.transfer_progress(move |stats| {
-            (progress_cb)("", "Receiving objects...", stats.received_objects(), stats.total_objects());
+            (progress_cb)(
+                "",
+                "Receiving objects...",
+                stats.received_objects(),
+                stats.total_objects(),
+            );
             true
         });
         callbacks.sideband_progress(move |data| {
@@ -31,8 +42,18 @@ fn clone_repo(url: &str, package: &str, branch: Option<&str>, cwd: Option<&Path>
             let re = Regex::new(r"(.*):[ ]*([0-9]*)% \(([0-9]*)/([0-9]*)\)").unwrap();
             if let Some(caps) = re.captures(msg.trim()) {
                 let msg = caps.get(1).map_or("", |m| m.as_str()).to_string();
-                let objects = caps.get(3).map_or("", |m| m.as_str()).to_string().parse::<usize>().unwrap_or(0);
+                let objects = caps
-                let total = caps.get(4).map_or("", |m| m.as_str()).to_string().parse::<usize>().unwrap_or(0);
+                    .get(3)
+                    .map_or("", |m| m.as_str())
+                    .to_string()
+                    .parse::<usize>()
+                    .unwrap_or(0);
+                let total = caps
+                    .get(4)
+                    .map_or("", |m| m.as_str())
+                    .to_string()
+                    .parse::<usize>()
+                    .unwrap_or(0);
 
                 (progress_cb)("", msg.as_str(), objects, total);
             }
@@ -52,23 +73,19 @@ fn clone_repo(url: &str, package: &str, branch: Option<&str>, cwd: Option<&Path>
     }
 
     return match builder.clone(url, &target_path) {
-        Ok(_repo) => {
+        Ok(_repo) => Ok(()),
-            Ok(())
+        Err(e) => Err(format!("Failed to clone: {}", e).into()),
-        }
-        Err(e) => {
-            Err(format!("Failed to clone: {}", e).into())
-        }
     };
 }
 
-use sha2::{Sha256, Digest};
+use sha2::{Digest, Sha256};
 use std::fs::File;
 use std::io::Write;
 
-use futures_util::StreamExt;
 use flate2::read::GzDecoder;
-use xz2::read::XzDecoder;
+use futures_util::StreamExt;
 use tar::Archive;
+use xz2::read::XzDecoder;
 
 fn extract_archive(path: &Path, dest: &Path) -> Result<(), Box<dyn Error>> {
     let file = File::open(path)?;
@@ -97,19 +114,30 @@ fn checkout_pristine_tar(package_dir: &Path, filename: &str) -> Result<(), Box<d
         .expect("pristine-tar checkout failed");
 
     if !output.status.success() {
-        return Err(format!("pristine-tar checkout failed with status: {}", output.status).into());
+        return Err(format!(
+            "pristine-tar checkout failed with status: {}",
+            output.status
+        )
+        .into());
     }
     Ok(())
 }
 
-async fn download_file_checksum(url: &str, checksum: &str, target_dir: &Path, progress: ProgressCallback<'_>) -> Result<(), Box<dyn Error>> {
+async fn download_file_checksum(
+    url: &str,
+    checksum: &str,
+    target_dir: &Path,
+    progress: ProgressCallback<'_>,
+) -> Result<(), Box<dyn Error>> {
     // Download with reqwest
     let response = reqwest::get(url).await?;
     if !response.status().is_success() {
         return Err(format!("Failed to download '{}' : {}", &url, response.status()).into());
     }
 
-    let total_size = response.content_length().ok_or(format!("Failed to get content length from '{}'", &url))?;
+    let total_size = response
+        .content_length()
+        .ok_or(format!("Failed to get content length from '{}'", &url))?;
     let mut index = 0;
 
     // Target file: extract file name from URL
@@ -135,7 +163,11 @@ async fn download_file_checksum(url: &str, checksum: &str, target_dir: &Path, pr
     let result = hasher.finalize();
     let calculated_checksum = hex::encode(result);
     if calculated_checksum != checksum {
-        return Err(format!("Checksum mismatch! Expected {}, got {}", checksum, calculated_checksum).into());
+        return Err(format!(
+            "Checksum mismatch! Expected {}, got {}",
+            checksum, calculated_checksum
+        )
+        .into());
     }
 
     Ok(())
@@ -145,7 +177,10 @@ fn setup_pristine_tar_branch(package_dir: &Path, dist: &str) -> Result<(), Box<d
     let repo = git2::Repository::open(package_dir)?;
 
     // Check if local branch already exists
-    if repo.find_branch("pristine-tar", git2::BranchType::Local).is_ok() {
+    if repo
+        .find_branch("pristine-tar", git2::BranchType::Local)
+        .is_ok()
+    {
         return Ok(());
     }
 
@@ -175,7 +210,11 @@ fn setup_pristine_tar_branch(package_dir: &Path, dist: &str) -> Result<(), Box<d
     Ok(())
 }
 
-async fn fetch_orig_tarball(info: &PackageInfo, cwd: Option<&Path>, progress: ProgressCallback<'_>) -> Result<(), Box<dyn Error>> {
+async fn fetch_orig_tarball(
+    info: &PackageInfo,
+    cwd: Option<&Path>,
+    progress: ProgressCallback<'_>,
+) -> Result<(), Box<dyn Error>> {
     let package_dir = if let Some(path) = cwd {
         path.join(&info.stanza.package)
     } else {
@@ -184,9 +223,12 @@ async fn fetch_orig_tarball(info: &PackageInfo, cwd: Option<&Path>, progress: Pr
 
     // Find the orig tarball in the file list
     // Usually ends with .orig.tar.gz or .orig.tar.xz
-    let orig_file = info.stanza.files.iter().find(|f| {
+    let orig_file = info
-        f.name.contains(".orig.tar.")
+        .stanza
-    }).unwrap();
+        .files
+        .iter()
+        .find(|f| f.name.contains(".orig.tar."))
+        .unwrap();
     let filename = &orig_file.name;
 
     // 1. Try executing pristine-tar
@@ -195,19 +237,32 @@ async fn fetch_orig_tarball(info: &PackageInfo, cwd: Option<&Path>, progress: Pr
     let _ = setup_pristine_tar_branch(&package_dir, info.dist.as_str());
 
     if let Err(e) = checkout_pristine_tar(&package_dir, filename.as_str()) {
-        debug!("pristine-tar failed: {}. Falling back to archive download.", e);
+        debug!(
+            "pristine-tar failed: {}. Falling back to archive download.",
+            e
+        );
 
         // 2. Fallback to archive download
         // We download to the parent directory of the package repo (which is standard for build tools)
         // or the current directory if cwd is None (which effectively is the parent of the package dir)
         let target_dir = cwd.unwrap_or_else(|| Path::new("."));
-        download_file_checksum(format!("{}/{}", &info.archive_url, filename).as_str(), &orig_file.sha256, target_dir, progress).await?;
+        download_file_checksum(
+            format!("{}/{}", &info.archive_url, filename).as_str(),
+            &orig_file.sha256,
+            target_dir,
+            progress,
+        )
+        .await?;
     }
 
     Ok(())
 }
 
-async fn fetch_archive_sources(info: &PackageInfo, cwd: Option<&Path>, progress: ProgressCallback<'_>) -> Result<(), Box<dyn Error>> {
+async fn fetch_archive_sources(
+    info: &PackageInfo,
+    cwd: Option<&Path>,
+    progress: ProgressCallback<'_>,
+) -> Result<(), Box<dyn Error>> {
     let package_dir = if let Some(path) = cwd {
         path.join(&info.stanza.package)
     } else {
@@ -222,18 +277,20 @@ async fn fetch_archive_sources(info: &PackageInfo, cwd: Option<&Path>, progress:
     }
 
     // Extract the debian tarball or diff
-    let debian_file = info.stanza.files.iter().find(|f| {
+    let debian_file = info
-        f.name.contains(".debian.tar.") || f.name.contains(".diff.gz")
+        .stanza
-    });
+        .files
+        .iter()
+        .find(|f| f.name.contains(".debian.tar.") || f.name.contains(".diff.gz"));
 
     if let Some(file) = debian_file {
         let path = package_dir.join(&file.name);
         let extract_dir = package_dir.join(&info.stanza.package);
 
         if file.name.ends_with(".tar.xz") || file.name.ends_with(".tar.gz") {
-             if let Err(e) = extract_archive(&path, &extract_dir) {
+            if let Err(e) = extract_archive(&path, &extract_dir) {
-                 return Err(format!("Failed to extract {}: {}", file.name, e).into());
+                return Err(format!("Failed to extract {}: {}", file.name, e).into());
-             }
+            }
         }
 
         // Remove archive after extraction
@@ -243,13 +300,31 @@ async fn fetch_archive_sources(info: &PackageInfo, cwd: Option<&Path>, progress:
     Ok(())
 }
 
-pub async fn get(package: &str, _version: &str, series: Option<&str>, pocket: &str, _ppa: &str, dist: Option<&str>, cwd: Option<&Path>, progress: ProgressCallback<'_>) -> Result<PackageInfo, Box<dyn Error>> {
+pub async fn get(
-    let version_opt = if _version.is_empty() { None } else { Some(_version) };
+    package: &str,
+    _version: &str,
+    series: Option<&str>,
+    pocket: &str,
+    _ppa: &str,
+    dist: Option<&str>,
+    cwd: Option<&Path>,
+    progress: ProgressCallback<'_>,
+) -> Result<PackageInfo, Box<dyn Error>> {
+    let version_opt = if _version.is_empty() {
+        None
+    } else {
+        Some(_version)
+    };
 
     /* Obtain the package information, either directly in a series or with a search in all series */
     let package_info = if let Some(s) = series {
         if let Some(cb) = progress {
-            cb(&format!("Resolving package info for {}...", package), "", 0, 0);
+            cb(
+                &format!("Resolving package info for {}...", package),
+                "",
+                0,
+                0,
+            );
         }
 
         // Get the package information from that series and pocket
@@ -266,7 +341,12 @@ pub async fn get(package: &str, _version: &str, series: Option<&str>, pocket: &s
         );
 
         if let Some(cb) = progress {
-            cb(&format!("Searching for package {} in {}...", package, dist), "", 0, 0);
+            cb(
+                &format!("Searching for package {} in {}...", package, dist),
+                "",
+                0,
+                0,
+            );
         }
 
         // Try to find the package in all series from that dist
@@ -300,9 +380,28 @@ pub async fn get(package: &str, _version: &str, series: Option<&str>, pocket: &s
         };
 
         if let Some(cb) = progress {
-            cb(&format!("Cloning {}{}...", url, if let Some(b) = &branch_name { format!(" (branch {})", b) } else { String::new() }), "", 0, 0);
+            cb(
+                &format!(
+                    "Cloning {}{}...",
+                    url,
+                    if let Some(b) = &branch_name {
+                        format!(" (branch {})", b)
+                    } else {
+                        String::new()
+                    }
+                ),
+                "",
+                0,
+                0,
+            );
         }
-        clone_repo(url.as_str(), package, branch_name.as_deref(), Some(&package_dir), progress)?;
+        clone_repo(
+            url.as_str(),
+            package,
+            branch_name.as_deref(),
+            Some(&package_dir),
+            progress,
+        )?;
         if let Some(cb) = progress {
             cb("Fetching orig tarball...", "", 0, 0);
         }
@@ -334,13 +433,21 @@ mod tests {
         let cwd = temp_dir.path();
 
         // Main 'get' command: the one we want to test
-        let info = get(package, "", series, "", "", dist, Some(cwd), None).await.unwrap();
+        let info = get(package, "", series, "", "", dist, Some(cwd), None)
+            .await
+            .unwrap();
 
         let package_dir = cwd.join(package);
         assert!(package_dir.exists());
         let package_source_dir = package_dir.join(package);
-        assert!(package_source_dir.exists(), "Package git repo directory not created");
+        assert!(
-        assert!(package_source_dir.join("debian").exists(), "debian directory not present");
+            package_source_dir.exists(),
+            "Package git repo directory not created"
+        );
+        assert!(
+            package_source_dir.join("debian").exists(),
+            "debian directory not present"
+        );
 
         if package_source_dir.join(".git").exists() {
             // Verify we are on the correct branch

src/main.rs

@@ -2,7 +2,7 @@ use std::env;
 use std::io::Write;
 
 extern crate clap;
-use clap::{arg, command, Command};
+use clap::{Command, arg, command};
 
 extern crate flate2;
 
@@ -12,8 +12,8 @@ use get::get;
 mod changelog;
 use changelog::generate_entry;
 
-use log::{info, error};
 use indicatif_log_bridge::LogWrapper;
+use log::{error, info};
 
 mod ui;
 
@@ -22,45 +22,33 @@ fn main() {
     let logger =
         env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
             .format_timestamp(None)
-            .format(|buf, record| {
+            .format(|buf, record| writeln!(buf, "{}", record.args()))
-                writeln!(buf, "{}", record.args())
-            })
             .build();
     let multi = indicatif::MultiProgress::new();
-    LogWrapper::new(multi.clone(), logger)
+    LogWrapper::new(multi.clone(), logger).try_init().unwrap();
-        .try_init()
+    let matches = command!()
-        .unwrap();
-	let matches = command!()
         .subcommand_required(true)
         .disable_version_flag(true)
         .subcommand(
             Command::new("get")
                 .about("Get a source package from the archive or git")
                 .arg(
-                    arg!(-s --series <series> "Target package distribution series")
+                    arg!(-s --series <series> "Target package distribution series").required(false),
-                        .required(false)
                 )
                 .arg(
                     arg!(-d --dist <dist> "Target package distribution (debian, ubuntu)")
-                        .required(false)
+                        .required(false),
                 )
-                .arg(
+                .arg(arg!(-v --version <version> "Target package version").required(false))
-                    arg!(-v --version <version> "Target package version")
+                .arg(arg!(--ppa <ppa> "Download the package from a specific PPA").required(false))
-                        .required(false)
+                .arg(arg!(<package> "Target package")),
-                )
-                .arg(
-                    arg!(--ppa <ppa> "Download the package from a specific PPA")
-                        .required(false)
-                )
-                .arg(arg!(<package> "Target package"))
         )
         .subcommand(
             Command::new("chlog")
                 .about("Auto-generate changelog entry, editing it, committing it afterwards")
                 .arg(arg!(-s --series <series> "Target distribution series").required(false))
                 .arg(arg!(--backport "This changelog is for a backport entry").required(false))
-                .arg(arg!(-v --version <version> "Target version").required(false))
+                .arg(arg!(-v --version <version> "Target version").required(false)),
-
         )
         .get_matches();
 
@@ -69,13 +57,28 @@ fn main() {
             let package = sub_matches.get_one::<String>("package").expect("required");
             let series = sub_matches.get_one::<String>("series").map(|s| s.as_str());
             let dist = sub_matches.get_one::<String>("dist").map(|s| s.as_str());
-            let version = sub_matches.get_one::<String>("version").map(|s| s.as_str()).unwrap_or("");
+            let version = sub_matches
-            let ppa = sub_matches.get_one::<String>("ppa").map(|s| s.as_str()).unwrap_or("");
+                .get_one::<String>("version")
+                .map(|s| s.as_str())
+                .unwrap_or("");
+            let ppa = sub_matches
+                .get_one::<String>("ppa")
+                .map(|s| s.as_str())
+                .unwrap_or("");
 
             // Since get is async, we need to block on it
             let (pb, mut progress_callback) = ui::create_progress_bar(&multi);
 
-            if let Err(e) = rt.block_on(get(package, version, series, "", ppa, dist, None, Some(&mut progress_callback))) {
+            if let Err(e) = rt.block_on(get(
+                package,
+                version,
+                series,
+                "",
+                ppa,
+                dist,
+                None,
+                Some(&mut progress_callback),
+            )) {
                 pb.finish_and_clear();
                 error!("{}", e);
                 std::process::exit(1);
@@ -83,7 +86,7 @@ fn main() {
             pb.finish_and_clear();
             multi.remove(&pb);
             info!("Done.");
-        },
+        }
         Some(("chlog", sub_matches)) => {
             let cwd = std::env::current_dir().unwrap();
             let version = sub_matches.get_one::<String>("version").map(|s| s.as_str());
@@ -98,7 +101,7 @@ fn main() {
                 .current_dir(&cwd)
                 .args(&["debian/changelog"])
                 .status();
-        },
+        }
         _ => unreachable!("Exhausted list of subcommands and subcommand_required prevents `None`"),
     }
 }

src/package_info.rs

@@ -1,12 +1,12 @@
+use chrono::NaiveDate;
 use flate2::read::GzDecoder;
-use std::io::Read;
 use std::collections::HashMap;
 use std::error::Error;
+use std::io::Read;
 use std::path::Path;
-use chrono::NaiveDate;
 
-use log::{debug, warn};
 use crate::ProgressCallback;
+use log::{debug, warn};
 
 const BASE_URL_UBUNTU: &str = "http://archive.ubuntu.com/ubuntu";
 const BASE_URL_DEBIAN: &str = "http://deb.debian.org/debian";
@@ -31,8 +31,14 @@ fn parse_series_csv(content: &str) -> Result<Vec<String>, Box<dyn Error>> {
         .from_reader(content.as_bytes());
 
     let headers = rdr.headers()?.clone();
-    let series_idx = headers.iter().position(|h| h == "series").ok_or("Column 'series' not found")?;
+    let series_idx = headers
-    let created_idx = headers.iter().position(|h| h == "created").ok_or("Column 'created' not found")?;
+        .iter()
+        .position(|h| h == "series")
+        .ok_or("Column 'series' not found")?;
+    let created_idx = headers
+        .iter()
+        .position(|h| h == "created")
+        .ok_or("Column 'created' not found")?;
 
     let mut entries = Vec::new();
     for result in rdr.records() {
@@ -54,7 +60,13 @@ async fn get_ordered_series(dist: &str) -> Result<Vec<String>, Box<dyn Error>> {
     let content = if Path::new(format!("/usr/share/distro-info/{dist}.csv").as_str()).exists() {
         std::fs::read_to_string(format!("/usr/share/distro-info/{dist}.csv"))?
     } else {
-        reqwest::get(format!("https://salsa.debian.org/debian/distro-info-data/-/raw/main/{dist}.csv").as_str()).await?.text().await?
+        reqwest::get(
+            format!("https://salsa.debian.org/debian/distro-info-data/-/raw/main/{dist}.csv")
+                .as_str(),
+        )
+        .await?
+        .text()
+        .await?
     };
 
     let mut series = parse_series_csv(&content)?;
@@ -85,7 +97,11 @@ pub async fn get_dist_series(dist: &str) -> Result<Vec<String>, Box<dyn Error>>
     if Path::new(format!("/usr/share/distro-info/{dist}.csv").as_str()).exists() {
         get_series_from_file(format!("/usr/share/distro-info/{dist}.csv").as_str())
     } else {
-        get_series_from_url(format!("https://salsa.debian.org/debian/distro-info-data/-/raw/main/{dist}.csv").as_str()).await
+        get_series_from_url(
+            format!("https://salsa.debian.org/debian/distro-info-data/-/raw/main/{dist}.csv")
+                .as_str(),
+        )
+        .await
     }
 }
 
@@ -118,18 +134,21 @@ pub struct PackageStanza {
     pub files: Vec<FileEntry>,
 }
 
-
 #[derive(Debug)]
 pub struct PackageInfo {
     pub dist: String,
     pub series: String,
     pub stanza: PackageStanza,
     pub preferred_vcs: Option<String>,
-    pub archive_url: String
+    pub archive_url: String,
 }
 
 fn get_sources_url(base_url: &str, series: &str, pocket: &str, component: &str) -> String {
-    let pocket_full = if pocket.is_empty() { String::new() } else { format!("-{}", pocket) };
+    let pocket_full = if pocket.is_empty() {
+        String::new()
+    } else {
+        format!("-{}", pocket)
+    };
     format!("{base_url}/dists/{series}{pocket_full}/{component}/source/Sources.gz")
 }
 
@@ -145,14 +164,22 @@ fn get_base_url(dist: &str) -> &str {
 * Obtain the URL for the 'Release' file of a distribution series
 */
 fn get_release_url(base_url: &str, series: &str, pocket: &str) -> String {
-    let pocket_full = if pocket.is_empty() { String::new() } else { format!("-{}", pocket) };
+    let pocket_full = if pocket.is_empty() {
+        String::new()
+    } else {
+        format!("-{}", pocket)
+    };
     format!("{base_url}/dists/{series}{pocket_full}/Release")
 }
 
 /*
 * Obtain the components of a distribution series by parsing the 'Release' file
 */
-async fn get_components(base_url: &str, series: &str, pocket: &str) -> Result<Vec<String>, Box<dyn Error>> {
+async fn get_components(
+    base_url: &str,
+    series: &str,
+    pocket: &str,
+) -> Result<Vec<String>, Box<dyn Error>> {
     let url = get_release_url(base_url, series, pocket);
     debug!("Fetching Release file from: {}", url);
 
@@ -161,7 +188,10 @@ async fn get_components(base_url: &str, series: &str, pocket: &str) -> Result<Ve
     for line in content.lines() {
         if line.starts_with("Components:") {
             if let Some((_, components)) = line.split_once(':') {
-                return Ok(components.split_whitespace().map(|s| s.to_string()).collect());
+                return Ok(components
+                    .split_whitespace()
+                    .map(|s| s.to_string())
+                    .collect());
             }
         }
     }
@@ -173,7 +203,11 @@ async fn get_components(base_url: &str, series: &str, pocket: &str) -> Result<Ve
 * Parse a 'Sources.gz' debian package file data, to look for a target package and
 * return the data for that package stanza
 */
-fn parse_sources(data: &[u8], target_package: &str, target_version: Option<&str>) -> Result<Option<PackageStanza>, Box<dyn Error>> {
+fn parse_sources(
+    data: &[u8],
+    target_package: &str,
+    target_version: Option<&str>,
+) -> Result<Option<PackageStanza>, Box<dyn Error>> {
     let mut d = GzDecoder::new(data);
     let mut s = String::new();
     d.read_to_string(&mut s)?;
@@ -183,7 +217,9 @@ fn parse_sources(data: &[u8], target_package: &str, target_version: Option<&str>
         let mut current_key = String::new();
 
         for line in stanza.lines() {
-            if line.is_empty() { continue; }
+            if line.is_empty() {
+                continue;
+            }
 
             if line.starts_with(' ') || line.starts_with('\t') {
                 // Continuation line
@@ -239,7 +275,12 @@ fn parse_sources(data: &[u8], target_package: &str, target_version: Option<&str>
     Ok(None)
 }
 
-pub async fn get(package_name: &str, series: &str, pocket: &str, version: Option<&str>) -> Result<PackageInfo, Box<dyn Error>> {
+pub async fn get(
+    package_name: &str,
+    series: &str,
+    pocket: &str,
+    version: Option<&str>,
+) -> Result<PackageInfo, Box<dyn Error>> {
     let dist = get_dist_from_series(series).await?;
 
     // Handle Ubuntu case: Vcs-Git does not usually point to Launchpad but Salsa
@@ -277,7 +318,10 @@ pub async fn get(package_name: &str, series: &str, pocket: &str, version: Option
 
         let compressed_data = response.bytes().await?;
 
-        debug!("Downloaded Sources.gz for {}/{}/{}", dist, series, component);
+        debug!(
+            "Downloaded Sources.gz for {}/{}/{}",
+            dist, series, component
+        );
 
         if let Some(stanza) = parse_sources(&compressed_data, package_name, version)? {
             if let Some(vcs) = &stanza.vcs_git {
@@ -297,10 +341,20 @@ pub async fn get(package_name: &str, series: &str, pocket: &str, version: Option
         }
     }
 
-    Err(format!("Package '{}' not found in {}/{}", package_name, dist, series).into())
+    Err(format!(
+        "Package '{}' not found in {}/{}",
+        package_name, dist, series
+    )
+    .into())
 }
 
-pub async fn find_package(package_name: &str, dist: &str, pocket: &str, version: Option<&str>, progress: ProgressCallback<'_>) -> Result<PackageInfo, Box<dyn Error>> {
+pub async fn find_package(
+    package_name: &str,
+    dist: &str,
+    pocket: &str,
+    version: Option<&str>,
+    progress: ProgressCallback<'_>,
+) -> Result<PackageInfo, Box<dyn Error>> {
     let series_list = get_ordered_series(dist).await?;
 
     for (i, series) in series_list.iter().enumerate() {
@@ -311,12 +365,15 @@ pub async fn find_package(package_name: &str, dist: &str, pocket: &str, version:
         match get(package_name, series, pocket, version).await {
             Ok(info) => {
                 if i > 0 {
-                    warn!("Package '{}' not found in development release. Found in {}/{}.", package_name, dist, series);
+                    warn!(
+                        "Package '{}' not found in development release. Found in {}/{}.",
+                        package_name, dist, series
+                    );
                 } else {
                     debug!("Found package '{}' in {}/{}", package_name, dist, series);
                 }
                 return Ok(info);
-            },
+            }
             Err(_e) => {
                 continue;
             }
@@ -335,10 +392,15 @@ mod tests {
         // "hello" should exist on Launchpad for Ubuntu
         let url = check_launchpad_repo("hello").await.unwrap();
         assert!(url.is_some());
-        assert_eq!(url.unwrap(), "https://git.launchpad.net/ubuntu/+source/hello");
+        assert_eq!(
+            url.unwrap(),
+            "https://git.launchpad.net/ubuntu/+source/hello"
+        );
 
         // "this-package-should-not-exist-12345" should not exist
-        let url = check_launchpad_repo("this-package-should-not-exist-12345").await.unwrap();
+        let url = check_launchpad_repo("this-package-should-not-exist-12345")
+            .await
+            .unwrap();
         assert!(url.is_none());
     }
 
@@ -364,8 +426,8 @@ mod tests {
 
     #[test]
     fn test_parse_sources() {
-        use flate2::write::GzEncoder;
         use flate2::Compression;
+        use flate2::write::GzEncoder;
         use std::io::Write;
 
         let data = "Package: hello\nVersion: 2.10-2\nDirectory: pool/main/h/hello\nVcs-Git: https://salsa.debian.org/debian/hello.git\n\nPackage: other\nVersion: 1.0\n";
@@ -378,7 +440,10 @@ mod tests {
         assert_eq!(info.package, "hello");
         assert_eq!(info.version, "2.10-2");
         assert_eq!(info.directory, "pool/main/h/hello");
-        assert_eq!(info.vcs_git.unwrap(), "https://salsa.debian.org/debian/hello.git");
+        assert_eq!(
+            info.vcs_git.unwrap(),
+            "https://salsa.debian.org/debian/hello.git"
+        );
 
         let none = parse_sources(&compressed, "missing", None).unwrap();
         assert!(none.is_none());
@@ -387,7 +452,9 @@ mod tests {
     #[tokio::test]
     async fn test_find_package_fallback() {
         // python2.7 is in bullseye but not above
-        let info = find_package("python2.7", "debian", "", None, None).await.unwrap();
+        let info = find_package("python2.7", "debian", "", None, None)
+            .await
+            .unwrap();
         assert_eq!(info.stanza.package, "python2.7");
         assert_eq!(info.series, "bullseye")
     }
@@ -395,7 +462,9 @@ mod tests {
     #[tokio::test]
     async fn test_find_package_devel() {
         // hello is in sid
-        let info = find_package("hello", "debian", "", None, None).await.unwrap();
+        let info = find_package("hello", "debian", "", None, None)
+            .await
+            .unwrap();
         assert_eq!(info.stanza.package, "hello");
         assert_eq!(info.series, "sid")
     }

src/ui.rs

@@ -1,12 +1,16 @@
-use std::time::Duration;
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
+use std::time::Duration;
 
-pub fn create_progress_bar(multi: &MultiProgress) -> (ProgressBar, impl Fn(&str, &str, usize, usize) + '_) {
+pub fn create_progress_bar(
+    multi: &MultiProgress,
+) -> (ProgressBar, impl Fn(&str, &str, usize, usize) + '_) {
     let pb = multi.add(ProgressBar::new(0));
     pb.enable_steady_tick(Duration::from_millis(50));
-    pb.set_style(ProgressStyle::default_bar()
+    pb.set_style(
-        .template("> {spinner:.blue} {prefix}")
+        ProgressStyle::default_bar()
-        .unwrap());
+            .template("> {spinner:.blue} {prefix}")
+            .unwrap(),
+    );
 
     let pb_clone = pb.clone();
     let callback = move |prefix: &str, msg: &str, progress: usize, total: usize| {
@@ -17,9 +21,11 @@ pub fn create_progress_bar(multi: &MultiProgress) -> (ProgressBar, impl Fn(&str,
                 .unwrap()
                 .progress_chars("=> "));
         } else {
-            pb.set_style(ProgressStyle::default_bar()
+            pb.set_style(
-                .template("> {spinner:.blue} {prefix}")
+                ProgressStyle::default_bar()
-                .unwrap());
+                    .template("> {spinner:.blue} {prefix}")
+                    .unwrap(),
+            );
         }
 
         if !prefix.is_empty() {