fix: Remove Exif with non-fatal errors from images

NB: This still doesn't help with detecting Exif in PNGs unfortunately.

Author: iequidoo

src/blob.rs

@@ -538,7 +538,11 @@ fn file_hash(src: &Path) -> Result<blake3::Hash> {
 fn image_metadata(file: &std::fs::File) -> Result<(u64, Option<exif::Exif>)> {
     let len = file.metadata()?.len();
     let mut bufreader = std::io::BufReader::new(file);
-    let exif = exif::Reader::new().read_from_container(&mut bufreader).ok();
+    let exif = exif::Reader::new()
+        .continue_on_error(true)
+        .read_from_container(&mut bufreader)
+        .or_else(|e| e.distill_partial_result(|_errors| {}))
+        .ok();
     Ok((len, exif))
 }
 

src/blob/blob_tests.rs

@@ -258,6 +258,8 @@ async fn test_selfavatar_copy_without_recode() {
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_recode_image_1() {
+    // `exiftool` reports for this file "Bad offset for IFD0 XResolution", still Exif must be
+    // detected and removed.
     let bytes = include_bytes!("../../test-data/image/avatar1000x1000.jpg");
     SendImageCheckMediaquality {
         viewtype: Viewtype::Image,
@@ -418,7 +420,7 @@ async fn test_recode_image_balanced_png() {
 
 #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
 async fn test_sticker_with_exif() {
-    let bytes = include_bytes!("../../test-data/image/logo.png");
+    let bytes = include_bytes!("../../test-data/image/logo-exif.png");
     SendImageCheckMediaquality {
         viewtype: Viewtype::Sticker,
         bytes,