Merge branch 'devel' of https://github.com/fvarrui/JavaPackager into devel

Author: fvarrui

README.md

@@ -15,6 +15,7 @@ It was born while teaching to my students how to build and distribute their Java
 
 - [AstroImageJ](http://astroimagej.com/)
 - [Astro Pixel Processor](https://www.astropixelprocessor.com/)
+- [Drifty](https://github.com/SaptarshiSarkar12/Drifty)
 - [GistFX](https://github.com/RedmondSims/GistFX)
 - [Spektar Design Lab](https://spektar.io/)
 

src/main/java/io/github/fvarrui/javapackager/maven/ResolveLicenseFromPOM.java

@@ -44,7 +44,7 @@ protected File doApply(Packager packager) {
 			} catch (URISyntaxException | MalformedURLException e) {
 				Logger.error("Invalid license URL specified: " + urlStr);
 				licenseFile = null;
-			} catch (IOException e) {
+			} catch (Exception e) {
 				Logger.error("Cannot download license from " + urlStr);
 				licenseFile = null;
 			}

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDmg.java

@@ -5,6 +5,7 @@
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -99,13 +100,13 @@ protected File doApply(MacPackager packager) throws Exception {
 		// mounts image
 		Logger.info("Mounting image: " + tempDmgFile.getAbsolutePath());
 		String result = execute("hdiutil", "attach", "-readwrite", "-noverify", "-noautoopen", tempDmgFile);
-		String deviceName = Arrays.asList(result.split("\n"))
-									.stream()
-									.filter(s -> s.contains(mountFolder.getAbsolutePath()))
-									.map(s -> StringUtils.normalizeSpace(s))
-									.map(s -> s.split(" ")[0])
-									.findFirst().get();
-		Logger.info("- Device name: " + deviceName);
+		Optional<String> optDeviceName = Arrays.asList(result.split("\n"))
+								.stream()
+								.filter(s -> s.contains(mountFolder.getAbsolutePath()))
+								.map(s -> StringUtils.normalizeSpace(s))
+								.map(s -> s.split(" ")[0])
+								.findFirst();
+		optDeviceName.ifPresent(deviceName -> Logger.info("- Device name: " + deviceName));
 
 		// pause to prevent occasional "Can't get disk" (-1728) issues 
 		// https://github.com/seltzered/create-dmg/commit/5fe7802917bb85b40c0630b026d33e421db914ea

src/main/java/io/github/fvarrui/javapackager/utils/FileUtils.java

@@ -305,7 +305,9 @@ public static List<File> findFiles(File searchFolder, String regex) {
 	 */
 	public static File findFirstFile(File searchFolder, String regex) {
 		return Arrays.asList(searchFolder.listFiles((dir, name) -> Pattern.matches(regex, name))).stream()
-				.map(f -> new File(f.getName())).findFirst().get();
+				.map(f -> new File(f.getName()))
+				.findFirst()
+				.orElse(null);
 	}
 
 	/**
@@ -315,8 +317,9 @@ public static File findFirstFile(File searchFolder, String regex) {
 	 * @param file File to copy the downloaded resource
 	 * @throws IOException Resource cannot be copied/downloaded
 	 */
-	public static void downloadFromUrl(URL url, File file) throws IOException {
-		org.apache.commons.io.FileUtils.copyURLToFile(url, file);
+	public static void downloadFromUrl(URL url, File file) throws Exception {
+//		org.apache.commons.io.FileUtils.copyURLToFile(url, file);
+		copyUrlToFile(url,file);
 		Logger.info("File downloaded from [" + url + "] to [" + file.getAbsolutePath() + "]");
 	}
 
@@ -369,4 +372,36 @@ public static void writeStringToFileWithBOM(File output, String data) throws Exc
 		fileOutputStream.close();
 	}
 
+	/**
+	 *
+	 * @param url URL to download
+	 * @param file File to copy the downloaded resource
+	 * @throws Exception if something goes wrong
+	 */
+	public static void copyUrlToFile(URL url,File file) throws Exception {
+		copyUrlToFile(url,file,30000);
+	}
+
+	/**
+	 *
+	 * @param url URL to download
+	 * @param file File to copy the downloaded resource
+	 * @param timeout Download timeout (ms)
+	 * @throws Exception if something goes wrong
+	 */
+	public static void copyUrlToFile(URL url,File file,int timeout) throws Exception {
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.setConnectTimeout(timeout);
+		connection.setReadTimeout(timeout);
+		if (connection.getResponseCode() == HttpURLConnection.HTTP_OK) {
+			try (InputStream in = connection.getInputStream();
+				 FileOutputStream out = new FileOutputStream(file)) {
+				IOUtils.copy(in, out);
+			}
+		} else {
+			Logger.warn("Failed to download the file. Response code: " + connection.getResponseCode());
+		}
+		connection.disconnect();
+	}
+
 }