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

Merge pull request #345 from ouch-org/remove-extension-display-implementation

Browse Source 
Remove incorrect extension Display implementation
This commit is contained in:
figsoda 2023-01-10 17:55:43 -05:00 committed by GitHub
commit 049eaecf3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/extension.rs
View File

@ -14,8 +14,9 @@ pub struct Extension {
/// One extension like "tgz" can be made of multiple CompressionFormats ([Tar, Gz]) /// One extension like "tgz" can be made of multiple CompressionFormats ([Tar, Gz])
pub compression_formats: &'static [CompressionFormat], pub compression_formats: &'static [CompressionFormat],
/// The input text for this extension, like "tgz", "tar" or "xz" /// The input text for this extension, like "tgz", "tar" or "xz"
pub display_text: String, display_text: String,
} }
// The display_text should be ignored when comparing extensions // The display_text should be ignored when comparing extensions
impl PartialEq for Extension { impl PartialEq for Extension {
fn eq(&self, other: &Self) -> bool { fn eq(&self, other: &Self) -> bool {
@ -70,7 +71,7 @@ pub enum CompressionFormat {
impl CompressionFormat { impl CompressionFormat {
/// Currently supported archive formats are .tar (and aliases to it) and .zip /// Currently supported archive formats are .tar (and aliases to it) and .zip
pub fn is_archive_format(&self) -> bool { fn is_archive_format(&self) -> bool {
// Keep this match like that without a wildcard `_` so we don't forget to update it // Keep this match like that without a wildcard `_` so we don't forget to update it
match self { match self {
Tar | Zip => true, Tar | Zip => true,
@ -84,29 +85,12 @@ impl CompressionFormat {
} }
} }
impl fmt::Display for CompressionFormat {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let text = match self {
Gzip => ".gz",
Bzip => ".bz",
Zstd => ".zst",
Lz4 => ".lz4",
Lzma => ".lzma",
Snappy => ".sz",
Tar => ".tar",
Zip => ".zip",
};
write!(f, "{text}")
}
}
pub const SUPPORTED_EXTENSIONS: &[&str] = &[ pub const SUPPORTED_EXTENSIONS: &[&str] = &[
"tar", "tgz", "tbz", "tlz4", "txz", "tzlma", "tsz", "tzst", "zip", "bz", "bz2", "gz", "lz4", "xz", "lzma", "sz", "tar", "tgz", "tbz", "tlz4", "txz", "tzlma", "tsz", "tzst", "zip", "bz", "bz2", "gz", "lz4", "xz", "lzma", "sz",
"zst", "zst",
]; ];
pub fn to_extension(ext: &[u8]) -> Option<Extension> { fn to_extension(ext: &[u8]) -> Option<Extension> {
Some(Extension::new( Some(Extension::new(
match ext { match ext {
b"tar" => &[Tar], b"tar" => &[Tar],
@ -129,7 +113,7 @@ pub fn to_extension(ext: &[u8]) -> Option<Extension> {
)) ))
} }
pub fn split_extension<'a>(name: &mut &'a [u8]) -> Option<&'a [u8]> { fn split_extension<'a>(name: &mut &'a [u8]) -> Option<&'a [u8]> {
let (new_name, ext) = name.rsplit_once_str(b".")?; let (new_name, ext) = name.rsplit_once_str(b".")?;
if matches!(new_name, b"" | b"." | b"..") { if matches!(new_name, b"" | b"." | b"..") {
return None; return None;