Merge folders in decompression

[tommady]

try to
close #466
close #727

I am very open-minded to accepting any suggestions.
The image below is just an example of fulfilling the purpose of those issues.

[marcospb19]

Thanks for this PR! I never before considered this could be an option in the prompt instead of the default, it seems like a good idea so I'm thinking about letting that be.

Can you add a test that unpacks two archives with the following structures:

a/b/c/1

and

a/b/c/2

And show that when decompressed and provided m via stdin, they will merge into:

a/
 b/
  c/
   1
   2

You can start from a copy of multiple_files_with_conflict_and_choice_to_rename that uses the 'allow_piped_choice' feature flag (which we should someday turn into a flag), with that you can pass the stdin choice you want.

[marcospb19]

This is also on a good path for merging :) so don't forget a changelog entry, I think the PR title reflects this change well.

[tommady]

Thanks for this PR! I never before considered this could be an option in the prompt instead of the default, it seems like a good idea so I'm thinking about letting that be.

Can you add a test that unpacks two archives with the following structures:

a/b/c/1

and

a/b/c/2

And show that when decompressed and provided m via stdin, they will merge into:

a/
 b/
  c/
   1
   2

You can start from a copy of multiple_files_with_conflict_and_choice_to_rename that uses the 'allow_piped_choice' feature flag (which we should someday turn into a flag), with that you can pass the stdin choice you want.

I am stuck on how to write the test. Thanks for your guidance. very appriceiate!

[marcospb19]

looking good

We decided that #798 (comment) can be addressed later.

[marcospb19]

Hey, I found a bug around this implementation:

$ mkdir parent/
$ touch parent/a
$ ouch c parent a.tar
[INFO] Compressing 'parent'
[INFO] Compressing 'parent/a'
[INFO] Successfully compressed 'a.tar'
$ mv parent/a parent/b
$ ouch c parent b.zip
[INFO] Compressing 'parent'
[INFO] Compressing 'parent/b'
[INFO] Successfully compressed 'b.zip'
$ rm parent -fr
$
$ ouch d a.tar
[INFO] Created temporary directory /home/marcospb19/./tmp-ouch-dhhuxX to hold decompressed elements
[INFO] extracted (  0.00   B) "tmp-ouch-dhhuxX/parent"
[INFO] extracted (  0.00   B) "tmp-ouch-dhhuxX/parent/a"
[INFO] Successfully moved "/home/marcospb19/./tmp-ouch-dhhuxX/parent" to "./parent"
[INFO] Successfully decompressed archive in current directory
[INFO] Files unpacked: 2
$ ouch d b.zip
[INFO] Created temporary directory /home/marcospb19/./tmp-ouch-ECtvGC to hold decompressed elements
[INFO] File 0 extracted to "/home/marcospb19/./tmp-ouch-ECtvGC/parent/"
[INFO] extracted (  0.00   B) "tmp-ouch-ECtvGC/parent/b"
Do you want to overwrite ./parent? [y/n/r/m]
m
[ERROR] failed to rename file from /home/marcospb19/./tmp-ouch-ECtvGC/parent to ./parent

Looks like a scenario we forgot to test.

[tommady]

thank you, I created an issue and I'll fix it.