From e16544428d798c27704b3da710b804a03f04c25a Mon Sep 17 00:00:00 2001 From: MetaPrime Date: Sun, 25 Dec 2016 19:40:54 -0600 Subject: [PATCH] Fixed update machanism (Fixes #384). Update to 1.3.1. --- pom.xml | 2 +- ripme.json | 3 ++- src/main/java/com/rarchives/ripme/ui/UpdateUtils.java | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 9fc353da..c5138da3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.rarchives.ripme ripme jar - 1.3.0 + 1.3.1 ripme http://rip.rarchives.com diff --git a/ripme.json b/ripme.json index 5670a5fc..d8686b76 100644 --- a/ripme.json +++ b/ripme.json @@ -1,7 +1,8 @@ { "latestVersion" : "1.3.0", "changeList" : [ - "1.3.0: Fix Instagram, Tumblr, 4chan rippers. Some new features.", + "1.3.1: Fix update mechanism. Improved Imgur. Some improvements.", + "1.3.0: Fix Instagram, Tumblr, xHamster, 4chan, 8muses. 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", diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java index 14036e80..3061a31f 100644 --- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java +++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java @@ -21,12 +21,15 @@ 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.3.0"; + private static final String DEFAULT_VERSION = "1.3.1"; 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"; + public static String getUpdateJarURL(String latestVersion) { + return "https://github.com/4pr0n/ripme/releases/download/" + latestVersion + "/ripme.jar"; + } + public static String getThisJarVersion() { String thisVersion = UpdateUtils.class.getPackage().getImplementationVersion(); if (thisVersion == null) { @@ -86,7 +89,7 @@ public class UpdateUtils { configUpdateLabel.setText("Downloading new version..."); logger.info("New version found, downloading..."); try { - UpdateUtils.downloadJarAndLaunch(updateJarURL); + UpdateUtils.downloadJarAndLaunch(getUpdateJarURL(latestVersion)); } catch (IOException e) { JOptionPane.showMessageDialog(null, "Error while updating: " + e.getMessage(),