Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added ability to check file hash

Browse Source
This commit is contained in:
cyian-1756 2018-05-28 18:33:07 -04:00
parent da1f18f6b8
commit 70716ed577
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
View File

@ -1,13 +1,12 @@
package com.rarchives.ripme.ui; package com.rarchives.ripme.ui;
import java.io.BufferedWriter; import java.io.*;
import java.io.File; import java.security.MessageDigest;
import java.io.FileOutputStream; import java.security.NoSuchAlgorithmException;
import java.io.FileWriter;
import java.io.IOException;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.xml.bind.annotation.adapters.HexBinaryAdapter;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.json.JSONArray; import org.json.JSONArray;
@ -21,7 +20,7 @@ import com.rarchives.ripme.utils.Utils;
public class UpdateUtils { public class UpdateUtils {
private static final Logger logger = Logger.getLogger(UpdateUtils.class); private static final Logger logger = Logger.getLogger(UpdateUtils.class);
private static final String DEFAULT_VERSION = "1.7.48"; private static final String DEFAULT_VERSION = "1.7.49";
private static final String REPO_NAME = "ripmeapp/ripme"; private static final String REPO_NAME = "ripmeapp/ripme";
private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json"; private static final String updateJsonURL = "https://raw.githubusercontent.com/" + REPO_NAME + "/master/ripme.json";
private static final String mainFileName = "ripme.jar"; private static final String mainFileName = "ripme.jar";
@ -73,7 +72,7 @@ public class UpdateUtils {
} }
String latestVersion = json.getString("latestVersion"); String latestVersion = json.getString("latestVersion");
if (UpdateUtils.isNewerVersion(latestVersion)) { if (!UpdateUtils.isNewerVersion(latestVersion)) {
logger.info("Found newer version: " + latestVersion); logger.info("Found newer version: " + latestVersion);
int result = JOptionPane.showConfirmDialog( int result = JOptionPane.showConfirmDialog(
null, null,
@ -141,6 +140,30 @@ public class UpdateUtils {
return intVersions; return intVersions;
} }
// Code take from https://stackoverflow.com/a/30925550
private static String createSha256(File file) {
try {
MessageDigest digest = MessageDigest.getInstance("SHA-256");
InputStream fis = new FileInputStream(file);
int n = 0;
byte[] buffer = new byte[8192];
while (n != -1) {
n = fis.read(buffer);
if (n > 0) {
digest.update(buffer, 0, n);
}
}
return new HexBinaryAdapter().marshal(digest.digest());
} catch (NoSuchAlgorithmException e) {
logger.error("Got error getting file hash " + e.getMessage());
} catch (FileNotFoundException e) {
logger.error("Could not find file: " + file.getName());
} catch (IOException e) {
logger.error("Got error getting file hash " + e.getMessage());
}
return null;
}
private static void downloadJarAndLaunch(String updateJarURL) private static void downloadJarAndLaunch(String updateJarURL)
throws IOException { throws IOException {
Response response; Response response;
@ -153,6 +176,8 @@ public class UpdateUtils {
out.write(response.bodyAsBytes()); out.write(response.bodyAsBytes());
out.close(); out.close();
logger.info("Download of new version complete; saved to " + updateFileName); logger.info("Download of new version complete; saved to " + updateFileName);
logger.info("Checking hash of update");
logger.info("Hash: " + createSha256(new File(updateFileName)));
// Setup updater script // Setup updater script
final String batchFile, script; final String batchFile, script;