diff --git a/Mage.Updater/src/main/java/com/magefree/update/Updater.java b/Mage.Updater/src/main/java/com/magefree/update/Updater.java index 19d64ceeaaa..c43c215074e 100644 --- a/Mage.Updater/src/main/java/com/magefree/update/Updater.java +++ b/Mage.Updater/src/main/java/com/magefree/update/Updater.java @@ -1,6 +1,10 @@ package com.magefree.update; -import java.io.*; +import com.magefree.update.helpers.ChechsumHelper; +import com.magefree.update.helpers.FileHelper; + +import java.io.File; +import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; @@ -166,43 +170,13 @@ public class Updater { urlConnection.connect(); if (urlConnection.getResponseCode() == HttpURLConnection.HTTP_OK) { - downloadFile(filename, urlConnection); + FileHelper.downloadFile(filename, urlConnection); } else { System.out.println(filename + " error status : " + urlConnection.getResponseMessage()); } } } - /** - * Downloads specified file. - * - * @param filename - * @param urlConnection - */ - private void downloadFile(String filename, HttpURLConnection urlConnection) { - System.out.println("Downloading " + filename); - try { - InputStream in = urlConnection.getInputStream(); - File f = new File(filename); - if (!f.exists()) { - f.getParentFile().mkdirs(); - System.out.println("Directories have been created: " + f.getParentFile().getPath()); - } - - FileOutputStream out = new FileOutputStream(filename); - byte[] buf = new byte[4 * 1024]; - int bytesRead; - - while ((bytesRead = in.read(buf)) != -1) { - out.write(buf, 0, bytesRead); - } - - System.out.println("File has been updated: " + filename); - } catch (IOException e) { - System.out.println("i/o exception - " + e.getMessage()); - } - } - /** * Removes files from the list. * diff --git a/Mage.Updater/src/main/java/com/magefree/update/ChechsumHelper.java b/Mage.Updater/src/main/java/com/magefree/update/helpers/ChechsumHelper.java similarity index 97% rename from Mage.Updater/src/main/java/com/magefree/update/ChechsumHelper.java rename to Mage.Updater/src/main/java/com/magefree/update/helpers/ChechsumHelper.java index 1f294780a44..73aa1c17638 100644 --- a/Mage.Updater/src/main/java/com/magefree/update/ChechsumHelper.java +++ b/Mage.Updater/src/main/java/com/magefree/update/helpers/ChechsumHelper.java @@ -1,4 +1,4 @@ -package com.magefree.update; +package com.magefree.update.helpers; import java.io.FileInputStream; import java.io.InputStream; diff --git a/Mage.Updater/src/main/java/com/magefree/update/FileHelper.java b/Mage.Updater/src/main/java/com/magefree/update/helpers/FileHelper.java similarity index 66% rename from Mage.Updater/src/main/java/com/magefree/update/FileHelper.java rename to Mage.Updater/src/main/java/com/magefree/update/helpers/FileHelper.java index d6007c756f5..e725b9d938c 100644 --- a/Mage.Updater/src/main/java/com/magefree/update/FileHelper.java +++ b/Mage.Updater/src/main/java/com/magefree/update/helpers/FileHelper.java @@ -1,7 +1,7 @@ -package com.magefree.update; +package com.magefree.update.helpers; -import java.io.File; -import java.io.FilenameFilter; +import java.io.*; +import java.net.HttpURLConnection; import java.util.ArrayList; import java.util.List; @@ -15,6 +15,26 @@ public class FileHelper { private FileHelper() { } + /** + * Filters out dirs. + */ + private static final FilenameFilter anyFileFilter = new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return dir.isFile(); + } + }; + + /** + * Filters out jars. + */ + private static final FilenameFilter jarFileFilter = new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.endsWith(".jar"); + } + }; + /** * Gets .jar files from specified folder. * @@ -67,22 +87,32 @@ public class FileHelper { } /** - * Filters out dirs. + * Downloads specified file. + * + * @param filename + * @param urlConnection */ - private static final FilenameFilter anyFileFilter = new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return dir.isFile(); - } - }; + public static void downloadFile(String filename, HttpURLConnection urlConnection) { + System.out.println("Downloading " + filename); + try { + InputStream in = urlConnection.getInputStream(); + File f = new File(filename); + if (!f.exists()) { + f.getParentFile().mkdirs(); + System.out.println("Directories have been created: " + f.getParentFile().getPath()); + } - /** - * Filters out jars. - */ - private static final FilenameFilter jarFileFilter = new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(".jar"); + FileOutputStream out = new FileOutputStream(filename); + byte[] buf = new byte[4 * 1024]; + int bytesRead; + + while ((bytesRead = in.read(buf)) != -1) { + out.write(buf, 0, bytesRead); + } + + System.out.println("File has been updated: " + filename); + } catch (IOException e) { + System.out.println("i/o exception - " + e.getMessage()); } - }; + } }