BlueGit

timfa posprint

fix: support macOS in datetime and CLI printer lookup

timfa Omer Pesket · pushed by timfa

Authored 2026-10-26 · 3 weeks ago

Hash
3ce2afecd0671949c9621d9b30b6bc0227452bd8
Parent
6f47d64b
2 files changed +68 −3
src/datetime.rs +3 −1
@@ -72,7 +72,9 @@ fn datetime_to_tm(dt: &chrono::DateTime<Local>) -> tm {
72 72 tm_isdst: -1,
73 73 #[cfg(unix)]
74 74 tm_gmtoff: dt.offset().local_minus_utc() as libc::c_long,
75 #[cfg(unix)]
75 #[cfg(all(unix, target_os = "macos"))]
76 tm_zone: std::ptr::null_mut(),
77 #[cfg(all(unix, not(target_os = "macos")))]
76 78 tm_zone: std::ptr::null(),
77 79 }
78 80 }
@@ -72,7 +72,9 @@ fn datetime_to_tm(dt: &chrono::DateTime<Local>) -> tm {
72 tm_isdst: -1,
72 tm_isdst: -1,
73 #[cfg(unix)]
73 #[cfg(unix)]
74 tm_gmtoff: dt.offset().local_minus_utc() as libc::c_long,
74 tm_gmtoff: dt.offset().local_minus_utc() as libc::c_long,
75 #[cfg(unix)]
75 #[cfg(all(unix, target_os = "macos"))]
76 tm_zone: std::ptr::null_mut(),
77 #[cfg(all(unix, not(target_os = "macos")))]
76 tm_zone: std::ptr::null(),
78 tm_zone: std::ptr::null(),
77 }
79 }
78}
80}
src/print/mod.rs +65 −2
@@ -186,14 +186,38 @@ pub fn open_printer(target: &PrinterTarget) -> Result<Box<dyn PrinterTransport>,
186 186 }
187 187 }
188 188
189 /// Open by manual name: tries serial/COM first, then Windows spooler queue name.
189 /// Match a printer from `list_printers()` by `"auto"`, device `id`, preference key (`usb:vid:pid`), or `display_name`.
190 pub fn find_matching_printer<'a>(
191 printers: &'a [PrinterDevice],
192 name: &str,
193 ) -> Option<&'a PrinterDevice> {
194 let name = name.trim();
195 if name.is_empty() {
196 return None;
197 }
198 if name.eq_ignore_ascii_case("auto") {
199 return printers.first();
200 }
201 printers.iter().find(|p| {
202 p.id == name || printer_preference_key(&p.target) == name || p.display_name == name
203 })
204 }
205
206 /// Open by manual name: tries discovered printers (`id`, `usb:vid:pid`, `"auto"`), then serial/COM, then Windows spooler queue name.
190 207 pub fn open_printer_by_name(name: &str) -> Result<Box<dyn PrinterTransport>, PrintError> {
191 208 let name = name.trim();
192 209 if name.is_empty() {
193 210 return Err(PrintError::NotFound);
194 211 }
195 212
196 if let Ok(transport) = SerialTransport::open(name) {
213 if let Ok(printers) = list_printers() {
214 if let Some(matched) = find_matching_printer(&printers, name) {
215 return open_printer(&matched.target);
216 }
217 }
218
219 let serial_name = name.strip_prefix("serial:").unwrap_or(name);
220 if let Ok(transport) = SerialTransport::open(serial_name) {
197 221 return Ok(Box::new(transport));
198 222 }
199 223
@@ -425,4 +449,43 @@ mod tests {
425 449 None
426 450 );
427 451 }
452
453 #[test]
454 fn matches_discovered_printer_by_id_key_or_auto() {
455 let printers = vec![
456 PrinterDevice {
457 id: "usb:28e9:0289:0:1".into(),
458 display_name: "micro-printer — USB 28e9:0289 (direct)".into(),
459 target: PrinterTarget::UsbDirect {
460 vid: 0x28e9,
461 pid: 0x0289,
462 bus: 0,
463 address: 1,
464 },
465 },
466 PrinterDevice {
467 id: "serial:/dev/cu.usbserial-1410".into(),
468 display_name: "/dev/cu.usbserial-1410 — POS-58 (serial 0416:5011)".into(),
469 target: PrinterTarget::Serial("/dev/cu.usbserial-1410".into()),
470 },
471 ];
472 assert_eq!(
473 find_matching_printer(&printers, "auto").map(|p| p.id.as_str()),
474 Some("usb:28e9:0289:0:1")
475 );
476 assert_eq!(
477 find_matching_printer(&printers, "usb:28e9:0289:0:1").map(|p| p.id.as_str()),
478 Some("usb:28e9:0289:0:1")
479 );
480 assert_eq!(
481 find_matching_printer(&printers, "usb:28e9:0289").map(|p| p.id.as_str()),
482 Some("usb:28e9:0289:0:1")
483 );
484 assert_eq!(
485 find_matching_printer(&printers, "serial:/dev/cu.usbserial-1410").map(|p| p.id.as_str()),
486 Some("serial:/dev/cu.usbserial-1410")
487 );
488 assert!(find_matching_printer(&printers, "usb:9999:9999").is_none());
489 assert!(find_matching_printer(&[], "auto").is_none());
490 }
428 491 }
@@ -186,14 +186,38 @@ pub fn open_printer(target: &PrinterTarget) -> Result<Box<dyn PrinterTransport>,
186 }
186 }
187}
187}
188
188
189/// Open by manual name: tries serial/COM first, then Windows spooler queue name.
189/// Match a printer from `list_printers()` by `"auto"`, device `id`, preference key (`usb:vid:pid`), or `display_name`.
190pub fn find_matching_printer<'a>(
191 printers: &'a [PrinterDevice],
192 name: &str,
193) -> Option<&'a PrinterDevice> {
194 let name = name.trim();
195 if name.is_empty() {
196 return None;
197 }
198 if name.eq_ignore_ascii_case("auto") {
199 return printers.first();
200 }
201 printers.iter().find(|p| {
202 p.id == name || printer_preference_key(&p.target) == name || p.display_name == name
203 })
204}
205
206/// Open by manual name: tries discovered printers (`id`, `usb:vid:pid`, `"auto"`), then serial/COM, then Windows spooler queue name.
190pub fn open_printer_by_name(name: &str) -> Result<Box<dyn PrinterTransport>, PrintError> {
207pub fn open_printer_by_name(name: &str) -> Result<Box<dyn PrinterTransport>, PrintError> {
191 let name = name.trim();
208 let name = name.trim();
192 if name.is_empty() {
209 if name.is_empty() {
193 return Err(PrintError::NotFound);
210 return Err(PrintError::NotFound);
194 }
211 }
195
212
196 if let Ok(transport) = SerialTransport::open(name) {
213 if let Ok(printers) = list_printers() {
214 if let Some(matched) = find_matching_printer(&printers, name) {
215 return open_printer(&matched.target);
216 }
217 }
218
219 let serial_name = name.strip_prefix("serial:").unwrap_or(name);
220 if let Ok(transport) = SerialTransport::open(serial_name) {
197 return Ok(Box::new(transport));
221 return Ok(Box::new(transport));
198 }
222 }
199
223
@@ -425,4 +449,43 @@ mod tests {
425 None
449 None
426 );
450 );
427 }
451 }
452
453 #[test]
454 fn matches_discovered_printer_by_id_key_or_auto() {
455 let printers = vec![
456 PrinterDevice {
457 id: "usb:28e9:0289:0:1".into(),
458 display_name: "micro-printer — USB 28e9:0289 (direct)".into(),
459 target: PrinterTarget::UsbDirect {
460 vid: 0x28e9,
461 pid: 0x0289,
462 bus: 0,
463 address: 1,
464 },
465 },
466 PrinterDevice {
467 id: "serial:/dev/cu.usbserial-1410".into(),
468 display_name: "/dev/cu.usbserial-1410 — POS-58 (serial 0416:5011)".into(),
469 target: PrinterTarget::Serial("/dev/cu.usbserial-1410".into()),
470 },
471 ];
472 assert_eq!(
473 find_matching_printer(&printers, "auto").map(|p| p.id.as_str()),
474 Some("usb:28e9:0289:0:1")
475 );
476 assert_eq!(
477 find_matching_printer(&printers, "usb:28e9:0289:0:1").map(|p| p.id.as_str()),
478 Some("usb:28e9:0289:0:1")
479 );
480 assert_eq!(
481 find_matching_printer(&printers, "usb:28e9:0289").map(|p| p.id.as_str()),
482 Some("usb:28e9:0289:0:1")
483 );
484 assert_eq!(
485 find_matching_printer(&printers, "serial:/dev/cu.usbserial-1410").map(|p| p.id.as_str()),
486 Some("serial:/dev/cu.usbserial-1410")
487 );
488 assert!(find_matching_printer(&printers, "usb:9999:9999").is_none());
489 assert!(find_matching_printer(&[], "auto").is_none());
490 }
428}
491}