From b6c925caae2df4971f57459338235ffb7ebf061f Mon Sep 17 00:00:00 2001 From: MetaPrime Date: Tue, 9 May 2017 16:13:42 -0700 Subject: [PATCH] Various reformatting. --- src/main/java/com/rarchives/ripme/App.java | 2 +- .../ripme/ripper/rippers/InstagramRipper.java | 4 +- .../ripper/rippers/MyhentaicomicsRipper.java | 11 +---- .../ripme/ripper/rippers/TumblrRipper.java | 4 +- .../com/rarchives/ripme/utils/Base64.java | 45 +++++++++---------- 5 files changed, 28 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 95bf5ed7..2adb0f2c 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -171,7 +171,7 @@ public class App { if (!history.contains(url.toExternalForm())) { history.add(url.toExternalForm()); Utils.setConfigList("download.history", Arrays.asList(history.toArray())); - if(saveConfig) { + if (saveConfig) { Utils.saveConfig(); } } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java index 69db4920..e2828709 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/InstagramRipper.java @@ -62,7 +62,7 @@ public class InstagramRipper extends AbstractJSONRipper { Pattern p = Pattern.compile("^https?://instagram\\.com/([^/]+)"); Matcher m = p.matcher(url.toExternalForm()); - if(m.matches()) { + if (m.matches()) { return m.group(1); } @@ -92,7 +92,7 @@ public class InstagramRipper extends AbstractJSONRipper { throw new IOException("No additional pages found"); } - if(nextPageAvailable) { + if (nextPageAvailable) { JSONArray items = json.getJSONArray("items"); JSONObject last_item = items.getJSONObject(items.length() - 1); String nextMaxID = last_item.getString("id"); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MyhentaicomicsRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MyhentaicomicsRipper.java index 32612012..a4714b2a 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/MyhentaicomicsRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/MyhentaicomicsRipper.java @@ -2,24 +2,15 @@ package com.rarchives.ripme.ripper.rippers; import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.utils.Http; -import com.rarchives.ripme.utils.Utils; -import java.io.File; import java.io.IOException; import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; public class MyhentaicomicsRipper extends AbstractHTMLRipper { public static boolean isTag; @@ -109,7 +100,7 @@ public class MyhentaicomicsRipper extends AbstractHTMLRipper { Element elem = nextAlbumPage.select("a.ui-icon-right").first(); String nextPage = elem.attr("href"); pageNumber = pageNumber + 1; - if(nextPage == ""){ + if (nextPage == ""){ logger.info("Got " + pageNumber + " pages"); break; } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java index 2d2e72aa..10caab9b 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/TumblrRipper.java @@ -194,9 +194,9 @@ public class TumblrRipper extends AlbumRipper { try { fileURL = new URL(photo.getJSONObject("original_size").getString("url")); m = p.matcher(fileURL.toString()); - if(m.matches()) { + if (m.matches()) { addURLToDownload(fileURL); - } else{ + } else { URL redirectedURL = Http.url(fileURL).ignoreContentType().response().url(); addURLToDownload(redirectedURL); } diff --git a/src/main/java/com/rarchives/ripme/utils/Base64.java b/src/main/java/com/rarchives/ripme/utils/Base64.java index b48f7452..961ce9df 100644 --- a/src/main/java/com/rarchives/ripme/utils/Base64.java +++ b/src/main/java/com/rarchives/ripme/utils/Base64.java @@ -3,16 +3,15 @@ package com.rarchives.ripme.utils; /** * Base64 encoder/decoder * From http://stackoverflow.com/a/4265472 - * */ public class Base64 { private final static char[] ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray(); - private static int[] toInt = new int[128]; + private static int[] toInt = new int[128]; static { - for(int i=0; i< ALPHABET.length; i++){ - toInt[ALPHABET[i]]= i; + for (int i = 0; i < ALPHABET.length; i++) { + toInt[ALPHABET[i]] = i; } } @@ -22,12 +21,12 @@ public class Base64 { * @param buf the byte array (not null) * @return the translated Base64 string (not null) */ - public static String encode(byte[] buf){ + public static String encode(byte[] buf) { int size = buf.length; char[] ar = new char[((size + 2) / 3) * 4]; int a = 0; - int i=0; - while(i < size){ + int i = 0; + while (i < size) { byte b0 = buf[i++]; byte b1 = (i < size) ? buf[i++] : 0; byte b2 = (i < size) ? buf[i++] : 0; @@ -38,9 +37,9 @@ public class Base64 { ar[a++] = ALPHABET[((b1 << 2) | ((b2 & 0xFF) >> 6)) & mask]; ar[a++] = ALPHABET[b2 & mask]; } - switch(size % 3){ - case 1: ar[--a] = '='; - case 2: ar[--a] = '='; + switch (size % 3) { + case 1: ar[--a] = '='; + case 2: ar[--a] = '='; } return new String(ar); } @@ -51,25 +50,25 @@ public class Base64 { * @param s the Base64 string (not null) * @return the byte array (not null) */ - public static byte[] decode(String s){ - int delta = s.endsWith( "==" ) ? 2 : s.endsWith( "=" ) ? 1 : 0; - byte[] buffer = new byte[s.length()*3/4 - delta]; + public static byte[] decode(String s) { + int delta = s.endsWith("==") ? 2 : s.endsWith("=") ? 1 : 0; + byte[] buffer = new byte[s.length() * 3 / 4 - delta]; int mask = 0xFF; int index = 0; - for(int i=0; i< s.length(); i+=4){ - int c0 = toInt[s.charAt( i )]; - int c1 = toInt[s.charAt( i + 1)]; - buffer[index++]= (byte)(((c0 << 2) | (c1 >> 4)) & mask); - if(index >= buffer.length){ + for (int i = 0; i < s.length(); i += 4) { + int c0 = toInt[s.charAt(i)]; + int c1 = toInt[s.charAt(i + 1)]; + buffer[index++] = (byte) (((c0 << 2) | (c1 >> 4)) & mask); + if (index >= buffer.length) { return buffer; } - int c2 = toInt[s.charAt( i + 2)]; - buffer[index++]= (byte)(((c1 << 4) | (c2 >> 2)) & mask); - if(index >= buffer.length){ + int c2 = toInt[s.charAt(i + 2)]; + buffer[index++] = (byte) (((c1 << 4) | (c2 >> 2)) & mask); + if (index >= buffer.length) { return buffer; } - int c3 = toInt[s.charAt( i + 3 )]; - buffer[index++]= (byte)(((c2 << 6) | c3) & mask); + int c3 = toInt[s.charAt(i + 3)]; + buffer[index++] = (byte) (((c2 << 6) | c3) & mask); } return buffer; }