diff --git a/src/application/Shutter.java b/src/application/Shutter.java index f3e8c815..87be1b6a 100644 --- a/src/application/Shutter.java +++ b/src/application/Shutter.java @@ -184,7 +184,7 @@ public class Shutter { /* * Initialisation */ - public static String actualVersion = "18.1"; + public static String actualVersion = "18.2"; public static String getLanguage = ""; public static String arch = "x86_64"; public static long availableMemory; @@ -1725,7 +1725,7 @@ public void mouseReleased(MouseEvent e) { if (accept) { try { - Desktop.getDesktop().browse(new URI("https://www.shutterencoder.com/documentation.html")); + Desktop.getDesktop().browse(new URI("https://www.shutterencoder.com/documentation/")); } catch (IOException | URISyntaxException er) {} } } diff --git a/src/application/Update.java b/src/application/Update.java index 017d5242..9f852cd6 100644 --- a/src/application/Update.java +++ b/src/application/Update.java @@ -225,8 +225,9 @@ public static void newVersion(){ catch (Exception er){} Document doc = Jsoup.connect("https://www.shutterencoder.com").get(); - for (Element file : doc.select("a")) - { + + for (Element file : doc.select("a")) + { if (System.getProperty("os.name").contains("Windows")) //PC { try { diff --git a/src/library/EXIFTOOL.java b/src/library/EXIFTOOL.java index bb0bca93..42d375f1 100644 --- a/src/library/EXIFTOOL.java +++ b/src/library/EXIFTOOL.java @@ -21,11 +21,6 @@ import java.io.BufferedReader; import java.io.InputStreamReader; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZoneOffset; import application.Console; import application.Shutter; @@ -110,21 +105,14 @@ public void run() { exifHours = f[1]; //12:30:00 } - if (line.contains("Create Date")) - { - String l = line.substring(line.indexOf(":") + 2); + if (line.contains("Create Date") && line.contains("+") == false) + { + String l = line.substring(line.indexOf(":") + 2); String f[] = l.split(" "); - creationDate = f[0]; //2018:04:06 - - ZoneOffset zoneOffSet = ZoneId.systemDefault().getRules().getOffset(LocalDateTime.now()); - String o[] = zoneOffSet.toString().split(":"); - Integer offsetTime = Integer.parseInt(o[0]); + creationDate = f[0].toString(); //2018:04:06 - NumberFormat formatter = new DecimalFormat("00"); - String time[] = f[1].split(":"); //12:30:00 - Integer hours = (Integer.parseInt(time[0]) + offsetTime) % 24; - - creationHours = formatter.format(hours) + ":" + time[1] + ":" + time[2]; + String time[] = f[1].split(":"); //12:30:00 + creationHours = time[0] + ":" + time[1] + ":" + time[2]; } if (line.contains("Image Width")) diff --git a/src/library/FFPROBE.java b/src/library/FFPROBE.java index b81a99fa..89b8e538 100644 --- a/src/library/FFPROBE.java +++ b/src/library/FFPROBE.java @@ -611,7 +611,7 @@ else if (line.contains("7.1")) { //Example : 2021-05-20T09:55:22.000000Z String s[] = line.substring(line.indexOf(":") + 1).replace(" ", "").replace("T", " ").split("\\."); - + creationTime = s[0]; } diff --git a/src/settings/Timecode.java b/src/settings/Timecode.java index d731a968..34188d5f 100644 --- a/src/settings/Timecode.java +++ b/src/settings/Timecode.java @@ -47,6 +47,7 @@ public static String setTimecode() { if (caseGenerateFromDate.isSelected()) { String s[] = EXIFTOOL.creationHours.split(":"); + return " -timecode " + '"' + s[0] + ":" + s[1] + ":" + s[2] + dropFrame + "00" + '"'; } else if (caseSetTimecode.isSelected())