Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/commands/debug_files/bundle_sources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
};
Expand All @@ -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")),
Expand All @@ -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 {
Expand Down