From a2fc44acedb8c9b11bbad09045643981da8257e1 Mon Sep 17 00:00:00 2001
From: cyian-1756 <cyian-1756@users.noreply.github.com>
Date: Fri, 17 Nov 2017 05:35:37 -0500
Subject: [PATCH] Logging fixes (#189)

---
 src/main/java/com/rarchives/ripme/App.java             | 10 +++++-----
 .../ripper/rippers/video/MotherlessVideoRipper.java    |  2 +-
 src/main/java/com/rarchives/ripme/ui/UpdateUtils.java  |  2 +-
 src/main/java/com/rarchives/ripme/utils/RipUtils.java  |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java
index 5a75b2f6..326dc5f8 100644
--- a/src/main/java/com/rarchives/ripme/App.java
+++ b/src/main/java/com/rarchives/ripme/App.java
@@ -40,7 +40,7 @@ public class App {
     public static void main(String[] args) throws MalformedURLException {
         CommandLine cl = getArgs(args);
         if (args.length > 0 && cl.hasOption('v')){
-            System.out.println(UpdateUtils.getThisJarVersion());
+            logger.error(UpdateUtils.getThisJarVersion());
             System.exit(0);
         }
 
@@ -107,7 +107,7 @@ public class App {
         if (cl.hasOption('R')) {
             loadHistory();
             if (HISTORY.toList().size() == 0) {
-                System.err.println("There are no history entries to re-rip. Rip some albums first");
+                logger.error("There are no history entries to re-rip. Rip some albums first");
                 System.exit(-1);
             }
             int added = 0;
@@ -130,7 +130,7 @@ public class App {
                 }
             }
             if (added == 0) {
-                System.err.println("No history entries have been 'Checked'\n" +
+                logger.error("No history entries have been 'Checked'\n" +
                     "Check an entry by clicking the checkbox to the right of the URL or Right-click a URL to check/uncheck all items");
                 System.exit(-1);
             }
@@ -142,7 +142,7 @@ public class App {
             Utils.setConfigBoolean("download.save_order", false);
         }
         if ((cl.hasOption('d'))&&(cl.hasOption('D'))) {
-            System.err.println("\nCannot specify '-d' and '-D' simultaneously");
+            logger.error("\nCannot specify '-d' and '-D' simultaneously");
             System.exit(-1);
         }
         if (cl.hasOption('l')) {
@@ -230,7 +230,7 @@ public class App {
                 HISTORY.fromFile(historyFile.getCanonicalPath());
             } catch (IOException e) {
                 logger.error("Failed to load history from file " + historyFile, e);
-                System.out.println(
+                logger.warn(
                         "RipMe failed to load the history file at " + historyFile.getAbsolutePath() + "\n\n" +
                         "Error: " + e.getMessage() + "\n\n" +
                         "Closing RipMe will automatically overwrite the contents of this file,\n" +
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/MotherlessVideoRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/MotherlessVideoRipper.java
index 66a8eae2..2c076d00 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/video/MotherlessVideoRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/MotherlessVideoRipper.java
@@ -55,7 +55,7 @@ public class MotherlessVideoRipper extends VideoRipper {
         logger.info("    Retrieving " + this.url);
         String html = Http.url(this.url).get().toString();
         if (html.contains("__fileurl = '")) {
-            System.err.println("WTF");
+            logger.error("WTF");
         }
         List<String> vidUrls = Utils.between(html, "__fileurl = '", "';");
         if (vidUrls.size() == 0) {
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index ee9b37b5..5dec67e4 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -111,7 +111,7 @@ public class UpdateUtils {
         int[] oldVersions = versionStringToInt(getThisJarVersion());
         int[] newVersions = versionStringToInt(latestVersion);
         if (oldVersions.length < newVersions.length) {
-            System.err.println("Calculated: " + getThisJarVersion() + " < " + latestVersion);
+            logger.error("Calculated: " + getThisJarVersion() + " < " + latestVersion);
             return true;
         }
 
diff --git a/src/main/java/com/rarchives/ripme/utils/RipUtils.java b/src/main/java/com/rarchives/ripme/utils/RipUtils.java
index 0115a9a9..6f3835aa 100644
--- a/src/main/java/com/rarchives/ripme/utils/RipUtils.java
+++ b/src/main/java/com/rarchives/ripme/utils/RipUtils.java
@@ -94,7 +94,7 @@ public class RipUtils {
         Pattern p = Pattern.compile("https?://i.reddituploads.com/([a-zA-Z0-9]+)\\?.*");
         Matcher m = p.matcher(url.toExternalForm());
         if (m.matches()) {
-            System.out.println("URL: " + url.toExternalForm());
+            logger.info("URL: " + url.toExternalForm());
             String u = url.toExternalForm().replaceAll("&amp;", "&");
             try {
                 result.add(new URL(u));