Cargo.lock

@@ -2469,7 +2469,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "letterbox"
-version = "0.0.36"
+version = "0.0.35"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -2988,7 +2988,7 @@ dependencies = [
 
 [[package]]
 name = "notmuch"
-version = "0.0.36"
+version = "0.0.35"
 dependencies = [
  "itertools 0.10.5",
  "log",
@@ -3625,7 +3625,7 @@ dependencies = [
 
 [[package]]
 name = "procmail2notmuch"
-version = "0.0.36"
+version = "0.0.35"
 dependencies = [
  "anyhow",
 ]
@@ -4547,7 +4547,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "0.0.36"
+version = "0.0.35"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -4646,7 +4646,7 @@ dependencies = [
 
 [[package]]
 name = "shared"
-version = "0.0.36"
+version = "0.0.35"
 dependencies = [
  "build-info",
  "notmuch",

notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notmuch"
-version = "0.0.36"
+version = "0.0.35"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

procmail2notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "procmail2notmuch"
-version = "0.0.36"
+version = "0.0.35"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "server"
-version = "0.0.36"
+version = "0.0.35"
 edition = "2021"
 default-run = "server"
 

server/src/nm.rs

@@ -23,7 +23,6 @@ use crate::{
 const TEXT_PLAIN: &'static str = "text/plain";
 const TEXT_HTML: &'static str = "text/html";
 const IMAGE_JPEG: &'static str = "image/jpeg";
-const IMAGE_PJPEG: &'static str = "image/pjpeg";
 const IMAGE_PNG: &'static str = "image/png";
 const MULTIPART_ALTERNATIVE: &'static str = "multipart/alternative";
 const MULTIPART_MIXED: &'static str = "multipart/mixed";
@@ -468,7 +467,6 @@ fn extract_mixed(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body, Se
         TEXT_HTML,
         TEXT_PLAIN,
         IMAGE_JPEG,
-        IMAGE_PJPEG,
         IMAGE_PNG,
     ];
     let mut unhandled_types: Vec<_> = m
@@ -489,7 +487,7 @@ fn extract_mixed(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body, Se
             MULTIPART_ALTERNATIVE => parts.push(extract_alternative(sp, part_addr)?),
             TEXT_PLAIN => parts.push(Body::text(sp.get_body()?)),
             TEXT_HTML => parts.push(Body::html(sp.get_body()?)),
-            IMAGE_PJPEG | IMAGE_JPEG | IMAGE_PNG => {
+            IMAGE_JPEG | IMAGE_PNG => {
                 let pcd = sp.get_content_disposition();
                 let filename = pcd
                     .params
@@ -558,7 +556,6 @@ fn extract_related(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body,
         TEXT_HTML,
         TEXT_PLAIN,
         IMAGE_JPEG,
-        IMAGE_PJPEG,
         IMAGE_PNG,
     ];
     let mut unhandled_types: Vec<_> = m
@@ -573,10 +570,7 @@ fn extract_related(m: &ParsedMail, part_addr: &mut Vec<String>) -> Result<Body,
     }
 
     for (i, sp) in m.subparts.iter().enumerate() {
-        if sp.ctype.mimetype == IMAGE_PNG
+        if sp.ctype.mimetype == IMAGE_PNG || sp.ctype.mimetype == IMAGE_JPEG {
-            || sp.ctype.mimetype == IMAGE_JPEG
-            || sp.ctype.mimetype == IMAGE_PJPEG
-        {
             info!("sp.ctype {:#?}", sp.ctype);
             //info!("sp.headers {:#?}", sp.headers);
             if let Some(cid) = sp.headers.get_first_value("Content-Id") {

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shared"
-version = "0.0.36"
+version = "0.0.35"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

web/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-version = "0.0.36"
+version = "0.0.35"
 name = "letterbox"
 repository = "https://github.com/seed-rs/seed-quickstart"
 authors = ["Bill Thiede <git@xinu.tv>"]