fixing rip completion check, various log lines

src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java

@@ -151,6 +151,7 @@ public abstract class AbstractRipper
     protected void waitForThreads() {
         completed = false;
         threadPool.waitForThreads();
+        checkIfComplete();
     }
 
     /**
@@ -223,22 +224,24 @@ public abstract class AbstractRipper
             itemsErrored.put(url, message);
             observer.update(this, new RipStatusMessage(STATUS.DOWNLOAD_WARN, url + " : " + message));
             observer.notifyAll();
-            checkIfComplete();
         }
+        checkIfComplete();
     }
 
     /**
      * Notifies observers and updates state if all files have been ripped.
      */
     private void checkIfComplete() {
-        if (!completed && itemsPending.size() == 0) {
+        synchronized (observer) {
-            completed = true;
+            if (!completed && itemsPending.size() == 0) {
-            logger.info("    Rip completed!");
+                completed = true;
-            observer.update(this,
+                logger.info("   Rip completed!");
-                    new RipStatusMessage(
+                observer.update(this,
-                            STATUS.RIP_COMPLETE,
+                        new RipStatusMessage(
-                            workingDir));
+                                STATUS.RIP_COMPLETE,
-            observer.notifyAll();
+                                workingDir));
+                observer.notifyAll();
+            }
         }
     }
 

src/main/java/com/rarchives/ripme/ripper/DownloadThreadPool.java

@@ -33,7 +33,7 @@ public class DownloadThreadPool {
     public void addThread(Thread t) {
         threadPool.execute(t);
     }
-    
+
     public void waitForThreads() {
         threadPool.shutdown();
         try {

src/main/java/com/rarchives/ripme/ripper/rippers/ImagefapRipper.java

@@ -60,7 +60,7 @@ public class ImagefapRipper extends AbstractRipper {
     @Override
     public void rip() throws IOException {
         int index = 0;
-        logger.info("[ ] Retrieving " + this.url.toExternalForm());
+        logger.info("    Retrieving " + this.url.toExternalForm());
         Document doc = Jsoup.connect(this.url.toExternalForm()).get();
         for (Element thumb : doc.select("#gallery img")) {
             if (!thumb.hasAttr("src") || !thumb.hasAttr("width")) {

src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java

@@ -63,7 +63,7 @@ public class InstagramRipper extends AbstractRipper {
     }
     
     private String getUserID(URL url) throws IOException {
-        logger.info("   Retrieving " + url);
+        logger.info("    Retrieving " + url);
         Document doc = Jsoup.connect(this.url.toExternalForm()).get();
         for (Element element : doc.select("input[id=user_public]")) {
             return element.attr("value");

src/main/java/com/rarchives/ripme/ripper/rippers/MotherlessRipper.java

@@ -58,7 +58,7 @@ public class MotherlessRipper extends AbstractRipper {
     @Override
     public void rip() throws IOException {
         int index = 0;
-        logger.info("[ ] Retrieving " + this.url.toExternalForm());
+        logger.info("    Retrieving " + this.url.toExternalForm());
         Document doc = Jsoup.connect(this.url.toExternalForm())
                             .userAgent(USER_AGENT)
                             .get();

src/main/java/com/rarchives/ripme/ripper/rippers/SeeniveRipper.java

@@ -41,7 +41,7 @@ public class SeeniveRipper extends AbstractRipper {
     @Override
     public void rip() throws IOException {
         String baseURL = this.url.toExternalForm();
-        logger.info("[ ] Retrieving " + baseURL);
+        logger.info("    Retrieving " + baseURL);
         Document doc = Jsoup.connect(baseURL)
                             .header("Referer", baseURL)
                             .userAgent(USER_AGENT)

src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java

@@ -62,20 +62,20 @@ public class TumblrRipper extends AbstractRipper {
             offset = 0;
             while (true) {
                 String apiURL = getTumblrApiURL(mediaType, offset);
-                logger.info("   Retrieving " + apiURL);
+                logger.info("    Retrieving " + apiURL);
                 Document doc = Jsoup.connect(apiURL)
                                     .ignoreContentType(true)
                                     .header("User-agent", USER_AGENT)
                                     .get();
-                String jsonString = doc.body().html().replaceAll(""", "\"");
-                if (!handleJSON(jsonString)) {
-                    // Returns false if an error occurs and we should stop.
-                    break;
-                }
                 try {
                     Thread.sleep(1000);
                 } catch (InterruptedException e) {
-                    logger.error("[!] Exception while waiting to load next album:", e);
+                    logger.error("[!] Interrupted while waiting to load next album:", e);
+                    break;
+                }
+                String jsonString = doc.body().html().replaceAll(""", "\"");
+                if (!handleJSON(jsonString)) {
+                    // Returns false if an error occurs and we should stop.
                     break;
                 }
                 offset += 20;
@@ -96,7 +96,7 @@ public class TumblrRipper extends AbstractRipper {
 
         posts = json.getJSONObject("response").getJSONArray("posts");
         if (posts.length() == 0) {
-            logger.info("   Zero posts returned. Dropping out.");
+            logger.info("   Zero posts returned.");
             return false;
         }
 

src/main/java/com/rarchives/ripme/ripper/rippers/TwitterRipper.java

@@ -144,7 +144,7 @@ public class TwitterRipper extends AbstractRipper {
     
     private List<JSONObject> getTweets(String url) throws IOException {
         List<JSONObject> tweets = new ArrayList<JSONObject>();
-        logger.info("   Retrieving " + url);
+        logger.info("    Retrieving " + url);
         Document doc = Jsoup.connect(url)
                             .ignoreContentType(true)
                             .header("Authorization", "Bearer " + accessToken)

src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java

@@ -41,7 +41,7 @@ public class VineboxRipper extends AbstractRipper {
         while (true) {
             page++;
             String urlPaged = this.url.toExternalForm() + "?page=" + page;
-            logger.info("[ ] Retrieving " + urlPaged);
+            logger.info("    Retrieving " + urlPaged);
             try {
                 doc = Jsoup.connect(urlPaged).get();
             } catch (HttpStatusException e) {

src/test/java/com/rarchives/ripme/tst/ripper/rippers/TumblrRipperTest.java

@@ -15,8 +15,8 @@ public class TumblrRipperTest extends RippersTest {
         }
         List<URL> contentURLs = new ArrayList<URL>();
         contentURLs.add(new URL("http://wrouinr.tumblr.com/archive"));
-        contentURLs.add(new URL("http://topinstagirls.tumblr.com/tagged/berlinskaya"));
+        //contentURLs.add(new URL("http://topinstagirls.tumblr.com/tagged/berlinskaya"));
-        contentURLs.add(new URL("http://fittingroomgirls.tumblr.com/post/78268776776"));
+        //contentURLs.add(new URL("http://fittingroomgirls.tumblr.com/post/78268776776"));
         for (URL url : contentURLs) {
             try {
                 TumblrRipper ripper = new TumblrRipper(url);