Merge pull request #268 from SalOne22/266-bug-filenames-with-dots-res…

…ult-in-incorrect-output-names 266 bug filenames with dots result in incorrect output names
SalOne22 · Sep 2, 2024 · 9bdfeea · 9bdfeea
2 parents 9bf36f2 + 1f3275c
commit 9bdfeea
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/src/cli/pipeline.rs b/src/cli/pipeline.rs
@@ -34,6 +34,7 @@ pub fn decode<P: AsRef<Path>>(f: P) -> Result<Image, ImageErrors> {
                 let mut file_content = vec![];
 
                 file.read_to_end(&mut file_content)?;
+                file.seek(SeekFrom::Start(0))?;
 
                 if libavif::is_avif(&file_content) {
                     use rimage::codecs::avif::AvifDecoder;
@@ -42,32 +43,39 @@ pub fn decode<P: AsRef<Path>>(f: P) -> Result<Image, ImageErrors> {
 
                     return Image::from_decoder(decoder);
                 };
-
                 file.seek(SeekFrom::Start(0))?;
             }
 
             #[cfg(feature = "webp")]
-            if f.as_ref()
-                .extension()
-                .is_some_and(|f| f.eq_ignore_ascii_case("webp"))
             {
-                use rimage::codecs::webp::WebPDecoder;
+                if f.as_ref()
+                    .extension()
+                    .is_some_and(|f| f.eq_ignore_ascii_case("webp"))
+                {
+                    use rimage::codecs::webp::WebPDecoder;
 
-                let decoder = WebPDecoder::try_new(file)?;
+                    let decoder = WebPDecoder::try_new(file)?;
 
-                return Image::from_decoder(decoder);
-            };
+                    return Image::from_decoder(decoder);
+                }
+
+                file.seek(SeekFrom::Start(0))?;
+            }
 
             #[cfg(feature = "tiff")]
-            if f.as_ref()
-                .extension()
-                .is_some_and(|f| f.eq_ignore_ascii_case("tiff") | f.eq_ignore_ascii_case("tif"))
             {
-                use rimage::codecs::tiff::TiffDecoder;
+                if f.as_ref()
+                    .extension()
+                    .is_some_and(|f| f.eq_ignore_ascii_case("tiff") | f.eq_ignore_ascii_case("tif"))
+                {
+                    use rimage::codecs::tiff::TiffDecoder;
+
+                    let decoder = TiffDecoder::try_new(file)?;
 
-                let decoder = TiffDecoder::try_new(file)?;
+                    return Image::from_decoder(decoder);
+                }
 
-                return Image::from_decoder(decoder);
+                file.seek(SeekFrom::Start(0))?;
             }
 
             Err(ImageErrors::ImageDecoderNotImplemented(

diff --git a/src/main.rs b/src/main.rs
@@ -137,7 +137,16 @@ fn main() {
                     pb.set_style(sty_aux_operations.clone());
 
                     let mut available_encoder = handle_error!(input, encoder(subcommand, matches));
-                    output.set_extension(available_encoder.to_extension());
+                    if let Some(ext) = output.extension() {
+                        output.set_extension({
+                            let mut os_str = ext.to_os_string();
+                            os_str.push(".");
+                            os_str.push(available_encoder.to_extension());
+                            os_str
+                        });
+                    } else {
+                        output.set_extension(available_encoder.to_extension());
+                    }
 
                     pipeline.chain_operations(Box::new(Depth::new(BitDepth::Eight)));
                     pipeline.chain_operations(Box::new(ColorspaceConv::new(ColorSpace::RGBA)));