From 1fdf90da8a6d492bd32d30e298031ce165fd98ba Mon Sep 17 00:00:00 2001 From: Jeddunk Date: Sun, 27 Sep 2020 17:48:13 +0200 Subject: [PATCH] code structure changes drone ci --- .drone.yml | 11 +++ .gitignore | 5 +- auto-cream-api.iml | 40 ++++++++++ pom.xml | 77 ++++++++++++++++++- .../jeddunk/autocreamapi}/Controller.java | 17 ++-- .../{ => xyz/jeddunk/autocreamapi}/Main.java | 2 + .../SearchResultWindowController.java | 4 +- .../jeddunk/autocreamapi}/pojo/App.java | 2 +- .../autocreamapi}/pojo/SteamAppsList.java | 2 +- .../autocreamapi}/util/CreamApiConfig.java | 2 +- .../util/CreamApiDllHandler.java | 2 +- .../util/SteamAppsListCache.java | 10 +-- .../autocreamapi}/util/env/MainEnv.java | 2 +- src/main/resources/META-INF/MANIFEST.MF | 2 +- src/main/resources/mainWindow.fxml | 2 +- src/main/resources/searchResultWindow.fxml | 2 +- 16 files changed, 157 insertions(+), 25 deletions(-) create mode 100644 .drone.yml rename src/main/java/{ => xyz/jeddunk/autocreamapi}/Controller.java (97%) rename src/main/java/{ => xyz/jeddunk/autocreamapi}/Main.java (97%) rename src/main/java/{ => xyz/jeddunk/autocreamapi}/SearchResultWindowController.java (97%) rename src/main/java/{ => xyz/jeddunk/autocreamapi}/pojo/App.java (99%) rename src/main/java/{ => xyz/jeddunk/autocreamapi}/pojo/SteamAppsList.java (96%) rename src/main/java/{ => xyz/jeddunk/autocreamapi}/util/CreamApiConfig.java (99%) rename src/main/java/{ => xyz/jeddunk/autocreamapi}/util/CreamApiDllHandler.java (98%) rename src/main/java/{ => xyz/jeddunk/autocreamapi}/util/SteamAppsListCache.java (96%) rename src/main/java/{ => xyz/jeddunk/autocreamapi}/util/env/MainEnv.java (94%) diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..aa89544 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,11 @@ +kind: pipeline +type: docker +name: default + +steps: +- name: build + image: maven:3-amazoncorretto-8 + commands: + - mvn install + + diff --git a/.gitignore b/.gitignore index 68d071a..9444048 100644 --- a/.gitignore +++ b/.gitignore @@ -159,5 +159,6 @@ $RECYCLE.BIN/ /steamapps.json /test.json /steam_api.md5 -/src/main/java/util/env/Default.java -/src/main/java/GetListOfDlc.java +/src/main/java/xyz/jeddunk/autocreamapi/util/env/Default.java +/src/main/java/xyz/jeddunk/autocreamapi/GetListOfDlc.java +dist/ diff --git a/auto-cream-api.iml b/auto-cream-api.iml index e634122..c390abc 100644 --- a/auto-cream-api.iml +++ b/auto-cream-api.iml @@ -12,6 +12,7 @@ + @@ -35,5 +36,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 312a706..95ef2f3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ UTF-8 1.8 1.8 + ${project.basedir}/dist @@ -42,11 +43,11 @@ maven-assembly-plugin - 2.2-beta-5 + 2.2.2 - Main + xyz.jeddunk.autocreamapi.Main @@ -63,6 +64,72 @@ + + org.apache.maven.plugins + maven-install-plugin + 2.4 + + true + + + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0.1 + + + install-copy + install + + copy + + + true + + + ${project.build.directory}/${project.artifactId}-${project.version}-jar-with-dependencies.jar + ${dist}/${project.artifactId}.jar + + + ${project.basedir}/README.md + ${dist}/README.md + + + ${project.basedir}/steam_api.dll + ${dist}/steam_api.dll + + + ${project.basedir}/steam_api.dll + ${dist}/steam_api64.dll + + + ${project.basedir}/version.txt + ${dist}/version.txt + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + install-zip + install + + run + + + + + + + + + @@ -136,5 +203,11 @@ fuzzywuzzy 1.3.1 + + com.coderplus.maven.plugins + copy-rename-maven-plugin + 1.0.1 + + \ No newline at end of file diff --git a/src/main/java/Controller.java b/src/main/java/xyz/jeddunk/autocreamapi/Controller.java similarity index 97% rename from src/main/java/Controller.java rename to src/main/java/xyz/jeddunk/autocreamapi/Controller.java index 223092e..659ab86 100644 --- a/src/main/java/Controller.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/Controller.java @@ -13,6 +13,8 @@ * . */ +package xyz.jeddunk.autocreamapi; + import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView; import javafx.beans.value.ChangeListener; import javafx.collections.FXCollections; @@ -33,10 +35,10 @@ import javafx.stage.*; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.configuration2.ex.ConfigurationException; import org.jsoup.HttpStatusException; -import pojo.App; -import util.CreamApiConfig; -import util.CreamApiDllHandler; -import util.SteamAppsListCache; +import xyz.jeddunk.autocreamapi.pojo.App; +import xyz.jeddunk.autocreamapi.util.CreamApiConfig; +import xyz.jeddunk.autocreamapi.util.CreamApiDllHandler; +import xyz.jeddunk.autocreamapi.util.SteamAppsListCache; import java.io.File; import java.io.IOException; @@ -344,9 +346,12 @@ public class Controller implements Initializable { } catch (HttpStatusException e) { if (e.getStatusCode() == 404) { System.err.println("App ID empty or not found! (HTTP Status Code: 404)"); + System.err.println(e.getUrl()); } else { - // e.printStackTrace(); - System.err.println("STATUS CODE: " + e.getStatusCode()); + System.err.printf("Error occurred while trying to get list of DLCs " + + "(HTTP Status Code: %d)%n", e.getStatusCode()); + System.err.println(e.getUrl()); + //e.printStackTrace(); } cancel(); } catch (IOException e) { diff --git a/src/main/java/Main.java b/src/main/java/xyz/jeddunk/autocreamapi/Main.java similarity index 97% rename from src/main/java/Main.java rename to src/main/java/xyz/jeddunk/autocreamapi/Main.java index 68ce704..16130bc 100644 --- a/src/main/java/Main.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/Main.java @@ -13,6 +13,8 @@ * . */ +package xyz.jeddunk.autocreamapi; + import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; diff --git a/src/main/java/SearchResultWindowController.java b/src/main/java/xyz/jeddunk/autocreamapi/SearchResultWindowController.java similarity index 97% rename from src/main/java/SearchResultWindowController.java rename to src/main/java/xyz/jeddunk/autocreamapi/SearchResultWindowController.java index 771acd5..e1adaad 100644 --- a/src/main/java/SearchResultWindowController.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/SearchResultWindowController.java @@ -13,14 +13,14 @@ * . */ -import javafx.fxml.FXML; +package xyz.jeddunk.autocreamapi;import javafx.fxml.FXML; import javafx.fxml.Initializable; import javafx.scene.control.*; import javafx.scene.control.cell.TreeItemPropertyValueFactory; import javafx.scene.input.MouseButton; import javafx.scene.input.MouseEvent; import javafx.stage.Stage; -import pojo.App; +import xyz.jeddunk.autocreamapi.pojo.App; import java.net.URL; import java.util.List; diff --git a/src/main/java/pojo/App.java b/src/main/java/xyz/jeddunk/autocreamapi/pojo/App.java similarity index 99% rename from src/main/java/pojo/App.java rename to src/main/java/xyz/jeddunk/autocreamapi/pojo/App.java index dd20fe5..36844d7 100644 --- a/src/main/java/pojo/App.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/pojo/App.java @@ -13,7 +13,7 @@ * . */ -package pojo; +package xyz.jeddunk.autocreamapi.pojo; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/pojo/SteamAppsList.java b/src/main/java/xyz/jeddunk/autocreamapi/pojo/SteamAppsList.java similarity index 96% rename from src/main/java/pojo/SteamAppsList.java rename to src/main/java/xyz/jeddunk/autocreamapi/pojo/SteamAppsList.java index 545e7b2..9b81967 100644 --- a/src/main/java/pojo/SteamAppsList.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/pojo/SteamAppsList.java @@ -13,7 +13,7 @@ * . */ -package pojo; +package xyz.jeddunk.autocreamapi.pojo; import java.time.Instant; import java.util.List; diff --git a/src/main/java/util/CreamApiConfig.java b/src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiConfig.java similarity index 99% rename from src/main/java/util/CreamApiConfig.java rename to src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiConfig.java index 0e895db..041c420 100644 --- a/src/main/java/util/CreamApiConfig.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiConfig.java @@ -13,7 +13,7 @@ * . */ -package util; +package xyz.jeddunk.autocreamapi.util; import org.apache.commons.configuration2.*; import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; diff --git a/src/main/java/util/CreamApiDllHandler.java b/src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiDllHandler.java similarity index 98% rename from src/main/java/util/CreamApiDllHandler.java rename to src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiDllHandler.java index e869004..940a545 100644 --- a/src/main/java/util/CreamApiDllHandler.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiDllHandler.java @@ -13,7 +13,7 @@ * . */ -package util; +package xyz.jeddunk.autocreamapi.util; import org.apache.commons.codec.digest.DigestUtils; diff --git a/src/main/java/util/SteamAppsListCache.java b/src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java similarity index 96% rename from src/main/java/util/SteamAppsListCache.java rename to src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java index 591c5bb..f72ca9a 100644 --- a/src/main/java/util/SteamAppsListCache.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java @@ -13,7 +13,7 @@ * . */ -package util; +package xyz.jeddunk.autocreamapi.util; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; @@ -26,9 +26,9 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import pojo.App; -import pojo.SteamAppsList; -import util.env.MainEnv; +import xyz.jeddunk.autocreamapi.pojo.App; +import xyz.jeddunk.autocreamapi.pojo.SteamAppsList; +import xyz.jeddunk.autocreamapi.util.env.MainEnv; import java.io.*; import java.lang.reflect.Type; @@ -46,7 +46,7 @@ public class SteamAppsListCache { public SteamAppsListCache() { try { - Class envDefault = Class.forName("util.env.Default"); + Class envDefault = Class.forName("xyz.jeddunk.autocreamapi.util.env.Default"); env = (MainEnv) envDefault.newInstance(); // System.out.println(env.getKey()); } catch (ClassNotFoundException e) { diff --git a/src/main/java/util/env/MainEnv.java b/src/main/java/xyz/jeddunk/autocreamapi/util/env/MainEnv.java similarity index 94% rename from src/main/java/util/env/MainEnv.java rename to src/main/java/xyz/jeddunk/autocreamapi/util/env/MainEnv.java index d3b4496..0c62d4e 100644 --- a/src/main/java/util/env/MainEnv.java +++ b/src/main/java/xyz/jeddunk/autocreamapi/util/env/MainEnv.java @@ -13,7 +13,7 @@ * . */ -package util.env; +package xyz.jeddunk.autocreamapi.util.env; public class MainEnv { String key = ""; diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index 3e22e7e..846aa6d 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -1 +1 @@ -Main-Class: Main +Main-Class: xyz.jeddunk.autocreamapi.Main diff --git a/src/main/resources/mainWindow.fxml b/src/main/resources/mainWindow.fxml index 60e7f8f..2a0bd35 100644 --- a/src/main/resources/mainWindow.fxml +++ b/src/main/resources/mainWindow.fxml @@ -31,7 +31,7 @@ + xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.jeddunk.autocreamapi.Controller">
diff --git a/src/main/resources/searchResultWindow.fxml b/src/main/resources/searchResultWindow.fxml index 600c0fd..5f2ae45 100644 --- a/src/main/resources/searchResultWindow.fxml +++ b/src/main/resources/searchResultWindow.fxml @@ -24,7 +24,7 @@ ~ . --> - +