From c109d8269844fc9d80903d882d3c0a06e6aad789 Mon Sep 17 00:00:00 2001 From: localhorst Date: Sun, 29 May 2022 16:19:39 +0200 Subject: [PATCH] moved to maven project --- .gitignore | 7 ++ pom.xml | 99 +++++++++++++++++++ .../tlc_post}/DBController.java | 1 + .../tlc_post}/DateModified.java | 2 + .../com/hendrikschutter/tlc_post}/Exif.java | 4 +- .../com/hendrikschutter/tlc_post}/Image.java | 1 + .../tlc_post}/ImageFinder.java | 12 ++- .../tlc_post}/ImageFinderCounter.java | 2 + .../tlc_post}/ImageFinderTimestamp.java | 10 +- .../com/hendrikschutter/tlc_post}/Main.java | 10 +- .../com/hendrikschutter/tlc_post}/Output.java | 2 + .../tlc_post}/QueryImages.java | 2 + .../com/hendrikschutter/tlc_post/AppTest.java | 20 ++++ 13 files changed, 160 insertions(+), 12 deletions(-) create mode 100644 pom.xml rename src/{ => main/java/com/hendrikschutter/tlc_post}/DBController.java (95%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/DateModified.java (90%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/Exif.java (89%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/Image.java (96%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/ImageFinder.java (87%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/ImageFinderCounter.java (97%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/ImageFinderTimestamp.java (91%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/Main.java (97%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/Output.java (98%) rename src/{ => main/java/com/hendrikschutter/tlc_post}/QueryImages.java (99%) create mode 100644 src/test/java/com/hendrikschutter/tlc_post/AppTest.java diff --git a/.gitignore b/.gitignore index 84adb3f..27d59e3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,10 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +target/ +.settings/ +.project +.classpath +..gitignore.kate-swp + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..63a742a --- /dev/null +++ b/pom.xml @@ -0,0 +1,99 @@ + + + + 4.0.0 + + com.hendrikschutter + tlc_post + 0.0.1-SNAPSHOT + + tlc_post + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + commons-io + commons-io + 2.11.0 + + + com.drewnoakes + metadata-extractor + 2.6.2 + + + org.xerial + sqlite-jdbc + 3.36.0.3 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 11 + 11 + + true + true + + + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + + + + java + + + + + com.hendrikschutter.tlc_post.Main + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.2 + + TLC_Post + true + + + com.hendrikschutter.tlc_post.Main + + + + + + package + + shade + + + + + + + diff --git a/src/DBController.java b/src/main/java/com/hendrikschutter/tlc_post/DBController.java similarity index 95% rename from src/DBController.java rename to src/main/java/com/hendrikschutter/tlc_post/DBController.java index 74d7b4d..92eb72e 100644 --- a/src/DBController.java +++ b/src/main/java/com/hendrikschutter/tlc_post/DBController.java @@ -1,3 +1,4 @@ +package com.hendrikschutter.tlc_post; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/DateModified.java b/src/main/java/com/hendrikschutter/tlc_post/DateModified.java similarity index 90% rename from src/DateModified.java rename to src/main/java/com/hendrikschutter/tlc_post/DateModified.java index bd635a0..e3cd4eb 100644 --- a/src/DateModified.java +++ b/src/main/java/com/hendrikschutter/tlc_post/DateModified.java @@ -1,3 +1,5 @@ +package com.hendrikschutter.tlc_post; + import java.io.File; import java.util.Calendar; import java.util.Date; diff --git a/src/Exif.java b/src/main/java/com/hendrikschutter/tlc_post/Exif.java similarity index 89% rename from src/Exif.java rename to src/main/java/com/hendrikschutter/tlc_post/Exif.java index e6648d7..944b57b 100644 --- a/src/Exif.java +++ b/src/main/java/com/hendrikschutter/tlc_post/Exif.java @@ -1,3 +1,4 @@ +package com.hendrikschutter.tlc_post; import com.drew.imaging.ImageMetadataReader; import com.drew.imaging.ImageProcessingException; @@ -20,8 +21,7 @@ public class Exif Calendar calendar = Calendar.getInstance(); try { Metadata metadata = ImageMetadataReader.readMetadata(file); - ExifSubIFDDirectory directory = metadata - .getFirstDirectoryOfType(ExifSubIFDDirectory.class); + ExifSubIFDDirectory directory = metadata.getDirectory(ExifSubIFDDirectory.class); date = directory.getDate(ExifSubIFDDirectory.TAG_DATETIME_ORIGINAL); ZonedDateTime cetTimeZoned = ZonedDateTime.of( new java.sql.Timestamp(date.getTime()).toLocalDateTime(), diff --git a/src/Image.java b/src/main/java/com/hendrikschutter/tlc_post/Image.java similarity index 96% rename from src/Image.java rename to src/main/java/com/hendrikschutter/tlc_post/Image.java index cbdbb46..2bf6492 100644 --- a/src/Image.java +++ b/src/main/java/com/hendrikschutter/tlc_post/Image.java @@ -1,3 +1,4 @@ +package com.hendrikschutter.tlc_post; public class Image { diff --git a/src/ImageFinder.java b/src/main/java/com/hendrikschutter/tlc_post/ImageFinder.java similarity index 87% rename from src/ImageFinder.java rename to src/main/java/com/hendrikschutter/tlc_post/ImageFinder.java index e56e85e..222b73f 100644 --- a/src/ImageFinder.java +++ b/src/main/java/com/hendrikschutter/tlc_post/ImageFinder.java @@ -1,3 +1,4 @@ +package com.hendrikschutter.tlc_post; import java.nio.file.Files; import java.nio.file.Paths; @@ -15,9 +16,12 @@ public abstract class ImageFinder static int currentMonth = 0; - static String[] monthNames = { "01_January", "02_February", "03_March", "04_April", - "05_May", "06_June", "07_July", "08_August", "09_September", - "10_October", "11_November", "12_December" }; + // static String[] monthNames = { "01_January", "02_February", "03_March", + // "04_April", "05_May", "06_June", "07_July", "08_August", "09_September", + // "10_October", "11_November", "12_December" }; + + static String[] monthNames = { "01", "02", "03", "04", "05", "06", "07", + "08", "09", "10", "11", "12" }; static Boolean[][] month = new Boolean[maxYears][12]; @@ -32,7 +36,7 @@ public abstract class ImageFinder String findStartyear() { boolean next = true; - int i = 0; // start year + int i = 2020; // start year while (next) { int currentyear = i; if (Files.isDirectory(Paths.get(rootFolder + currentyear + "/"))) { diff --git a/src/ImageFinderCounter.java b/src/main/java/com/hendrikschutter/tlc_post/ImageFinderCounter.java similarity index 97% rename from src/ImageFinderCounter.java rename to src/main/java/com/hendrikschutter/tlc_post/ImageFinderCounter.java index 227f624..a042db6 100644 --- a/src/ImageFinderCounter.java +++ b/src/main/java/com/hendrikschutter/tlc_post/ImageFinderCounter.java @@ -1,3 +1,5 @@ +package com.hendrikschutter.tlc_post; + import java.io.File; import java.io.FileFilter; import java.util.Arrays; diff --git a/src/ImageFinderTimestamp.java b/src/main/java/com/hendrikschutter/tlc_post/ImageFinderTimestamp.java similarity index 91% rename from src/ImageFinderTimestamp.java rename to src/main/java/com/hendrikschutter/tlc_post/ImageFinderTimestamp.java index d6bca44..bedc67f 100644 --- a/src/ImageFinderTimestamp.java +++ b/src/main/java/com/hendrikschutter/tlc_post/ImageFinderTimestamp.java @@ -1,3 +1,7 @@ + + +package com.hendrikschutter.tlc_post; + import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -57,15 +61,15 @@ public class ImageFinderTimestamp extends ImageFinder public String getImagePath(int imageCounter) { String path = null; - // System.out.println("filesindex: " + filesindex); - // System.out.println("fileslenght: " + fileslenght); + System.out.println("filesindex: " + filesindex); + System.out.println("fileslenght: " + fileslenght); if ((filesindex < fileslenght) && (fileslenght != 0)) { path = files[filesindex].getAbsolutePath(); filesindex++; return path.substring(lengthRootFolder); } else { - // System.out.println("sort new Images"); + System.out.println("sort new Images"); sortImages(); if (filesindex >= fileslenght) { diff --git a/src/Main.java b/src/main/java/com/hendrikschutter/tlc_post/Main.java similarity index 97% rename from src/Main.java rename to src/main/java/com/hendrikschutter/tlc_post/Main.java index 9bfbdbf..c57c4ca 100644 --- a/src/Main.java +++ b/src/main/java/com/hendrikschutter/tlc_post/Main.java @@ -1,10 +1,10 @@ +package com.hendrikschutter.tlc_post; + import java.io.File; import java.io.FileNotFoundException; import java.io.PrintWriter; import java.util.Calendar; - - public class Main { // read from UI later @@ -123,6 +123,8 @@ public class Main String startyear = imgF.findStartyear(); int yearCount = Integer.parseInt(startyear); + System.out.println(yearCount); + imgF.findYears(yearCount, startyear); imgF.findMonths(yearCount); @@ -149,7 +151,7 @@ public class Main System.out.println("%"); } String path = imgF.getImagePath(i); - // System.out.println(i + " Path: " + path); + System.out.println(i + " Path: " + path); if (path != "404") { // gefunden File f = new File(rootFolderPath + path); @@ -172,6 +174,8 @@ public class Main // nicht gefunden System.out.println("Nicht gefunden: " + i); missingTxt.println(i); + + break; } } missingTxt.close(); diff --git a/src/Output.java b/src/main/java/com/hendrikschutter/tlc_post/Output.java similarity index 98% rename from src/Output.java rename to src/main/java/com/hendrikschutter/tlc_post/Output.java index 96ec761..9371ae9 100644 --- a/src/Output.java +++ b/src/main/java/com/hendrikschutter/tlc_post/Output.java @@ -1,3 +1,5 @@ +package com.hendrikschutter.tlc_post; + import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/src/QueryImages.java b/src/main/java/com/hendrikschutter/tlc_post/QueryImages.java similarity index 99% rename from src/QueryImages.java rename to src/main/java/com/hendrikschutter/tlc_post/QueryImages.java index 1772eed..fc7ff36 100644 --- a/src/QueryImages.java +++ b/src/main/java/com/hendrikschutter/tlc_post/QueryImages.java @@ -1,3 +1,5 @@ +package com.hendrikschutter.tlc_post; + import java.util.Calendar; import java.util.List; diff --git a/src/test/java/com/hendrikschutter/tlc_post/AppTest.java b/src/test/java/com/hendrikschutter/tlc_post/AppTest.java new file mode 100644 index 0000000..7aa3796 --- /dev/null +++ b/src/test/java/com/hendrikschutter/tlc_post/AppTest.java @@ -0,0 +1,20 @@ +package com.hendrikschutter.tlc_post; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Unit test for simple App. + */ +public class AppTest +{ + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() + { + assertTrue( true ); + } +}