From f13de34e69e98b950edd7ab7e8312e04f35337f9 Mon Sep 17 00:00:00 2001 From: metaprime Date: Tue, 20 Dec 2016 01:12:54 -0800 Subject: [PATCH] 1.3.0 - Fix Instagram, Tumblr, and 4chan. Some new features. Added some new features: * Rip a list of URLs from a file from the command line with the -f flag. * Remember window position. * New update mechanism (see notes below). For future updates, RipMe will check against the ripme.json file from the master branch on GitHub rather than depending on the version of the file hosted on rarchives.com. Also, updates to RipMe will be downloaded directly from the releases on GitHub. This keeps development and deployment all in one place on GitHub and reduces maintenance and coordination costs. --- pom.xml | 2 +- ripme.json | 122 ++++++++++++++++++ .../com/rarchives/ripme/ui/UpdateUtils.java | 16 +-- 3 files changed, 131 insertions(+), 9 deletions(-) create mode 100644 ripme.json diff --git a/pom.xml b/pom.xml index 244f36c8..9fc353da 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rarchives.ripme ripme jar - 1.2.13 + 1.3.0 ripme http://rip.rarchives.com diff --git a/ripme.json b/ripme.json new file mode 100644 index 00000000..5670a5fc --- /dev/null +++ b/ripme.json @@ -0,0 +1,122 @@ +{ + "latestVersion" : "1.3.0", + "changeList" : [ + "1.3.0: Fix Instagram, Tumblr, 4chan rippers. Some new features.", + "1.2.13: Hotfix for imgur album rips", + "1.2.12: 500px gallery/subgallery support", + "1.2.11: Deviant fav subfolders, and reddituploads support", + "1.2.10: Imgur /gallery/ images fix", + "1.2.9: Imgur 10-image fix, original twitter sizes", + "1.2.8: Option to prefer MP4 over GIF for imgur", + "1.2.7: Fix 500px ripper to fetch NSFW images", + "1.2.6: Fix 500px ripper", + "1.2.5: Descriptions are optional, minor imgur fixes", + "1.2.4: Fix instagram ripper", + "1.2.3: Fix xhamster videos, option to remove/clear Queue", + "1.2.2: Fix imagefap ripper", + "1.2.1: Gfycat Fix, lots of changes pushed", + "1.2.0: Fix imagebam, 8muses. Remember queue items", + "1.1.9: Hotfix for new imgur album layout", + "1.1.8: Fix for failed reddit rips", + "1.1.7: Imagefap fix, corrupt history crash fix, deviantart 403 fix", + "1.1.6: History error handling and drawchan support", + "1.1.5: Fix imagefap and 8muses rippers", + "1.1.4: Fix DeviantArt 403 errors", + "1.1.3: Fix Check Selected in History", + "1.1.2: Check/Uncheck history by right-clicking the history", + "1.1.1: Gfycat/Reddit fix", + "1.1.0: Revamped History, Cheeby fix", + "1.0.93: Reddit fix, gfycat fix, video download fix", + "1.0.92: Anon-ib fix, cheeby fix, vid.me ripper", + "1.0.91: Fix for anon-ib, minus rippers", + "1.0.90: Hide error message when ripping valid album", + "1.0.89: Fix fapproved ripper", + "1.0.88: Fix imgbox ripper", + "1.0.87: Chan ripper update, Finebox update, Motherless video ripper", + "1.0.86: Fix for imagefap albums larger than 1k images", + "1.0.85: Fix Modelmayhem ripper", + "1.0.84: Ripper can resume after being stopped", + "1.0.83: Fix 2dgalleries ripper", + "1.0.82: Photobucket ripper fix, Clipboard Autorip toggle", + "1.0.81: Tumblr/seenive fixes, queue system, better history", + "1.0.80: Fix Butttoucher ripper", + "1.0.79: Fix cheeby to rip all images", + "1.0.78: BCFakes ripper", + "1.0.77: Cheeby ripper, status in title, various fixes", + "1.0.76: Option to only save URLs, Taptastic ripper", + "1.0.75: 500px ripper", + "1.0.74: Videarn video ripper", + "1.0.73: Datw.in ripper", + "1.0.72: Support for DeviantArt favourites", + "1.0.71: Fuskator ripper", + "1.0.70: Various improvements. Xhamster, Cliphunter video rippers", + "1.0.69: Gfycat video ripper, instgram username fix", + "1.0.68: Imagevenue and hentai-foundry rippers", + "1.0.67: Support for external tumblr domains", + "1.0.66: GirlsOfDesire ripper", + "1.0.65: Vidd.me video ripper", + "1.0.64: Imagebam ripper", + "1.0.63: Hopefully fixing freezing issue while re-ripping all albums", + "1.0.62: Imgur album directories named after album title", + "1.0.61: Logs are optional, defaults to not save logs", + "1.0.60: Fix for crazy directory creation bug", + "1.0.59: Show when albums can be ripped immediately", + "1.0.58: Logs are saved to album directory, ehentai fix", + "1.0.57: Nfsfw ripper", + "1.0.56: Fix for imgur rips", + "1.0.55: Ehentai ripper bypasses content warning", + "1.0.54: Mediacru.sh ripper, may require a Java update", + "1.0.53: 8Muses ripper fix, can rip subalbums", + "1.0.52: Imgbox ripper, popup notifications are optional", + "1.0.51: Deviantart rips full-size NSFW images", + "1.0.50: Smutty.com ripper", + "1.0.49: More Ehentai ripper fixes", + "1.0.48: Imagestash.org /tag/ ripper, ehentai fixes", + "1.0.47: Vidble ripper, right-click popupmenu on text", + "1.0.46: Auto-indexing filenames (001_, 002_, etc) is now optional", + "1.0.45: Imagefap /gallery/, Motherless search terms, reddit ripper fix", + "1.0.44: Deviantart rips full-size images", + "1.0.43: Added Modelmayhem ripper", + "1.0.42: Added Drawcrowd ripper, bug fix for large albums", + "1.0.41: Fix for multi-page Deviantart galleries, secure Flickr URLs", + "1.0.40: Flickr bug fix and groups support", + "1.0.39: Various fixes for Ehentai and Motherless", + "1.0.38: Ehentai ripper, 4chan .webm support, optional audio confirmations", + "1.0.37: Added Vine.co and Supertangas rippers", + "1.0.36: Added semi-working Gifyo ripper", + "1.0.35: Fixed i.rarchives ripper, delete empty directories", + "1.0.34: Added fapproved and anonib rippers", + "1.0.33: Imgur ripper fixes", + "1.0.32: Fix for directories with special characters", + "1.0.31: Fix for large imgur albums", + "1.0.30: Added Minus ripper", + "1.0.29: Various fixes for tumblr, flickr, 4chan", + "1.0.28: Added vk.com video ripper(s)", + "1.0.27: Added flickr ripper", + "1.0.26: Ability to rerip history from command-line", + "1.0.25: Added photobucket ripper", + "1.0.24: Fixed possible deadlock issue while re-ripping albums", + "1.0.23: Added teenplanet, irarchives, and butttoucher support", + "1.0.22: Fixed huge bug where ripper did not work at all for any sites", + "1.0.21: Ability to rip user account images on imgur", + "1.0.20: Video ripper support: pornhub, youporn, beeg, xvideos", + "1.0.19: Fix imgur account ripper", + "1.0.18: Button icons, kinkyshare.com ripper", + "1.0.17: *chan ripper, imgur titles in filenames", + "1.0.16: Fix bug with instagram usernames containing _ or -", + "1.0.15: Auto-updater should be compatible with Windows", + "1.0.14: Fix twitter account names with _ or -", + "1.0.13: Auto-updater is more verbose, hopefully works", + "1.0.12: Fixed clipboard autorip bug", + "1.0.11: 404 images are markead as errored", + "1.0.10: Taskbar notifications when rips start", + "1.0.9: More-verbose completion, UI tweaks", + "1.0.8: Auto-update functionality", + "1.0.7: Clipboard Autorip and tray icons", + "1.0.6: Support imgur.com/r/subreddit albums", + "1.0.5: Persistent configuration, small bug fixes", + "1.0.4: Fixed spaces-in-directory bug", + "1.0.3: Added VK.com ripper", + "1.0.1: Added auto-update functionality" + ] +} diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java index 3bd48127..14036e80 100644 --- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java +++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java @@ -21,9 +21,9 @@ import com.rarchives.ripme.utils.Utils; public class UpdateUtils { private static final Logger logger = Logger.getLogger(UpdateUtils.class); - private static final String DEFAULT_VERSION = "1.2.13"; - private static final String updateJsonURL = "http://rarchives.com/ripme.json"; - private static final String updateJarURL = "http://rarchives.com/ripme.jar"; + private static final String DEFAULT_VERSION = "1.3.0"; + private static final String updateJsonURL = "https://cdn.rawgit.com/4pr0n/ripme/master/ripme.json"; + private static final String updateJarURL = "https://github.com/4pr0n/ripme/releases/download/" + DEFAULT_VERSION + "/ripme.jar"; private static final String mainFileName = "ripme.jar"; private static final String updateFileName = "ripme.jar.update"; @@ -35,10 +35,10 @@ public class UpdateUtils { } return thisVersion; } - + public static void updateProgram(JLabel configUpdateLabel) { configUpdateLabel.setText("Checking for update..."); - + Document doc = null; try { logger.debug("Retrieving " + UpdateUtils.updateJsonURL); @@ -103,7 +103,7 @@ public class UpdateUtils { logger.debug("Running latest version: " + UpdateUtils.getThisJarVersion()); } } - + private static boolean isNewerVersion(String latestVersion) { int[] oldVersions = versionStringToInt(getThisJarVersion()); int[] newVersions = versionStringToInt(latestVersion); @@ -130,7 +130,7 @@ public class UpdateUtils { // Assume any additional changes to the version text means a new version return !(latestVersion.equals(getThisJarVersion())); } - + private static int[] versionStringToInt(String version) { String strippedVersion = version.split("-")[0]; String[] strVersions = strippedVersion.split("\\."); @@ -206,5 +206,5 @@ public class UpdateUtils { logger.info("Exiting older version, should execute update script (" + batchFile + ") during exit"); System.exit(0); } - + }