refactor error handling for daemon mode

Author: rkm

src/main/java/uk/ac/ed/epcc/ctp_anon_cli/Program.java

@@ -107,27 +107,26 @@ public static void main(String[] args) throws ParseException {
           String[] filePairSplit = line.split(" ");
 
           if (filePairSplit.length != 2) {
-            System.err.println("Expected two file paths");
+            System.out.println("Expected two file paths");
             continue;
           }
 
+          File inFile = new File(filePairSplit[0]);
+          File outFile = new File(filePairSplit[1]);
+
           try {
-            File inFile = new File(filePairSplit[0]);
-            File outFile = new File(filePairSplit[1]);
 
             outFile = ValidateFilePair(inFile, outFile);
 
             anonymizer.anonymize(inFile, outFile);
           } catch (Exception e) {
-            System.err.println(e.getMessage());
+            System.out.println("[" + inFile + ":" + outFile + "] " + e.getMessage());
             continue;
           }
         }
       }
     }
 
-    int rc = 0;
-
     if (
       files.size() == 2 &&
       !files.get(0).contains(":") &&
@@ -143,9 +142,14 @@ public static void main(String[] args) throws ParseException {
         System.exit(1);
       }
 
-      rc = anonymizer.anonymize(inFile, outFile);
+      try {
+          anonymizer.anonymize(inFile, outFile);
+      } catch (Exception e) {
+        System.err.println(e.getMessage());
+        System.exit(1);
+      }
 
-      System.exit(rc);
+      System.exit(0);
     }
 
     List<File> filePairsToProcess = new ArrayList<File>();
@@ -183,14 +187,18 @@ public static void main(String[] args) throws ParseException {
     }
 
     for (int i = 0; i < filePairsToProcess.size(); i += 2) {
-      rc =
+      try {
         anonymizer.anonymize(
           filePairsToProcess.get(i),
           filePairsToProcess.get(i + 1)
         );
+      } catch (Exception e) {
+        System.err.println(e.getMessage());
+        System.exit(1);
+      }
     }
 
-    System.exit(rc);
+    System.exit(0);
   }
 
   private static Options AddRequiredOptions(Options options) {

src/main/java/uk/ac/ed/epcc/ctp_anon_cli/SmiCtpProcessor.java

@@ -59,18 +59,7 @@ public SmiCtpProcessor(
     _transcoder.setTransferSyntax(JPEGLossLess);
   }
 
-  public int anonymize(File inFile, File outFile) {
-    int rc = 0;
-    try {
-      anonymizeImpl(inFile, outFile);
-    } catch (Exception e) {
-      System.err.println("[" + inFile + ":" + outFile + "] " + e.getMessage());
-      rc = 1;
-    }
-    return rc;
-  }
-
-  public void anonymizeImpl(File inFile, File outFile) throws Exception {
+  public void anonymize(File inFile, File outFile) throws Exception {
     // NOTE(rkm 2023-12-01) This ensures CTP won't accidentally clobber the input file
     if (inFile.canWrite()) {
       throw new Exception("Input file was writeable");