github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-07 20:15:27 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

Merge pull request #270 from figsoda/fix-ext-warning

Browse Source 
fix: incorrect warnings for decompression
This commit is contained in:
João Marcos Bezerra 2022-09-01 17:37:08 -03:00 committed by GitHub
commit ff8619acb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -126,6 +126,7 @@ Categories Used:
- Fix wrong archive format detection patterns [\#125](https://github.com/ouch-org/ouch/pull/125) ([SpyrosRoum](https://github.com/SpyrosRoum)) - Fix wrong archive format detection patterns [\#125](https://github.com/ouch-org/ouch/pull/125) ([SpyrosRoum](https://github.com/SpyrosRoum))
- Decompressing file without extension gives bad error message [\#137](https://github.com/ouch-org/ouch/issues/137) ([marcospb19](https://github.com/marcospb19)) - Decompressing file without extension gives bad error message [\#137](https://github.com/ouch-org/ouch/issues/137) ([marcospb19](https://github.com/marcospb19))
- Fix decompression overwritting files without asking and failing on directories [\#141](https://github.com/ouch-org/ouch/pull/141) ([SpyrosRoum](https://github.com/SpyrosRoum)) - Fix decompression overwritting files without asking and failing on directories [\#141](https://github.com/ouch-org/ouch/pull/141) ([SpyrosRoum](https://github.com/SpyrosRoum))
- Fix incorrect warnings for decompression [\#270](https://github.com/ouch-org/ouch/pull/270) ([figsoda](https://github.com/figsoda))
### Improvements ### Improvements

5
src/commands/mod.rs
View File

@ -381,7 +381,10 @@ fn check_mime_type(
// File ending with extension // File ending with extension
// Try to detect the extension and warn the user if it differs from the written one // Try to detect the extension and warn the user if it differs from the written one
let outer_ext = format.iter().next_back().unwrap(); let outer_ext = format.iter().next_back().unwrap();
if outer_ext != &detected_format { if !outer_ext
.compression_formats
.ends_with(detected_format.compression_formats)
{
warning!( warning!(
"The file extension: `{}` differ from the detected extension: `{}`", "The file extension: `{}` differ from the detected extension: `{}`",
outer_ext, outer_ext,