Add comic book aliases

Added .cbt, .cbz, .cb7, and .cbr aliases for .tar, .zip, .7z, and .rar,
respectively.

CHANGELOG.md

@@ -22,6 +22,7 @@ Categories Used:
 
 ### New Features
 
+- Add aliases for comic books :)
 - Merge folders in decompression [\#798](https://github.com/ouch-org/ouch/pull/798) ([tommady](https://github.com/tommady))
 - Add `--no-smart-unpack` flag to decompression command to disable smart unpack [\#809](https://github.com/ouch-org/ouch/pull/809) ([talis-fb](https://github.com/talis-fb))
 

README.md

@@ -125,7 +125,9 @@ Output:
 If you wish to exclude non-free code from your build, you can disable RAR support
 by building without the `unrar` feature.
 
-`tar` aliases are also supported: `tgz`, `tbz`, `tbz2`, `tlz4`, `txz`, `tlzma`, `tsz`, `tzst`.
+Comic book aliases: `cbt`, `cbz`, `cb7`, `cbr`  
+and `tar` aliases: `tgz`, `tbz`, `tbz2`, `tlz4`, `txz`, `tlzma`, `tsz`, `tzst`  
+are also supported.
 
 Formats can be chained:
 

src/extension.rs

@@ -27,7 +27,7 @@ pub const SUPPORTED_EXTENSIONS: &[&str] = &[
     "br",
 ];
 
-pub const SUPPORTED_ALIASES: &[&str] = &["tgz", "tbz", "tlz4", "txz", "tzlma", "tsz", "tzst"];
+pub const SUPPORTED_ALIASES: &[&str] = &["tgz", "tbz", "tlz4", "txz", "tzlma", "tsz", "tzst", "cbt", "cbz", "cb7", "cbr", ];
 
 #[cfg(not(feature = "unrar"))]
 pub const PRETTY_SUPPORTED_EXTENSIONS: &str = "tar, zip, bz, bz2, bz3, gz, lz4, xz, lzma, sz, zst, 7z";
@@ -89,16 +89,16 @@ pub enum CompressionFormat {
     Lzma,
     /// .sz
     Snappy,
-    /// tar, tgz, tbz, tbz2, tbz3, txz, tlz4, tlzma, tsz, tzst
+    /// tar, tgz, tbz, tbz2, tbz3, txz, tlz4, tlzma, tsz, tzst, cbt
     Tar,
     /// .zst
     Zstd,
-    /// .zip
+    /// .zip, .cbz
     Zip,
     // even if built without RAR support, we still want to recognise the format
-    /// .rar
+    /// .rar, .cbr
     Rar,
-    /// .7z
+    /// .7z, .cb7
     SevenZip,
     /// .br
     Brotli,
@@ -125,7 +125,7 @@ impl CompressionFormat {
 fn to_extension(ext: &[u8]) -> Option<Extension> {
     Some(Extension::new(
         match ext {
-            b"tar" => &[Tar],
+            b"tar" | b"cbt" => &[Tar],
             b"tgz" => &[Tar, Gzip],
             b"tbz" | b"tbz2" => &[Tar, Bzip],
             b"tbz3" => &[Tar, Bzip3],
@@ -133,7 +133,7 @@ fn to_extension(ext: &[u8]) -> Option<Extension> {
             b"txz" | b"tlzma" => &[Tar, Lzma],
             b"tsz" => &[Tar, Snappy],
             b"tzst" => &[Tar, Zstd],
-            b"zip" => &[Zip],
+            b"zip" | b"cbz" => &[Zip],
             b"bz" | b"bz2" => &[Bzip],
             b"bz3" => &[Bzip3],
             b"gz" => &[Gzip],
@@ -141,8 +141,8 @@ fn to_extension(ext: &[u8]) -> Option<Extension> {
             b"xz" | b"lzma" => &[Lzma],
             b"sz" => &[Snappy],
             b"zst" => &[Zstd],
-            b"rar" => &[Rar],
+            b"rar" | b"cbr" => &[Rar],
-            b"7z" => &[SevenZip],
+            b"7z" | b"cb7" => &[SevenZip],
             b"br" => &[Brotli],
             _ => return None,
         },

tests/mime.rs

@@ -17,13 +17,16 @@ fn sanity_check_through_mime() {
     write_random_content(test_file, &mut SmallRng::from_entropy());
 
     let formats = [
-        "7z", "tar", "zip", "tar.gz", "tgz", "tbz", "tbz2", "txz", "tlzma", "tzst", "tar.bz", "tar.bz2", "tar.lzma",
+        "7z", "cb7", "tar", "cbt", "zip", "cbz", "tar.gz", "tgz", "tbz", "tbz2", "txz", "tlzma", "tzst",
-        "tar.xz", "tar.zst",
+        "tar.bz", "tar.bz2", "tar.lzma", "tar.xz", "tar.zst",
     ];
 
     let expected_mimes = [
+        "application/x-7z-compressed",
         "application/x-7z-compressed",
         "application/x-tar",
+        "application/x-tar",
+        "application/zip",
         "application/zip",
         "application/gzip",
         "application/gzip",