code structure changes

drone ci
2020-09-27 17:48:13 +02:00 · 2020-09-27 17:48:13 +02:00 · 1fdf90da8a
commit 1fdf90da8a
parent 79bda2b1fd
16 changed files with 157 additions and 25 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,11 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: build
+  image: maven:3-amazoncorretto-8
+  commands:
+  - mvn install
+
+
--- 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/
--- a/auto-cream-api.iml
+++ b/auto-cream-api.iml
@ -12,6 +12,7 @@
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/dist" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
    </content>
    <orderEntry type="inheritedJdk" />
@ -35,5 +36,44 @@
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.10" level="project" />
    <orderEntry type="library" name="Maven: me.xdrop:fuzzywuzzy:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-model:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-project:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-settings:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-profile:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact-manager:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-registry:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-core:2.0.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.maven.wagon:wagon-file:1.0-beta-2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-parameter-documenter:2.0.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.maven.wagon:wagon-webdav:1.0-beta-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: slide:slide-webdavlib:2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-httpclient:commons-httpclient:2.0.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: jdom:jdom:1.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: de.zeigermann.xml:xml-im-exporter:1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.maven.wagon:wagon-http-shared:1.0-beta-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: jtidy:jtidy:4aug2000r7-dev" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.reporting:maven-reporting-api:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.doxia:doxia-sink-api:1.0-alpha-10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-repository-metadata:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-error-diagnostics:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.maven.wagon:wagon-ssh-external:1.0-beta-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.maven.wagon:wagon-ssh-common:1.0-beta-2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-descriptor:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-interactivity-api:1.0-alpha-4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-monitor:2.0.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.maven.wagon:wagon-ssh:1.0-beta-2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.jcraft:jsch:0.1.27" level="project" />
+    <orderEntry type="library" name="Maven: classworlds:classworlds:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-plugin-api:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.maven:maven-artifact:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.plexus:plexus-utils:1.5.8" level="project" />
+    <orderEntry type="library" name="Maven: org.sonatype.plexus:plexus-build-api:0.0.7" level="project" />
  </component>
 </module>
--- a/pom.xml
+++ b/pom.xml
@ -27,6 +27,7 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <maven.compiler.source>1.8</maven.compiler.source>
        <maven.compiler.target>1.8</maven.compiler.target>
+        <dist>${project.basedir}/dist</dist>
    </properties>

    <build>
@ -42,11 +43,11 @@
            </plugin>
            <plugin>
                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
+                <version>2.2.2</version>
                <configuration>
                    <archive>
                        <manifest>
-                            <mainClass>Main</mainClass>
+                            <mainClass>xyz.jeddunk.autocreamapi.Main</mainClass>
                        </manifest>
                    </archive>
                    <descriptorRefs>
@ -63,6 +64,72 @@
                    </execution>
                </executions>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.coderplus.maven.plugins</groupId>
+                <artifactId>copy-rename-maven-plugin</artifactId>
+                <version>1.0.1</version>
+                <executions>
+                    <execution>
+                        <id>install-copy</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <overWrite>true</overWrite>
+                            <fileSets>
+                                <fileSet>
+                                    <sourceFile>${project.build.directory}/${project.artifactId}-${project.version}-jar-with-dependencies.jar</sourceFile>
+                                    <destinationFile>${dist}/${project.artifactId}.jar</destinationFile>
+                                </fileSet>
+                                <fileSet>
+                                    <sourceFile>${project.basedir}/README.md</sourceFile>
+                                    <destinationFile>${dist}/README.md</destinationFile>
+                                </fileSet>
+                                <fileSet>
+                                    <sourceFile>${project.basedir}/steam_api.dll</sourceFile>
+                                    <destinationFile>${dist}/steam_api.dll</destinationFile>
+                                </fileSet>
+                                <fileSet>
+                                    <sourceFile>${project.basedir}/steam_api.dll</sourceFile>
+                                    <destinationFile>${dist}/steam_api64.dll</destinationFile>
+                                </fileSet>
+                                <fileSet>
+                                    <sourceFile>${project.basedir}/version.txt</sourceFile>
+                                    <destinationFile>${dist}/version.txt</destinationFile>
+                                </fileSet>
+                            </fileSets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>install-zip</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <zip destfile="${project.basedir}/${project.artifactId}-${project.version}.zip" basedir="${dist}"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
        </plugins>
    </build>

