resolve issues in lpstat

Author: Abd002

.github/workflows/rust.yml

@@ -93,10 +93,16 @@ jobs:
               -e 's/[[:space:]]+/ /g'
           }
 
-          sys_t="$(lpstat -t | norm)"
-          ex_t="$(./target/debug/examples/lpstat -t | norm)"
+          filter_t() {
+            norm | grep -E \
+              '^(scheduler is (running|not running)$|system default destination: |no system default destination$|device for )' \
+              | sort
+          }
+
+          sys_t="$(lpstat -t | filter_t)"
+          ex_t="$(./target/debug/examples/lpstat -t | filter_t)"
           diff -u <(echo "$sys_t") <(echo "$ex_t")
 
-          sys_o="$(lpstat -W all -o PDF | norm)"
-          ex_o="$(./target/debug/examples/lpstat -W all -o PDF | norm)"
+          sys_o="$(lpstat -W all -o PDF | norm | awk '{print $1, $2, $3}')"
+          ex_o="$(./target/debug/examples/lpstat -W all -o PDF | norm | awk '{print $1, $2, $3}')"
           diff -u <(echo "$sys_o") <(echo "$ex_o")

examples/lpstat.rs

@@ -40,7 +40,7 @@ pub enum Action {
     ShowServerAndPort, // -H
     ShowDefault,       // -d
     ListDestinations,  // -e
-    ShowSchedular,     // -r
+    ShowScheduler,     // -r
     ShowSummary,       // -s
     ShowAll,           // -t
 
@@ -133,7 +133,7 @@ impl Action {
                     }
                 }
             }
-            Action::ShowSchedular => {
+            Action::ShowScheduler => {
                 if scheduler_is_running() {
                     println!("scheduler is running");
                 } else {
@@ -201,11 +201,9 @@ where
     let mut commands: Vec<Step> = Vec::new();
 
     while let Some(arg) = it.next() {
-        if arg == "--help" || arg == "-h" && it.peek().is_none() {
-            if arg == "--help" {
-                print_help();
-                std::process::exit(0);
-            }
+        if arg == "--help" {
+            print_help();
+            std::process::exit(0);
         }
 
         if !arg.starts_with('-') || arg == "-" {
@@ -250,7 +248,7 @@ where
                 'H' => commands.push(Step::Action(Action::ShowServerAndPort)),
                 'd' => commands.push(Step::Action(Action::ShowDefault)),
                 'e' => commands.push(Step::Action(Action::ListDestinations)),
-                'r' => commands.push(Step::Action(Action::ShowSchedular)),
+                'r' => commands.push(Step::Action(Action::ShowScheduler)),
                 's' => commands.push(Step::Action(Action::ShowSummary)),
                 't' => commands.push(Step::Action(Action::ShowAll)),
 
@@ -501,13 +499,13 @@ fn show_classes(filter: Option<&str>, ctx: &mut Context) -> Result<()> {
         name: "member-names",
         kind: AttrKind::StringLike,
     }];
+    
+    let conn = ctx.dests.first().and_then(|d| d.connect(ConnectionFlags::Scheduler, Some(5000), None).ok());
 
     for dest in &mut ctx.dests {
-        let conn = match dest.connect(ConnectionFlags::Scheduler, Some(5000), None) {
-            Ok(c) => c,
-            Err(_) => continue,
-        };
-        let _ = dest.get_attrs(&conn, PRINTER_ATTRS);
+        if let Some(c) = &conn {
+            let _ = dest.get_attrs(c, PRINTER_ATTRS);
+        }
 
         let members_raw = match dest.options.get("member-names") {
             Some(s) => s.as_str(),
@@ -590,17 +588,16 @@ pub fn show_printers(filter: Option<&str>, ctx: &mut Context) -> Result<()> {
     // CUPS_PRINTER_REMOTE bit (matches CUPS headers)
     const CUPS_PRINTER_REMOTE: i32 = 0x00000002;
 
+    let conn = ctx.dests.first().and_then(|d| d.connect(ConnectionFlags::Scheduler, Some(5000), None).ok());
+
     for dest in &mut ctx.dests {
         if !match_list(filter, dest.name.as_str(), dest.instance.as_deref()) {
             continue;
         }
 
-        let conn = match dest.connect(ConnectionFlags::Scheduler, Some(5000), None) {
-            Ok(c) => c,
-            Err(_) => continue,
-        };
-
-        let _ = dest.get_attrs(&conn, PRINTER_ATTRS);
+        if let Some(c) = &conn {
+            let _ = dest.get_attrs(c, PRINTER_ATTRS);
+        }
 
         let pstate = dest
             .options
@@ -822,17 +819,16 @@ pub fn show_accepting(filter: Option<&str>, ctx: &mut Context) -> Result<()> {
         )
     }
 
+    let conn = ctx.dests.first().and_then(|d| d.connect(ConnectionFlags::Scheduler, Some(5000), None).ok());
+
     for dest in &mut ctx.dests {
         if !match_list(filter, dest.name.as_str(), dest.instance.as_deref()) {
             continue;
         }
 
-        let conn = match dest.connect(ConnectionFlags::Scheduler, Some(5000), None) {
-            Ok(c) => c,
-            Err(_) => continue,
-        };
-
-        let _ = dest.get_attrs(&conn, ACCEPTING_ATTRS);
+        if let Some(c) = &conn {
+            let _ = dest.get_attrs(c, ACCEPTING_ATTRS);
+        }
 
         let ptime = dest
             .options
@@ -926,11 +922,17 @@ fn get_job_extras(which: WhichJobs) -> Result<JobExtras> {
     ];
 
     let mut req = IppRequest::new(IppOperation::GetJobs)?;
+    let server = get_server();
+    let uri = if server.starts_with('/') {
+        "ipp://localhost/".to_string()
+    } else {
+        format!("ipp://{}/", server)
+    };
     req.add_string(
         IppTag::Operation,
         IppValueTag::Uri,
         "printer-uri",
-        "ipp://localhost/",
+        &uri,
     )?;
     req.add_strings(
         IppTag::Operation,