fix: Use orig_path for bundle sources output file name (#2514)

For dSYMs, `canonical_path` excludes the original dSYM extension,
causing any extension before the `.dSYM` to be lost when adding the
`.src.zip` extension. This caused the bug observed in #2502.

Instead, we should use the file name given in the original path when
generating the file name for the output source bundle.

Fixes #2502

Author: szokeasaurusrex

src/commands/debug_files/bundle_sources.rs

@@ -71,12 +71,13 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     let output_path = matches.get_one::<String>("output").map(Path::new);
 
     for orig_path in matches.get_many::<String>("paths").unwrap() {
+        let orig_path: &Path = orig_path.as_ref();
         let canonical_path = get_canonical_path(orig_path)?;
 
         let archive = match DifFile::open_path(&canonical_path, None)? {
             DifFile::Archive(archive) => archive,
             _ => {
-                warn!("Cannot build source bundles from {}", orig_path);
+                warn!("Cannot build source bundles from {}", orig_path.display());
                 continue;
             }
         };
@@ -88,7 +89,11 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
         for (index, object) in archive.get().objects().enumerate() {
             let object = object?;
 
-            let mut out = output_path.unwrap_or(parent_path).join(filename);
+            let mut out = output_path.unwrap_or(parent_path).join(
+                orig_path
+                    .file_name()
+                    .expect("orig_path should have a file name"),
+            );
             match index {
                 0 => out.set_extension("src.zip"),
                 index => out.set_extension(format!("{index}.src.zip")),
@@ -109,7 +114,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
                 )?;
 
             if !written {
-                eprintln!("skipped {orig_path} (no files found)");
+                eprintln!("skipped {} (no files found)", orig_path.display());
                 fs::remove_file(&out)?;
                 continue;
             } else {