@ -136,5 +203,11 @@
            <artifactId>fuzzywuzzy</artifactId>
            <version>1.3.1</version>
        </dependency>
+        <dependency>
+            <groupId>com.coderplus.maven.plugins</groupId>
+            <artifactId>copy-rename-maven-plugin</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
    </dependencies>
 </project>
--- a/src/main/java/xyz/jeddunk/autocreamapi/Controller.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/Controller.java
@ -13,6 +13,8 @@
 * <https://www.gnu.org/licenses/>.
 */

+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 {
+                                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();
-                                System.err.println("STATUS CODE: " + e.getStatusCode());
                            }
                            cancel();
                        } catch (IOException e) {
--- a/src/main/java/xyz/jeddunk/autocreamapi/Main.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/Main.java
@ -13,6 +13,8 @@
 * <https://www.gnu.org/licenses/>.
 */

+package xyz.jeddunk.autocreamapi;
+
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
--- a/src/main/java/xyz/jeddunk/autocreamapi/SearchResultWindowController.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/SearchResultWindowController.java
@ -13,14 +13,14 @@
 * <https://www.gnu.org/licenses/>.
 */

-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;
--- a/src/main/java/xyz/jeddunk/autocreamapi/pojo/App.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/pojo/App.java
@ -13,7 +13,7 @@
 * <https://www.gnu.org/licenses/>.
 */

-package pojo;
+package xyz.jeddunk.autocreamapi.pojo;

 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
--- a/src/main/java/xyz/jeddunk/autocreamapi/pojo/SteamAppsList.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/pojo/SteamAppsList.java
@ -13,7 +13,7 @@
 * <https://www.gnu.org/licenses/>.
 */

-package pojo;
+package xyz.jeddunk.autocreamapi.pojo;

 import java.time.Instant;
 import java.util.List;
--- a/src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiConfig.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiConfig.java
@ -13,7 +13,7 @@
 * <https://www.gnu.org/licenses/>.
 */

-package util;
+package xyz.jeddunk.autocreamapi.util;

 import org.apache.commons.configuration2.*;
 import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
--- a/src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiDllHandler.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/util/CreamApiDllHandler.java
@ -13,7 +13,7 @@
 * <https://www.gnu.org/licenses/>.
 */

-package util;
+package xyz.jeddunk.autocreamapi.util;

 import org.apache.commons.codec.digest.DigestUtils;

--- a/src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/util/SteamAppsListCache.java
@ -13,7 +13,7 @@
 * <https://www.gnu.org/licenses/>.
 */

-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) {
--- a/src/main/java/xyz/jeddunk/autocreamapi/util/env/MainEnv.java
+++ b/src/main/java/xyz/jeddunk/autocreamapi/util/env/MainEnv.java
@ -13,7 +13,7 @@
 * <https://www.gnu.org/licenses/>.
 */

-package util.env;
+package xyz.jeddunk.autocreamapi.util.env;

 public class MainEnv {
    String key = "";
--- 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
--- a/src/main/resources/mainWindow.fxml
+++ b/src/main/resources/mainWindow.fxml
@ -31,7 +31,7 @@

 <?import java.net.URL?>
 <BorderPane prefHeight="361.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.171"
-            xmlns:fx="http://javafx.com/fxml/1" fx:controller="Controller">
+            xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.jeddunk.autocreamapi.Controller">
    <center>
        <GridPane hgap="10.0" minHeight="360.0" minWidth="655.0" vgap="10.0">
            <columnConstraints>
--- a/src/main/resources/searchResultWindow.fxml
+++ b/src/main/resources/searchResultWindow.fxml
@ -24,7 +24,7 @@
  ~ <https://www.gnu.org/licenses/>.
  -->

-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="655.0" prefWidth="420.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="SearchResultWindowController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="655.0" prefWidth="420.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="xyz.jeddunk.autocreamapi.SearchResultWindowController">
    <opaqueInsets>
        <Insets />
    </opaqueInsets>