Refactor

tresf · Apr 27, 2024 · fb9f723 · fb9f723
1 parent 6943235
commit fb9f723
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/src/qz/printer/PrintOutput.java b/src/qz/printer/PrintOutput.java
@@ -61,16 +61,6 @@ public boolean isSetService() {
     public PrintService getPrintService() {
         return printer.getPrintService().value();
     }
-
-    public void refreshPrintService() {
-        String name = printer.getName();
-        NativePrinterMap.getInstance().remove(name);
-        printer = PrintServiceMatcher.matchPrinter(name);
-        if (printer == null) {
-            throw new IllegalArgumentException("Cannot find printer with name \"" + name + "\"");
-        }
-    }
-
     public NativePrinter getNativePrinter() {
         return printer;
     }

diff --git a/src/qz/printer/PrintServiceMatcher.java b/src/qz/printer/PrintServiceMatcher.java
@@ -24,6 +24,7 @@
 import javax.print.PrintServiceLookup;
 import javax.print.attribute.ResolutionSyntax;
 import javax.print.attribute.standard.*;
+import java.awt.print.PrinterException;
 import java.util.*;
 
 public class PrintServiceMatcher {
@@ -167,6 +168,19 @@ public static NativePrinter matchPrinter(String printerSearch) {
         return matchPrinter(printerSearch, false);
     }
 
+    /**
+     * Attempts to recover from a PrintService becoming unavailable
+     * See: https://github.com/qzind/tray/issues/1259
+     */
+    public static void refreshPrintService(NativePrinter nativePrinter) throws IllegalArgumentException {
+        String name = nativePrinter.getName();
+        NativePrinterMap.getInstance().remove(name);
+
+        if (matchPrinter(name) == null) {
+            throw new IllegalArgumentException("Cannot find printer with name \"" + name + "\"");
+        }
+    }
+
     public static JSONArray getPrintersJSON(boolean includeDetails) throws JSONException {
         JSONArray list = new JSONArray();
 

diff --git a/src/qz/utils/PrintingUtilities.java b/src/qz/utils/PrintingUtilities.java
@@ -202,26 +202,18 @@ public static void processPrintRequest(Session session, String UID, JSONObject p
         PrintProcessor processor = PrintingUtilities.getPrintProcessor(format);
         log.debug("Using {} to print", processor.getClass().getName());
 
+        PrintOutput output = null;
         try {
-            PrintOutput output = new PrintOutput(params.optJSONObject("printer"));
+            output = new PrintOutput(params.optJSONObject("printer"));
             PrintOptions options = new PrintOptions(params.optJSONObject("options"), output, format);
 
             if(type != Type.RAW && !output.isSetService()) {
                 throw new Exception(String.format("%s cannot print to a raw %s", type, output.isSetFile() ? "file" : "host"));
             }
 
             processor.parseData(params.getJSONArray("data"), options);
+            processor.print(output, options);
 
-            try {
-                processor.print(output, options);
-            } catch (PrinterException e) {
-                // e.getMessage() can be null, do not reverse this comparison
-                if (!PRINT_SERVICE_MESSAGE.equals(e.getMessage())) throw e;
-                // https://github.com/qzind/tray/issues/1259
-                log.info("Print Failed, retrying with a new PrintService");
-                output.refreshPrintService();
-                processor.print(output, options);
-            }
             log.info("Printing complete");
 
             PrintSocketClient.sendResult(session, UID, null);
@@ -231,6 +223,16 @@ public static void processPrintRequest(Session session, String UID, JSONObject p
             PrintSocketClient.sendError(session, UID, "Printing cancelled");
         }
         catch(Exception e) {
+            // Catch edge-case with lost PrintService reference
+            // See: https://github.com/qzind/tray/issues/1259
+            if(e instanceof PrinterException) {
+                if(PRINT_SERVICE_MESSAGE.equals(e.getMessage())) {
+                    log.warn("Suppressed exception: \"{}\".  Trying to recover...", PRINT_SERVICE_MESSAGE);
+                    PrintServiceMatcher.refreshPrintService(output.getNativePrinter());
+                    processPrintRequest(session, UID, params); // recurse
+                    return;
+                }
+            }
             log.error("Failed to print", e);
             PrintSocketClient.sendError(session, UID, e);
         }