Merge pull request #153 from johnnycz/issue-152-quaddicted-json-api-support-pr

Update QuakeInjector to work with the new Quaddicted backend API

Author: SpiritQuaddicted

.gitignore

@@ -10,6 +10,9 @@ build
 
 
 database.xml
+database.xml*.tmp
+database.json
+database.json*.tmp
 installedMaps.xml
 config.properties
 jre/
@@ -21,4 +24,4 @@ jre/
 .settings/
 
 *.iml
-.idea/
+.idea/

build.gradle

@@ -14,6 +14,8 @@ repositories {
 
 dependencies {
     implementation 'edu.stanford.ejalbert:BrowserLauncher2:1.3'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
 }
 
 application {
@@ -102,4 +104,5 @@ task winDist(type: Zip) {
 }
 test {
     useJUnitPlatform()
+    maxParallelForks = 1
 }

src/main/java/de/haukerehfeld/quakeinjector/Configuration.java

@@ -34,7 +34,7 @@
  */
 public class Configuration {
 	private static final String CONFIGHEADER = "Quake Injector " + BuildCommit.getBuildCommit() + " config file";
-	public class EnginePath extends FileValue {
+	public static class EnginePath extends FileValue {
 		private EnginePath() { super("enginePath", null); }
 
 		public File getUnzipDir(Package map) {
@@ -48,18 +48,18 @@ public File getUnzipDir(Package map) {
 	}
 	public final EnginePath EnginePath = new EnginePath();
 
-	public class EngineExecutable extends FileValue {
+	public static class EngineExecutable extends FileValue {
 		private EngineExecutable() { super("engineExecutable", new File("")); }
 	}
 	public final EngineExecutable EngineExecutable = new EngineExecutable();
 
-	public class WorkingDirAtExecutable extends BooleanValue {
+	public static class WorkingDirAtExecutable extends BooleanValue {
 		private WorkingDirAtExecutable() { super("workingDirAtExecutable", false); }
 	}
 	public final WorkingDirAtExecutable WorkingDirAtExecutable = new WorkingDirAtExecutable();
 
-	public class LocalDatabaseFile extends FileValue {
-		private LocalDatabaseFile() { super("localDatabaseFile", new File("database.xml")); }
+	public static class LocalDatabaseFile extends FileValue {
+		private LocalDatabaseFile() { super("localDatabaseFile", new File("database.json")); }
 	}
 	public final LocalDatabaseFile LocalDatabaseFile = new LocalDatabaseFile();
 
@@ -93,36 +93,38 @@ public void set(File v) {
 	}
 	public final DownloadPath DownloadPath = new DownloadPath();
 
-	public class EngineCommandLine extends StringValue {
+	public static class EngineCommandLine extends StringValue {
 		private EngineCommandLine() { super("engineCommandline", ""); }
 	}
 	public final EngineCommandLine EngineCommandLine = new EngineCommandLine();
 
-	public class RepositoryDatabasePath extends StringValue {
+	public static class RepositoryDatabasePath extends StringValue {
 		private RepositoryDatabasePath() { super("repositoryDatabase",
-				"https://www.quaddicted.com/reviews/quaddicted_database.xml"); }
+				"https://api.quaddicted.com/jsons"); }
+				//"https://www.quaddicted.com/reviews/quaddicted_database.xml"); }
 	}
 	public final RepositoryDatabasePath RepositoryDatabasePath = new RepositoryDatabasePath();
 
-	public class ScreenshotRepositoryPath extends StringValue {
+	public static class ScreenshotRepositoryPath extends StringValue {
 		private ScreenshotRepositoryPath() { super("screenshotRepositoryPath",
-				"https://www.quaddicted.com/reviews/screenshots/"); }
+				// https://www.quaddicted.com/files/quaddicted-images/by-sha256/a2/a25043c2b6c1c73b24e4a00c63d95a8a9e08943d8b8e39d7c4571ae3a1899d99/colony3.jpg
+				"https://www.quaddicted.com/files/quaddicted-images/by-sha256/"); }
 	}
 	public final ScreenshotRepositoryPath ScreenshotRepositoryPath = new ScreenshotRepositoryPath();
 
-	public class ZipContentsDatabaseUrl extends StringValue {
+	public static class ZipContentsDatabaseUrl extends StringValue {
 		private ZipContentsDatabaseUrl() { super("ZipContentsDatabaseUrl",
 				"http://haukerehfeld.de/projects/quakeinjector/temp/zipContents.xml"); }
 	}
 	public final ZipContentsDatabaseUrl ZipContentsDatabaseUrl = new ZipContentsDatabaseUrl();
 
 
-	public class RogueInstalled extends BooleanValue {
+	public static class RogueInstalled extends BooleanValue {
 		private RogueInstalled() { super("rogueInstalled", false); }
 	}
 	public final RogueInstalled RogueInstalled = new RogueInstalled();
 
-	public class OfflineMode extends BooleanValue {
+	public static class OfflineMode extends BooleanValue {
 		private ChangeListenerList listeners = new ChangeListenerList();
 
 		private OfflineMode() { super("offlineMode", false); }
@@ -139,22 +141,22 @@ public void set(Boolean b) {
 	}
 	public final OfflineMode OfflineMode = new OfflineMode();
 
-	public class HipnoticInstalled extends BooleanValue {
+	public static class HipnoticInstalled extends BooleanValue {
 		private HipnoticInstalled() { super("hipnoticInstalled", false); }
 	}
 	public final HipnoticInstalled HipnoticInstalled = new HipnoticInstalled();
 
-	public class MainWindowPositionX extends IntegerValue {
+	public static class MainWindowPositionX extends IntegerValue {
 		private MainWindowPositionX() { super("mainWindowPositionX", null); }
 	}
 	public final MainWindowPositionX MainWindowPositionX = new MainWindowPositionX();
 
-	public class MainWindowPositionY extends IntegerValue {
+	public static class MainWindowPositionY extends IntegerValue {
 		private MainWindowPositionY() { super("mainWindowPositionY", null); }
 	}
 	public final MainWindowPositionY MainWindowPositionY = new MainWindowPositionY();
 
-	public class MainWindowWidth extends IntegerValue {
+	public static class MainWindowWidth extends IntegerValue {
 		private MainWindowWidth() { super("mainWindowWidth", null); }
 	}
 	public final MainWindowWidth MainWindowWidth = new MainWindowWidth();
@@ -164,20 +166,25 @@ public class MainWindowHeight extends IntegerValue {
 	}
 	public final MainWindowHeight MainWindowHeight = new MainWindowHeight();
 
-	public class RepositoryBasePath extends StringValue {
+	public static class RepositoryBasePath extends StringValue {
 		private final static String onlineRepositoryExtension = ".zip";
 
-		private RepositoryBasePath() { super("repositoryBase", "https://www.quaddicted.com/filebase/"); }
+		private RepositoryBasePath() { super("repositoryBase", "https://www.quaddicted.com/files/by-sha256/"); }
 
 		/**
 		 * Get a complete Url to a map archive file in the repo
 		 */
-		public String getRepositoryUrl(String mapid) {
-			return get() + mapid + onlineRepositoryExtension;
+		public String getRepositoryUrl(String filename, String sha256) {
+			return get() + sha256.substring(0, 2) + "/" + sha256 + "/" + filename;
 		}
 	}
 	public final RepositoryBasePath RepositoryBasePath = new RepositoryBasePath();
 
+	public static class MapWebpageBaseUrl extends StringValue {
+		private MapWebpageBaseUrl() { super("mapWebpageBaseUrl", "https://www.quaddicted.com/db/v1/maps/"); }
+	}
+	public final MapWebpageBaseUrl mapWebpageBaseUrl = new MapWebpageBaseUrl();
+
 	public final Map<String,Value<?>> All = new HashMap<String,Value<?>>();
 
 	private File configFile;
@@ -349,7 +356,7 @@ public interface Value<T> {
 		public boolean existsOrDefault();
 	}
 
-	public abstract class AbstractValue<T> implements Value<T> {
+	public abstract static class AbstractValue<T> implements Value<T> {
 		private String key;
 		private T defaultValue;
 		private T value;
@@ -398,7 +405,7 @@ public String toString() {
 		}
 	}
 
-	public abstract class StringValue extends AbstractValue<String> {
+	public abstract static class StringValue extends AbstractValue<String> {
 		protected StringValue(String key, String defaultValue) { super(key, defaultValue); }
 
 		public String stringToValue(String v) {
@@ -410,7 +417,7 @@ public String toString() {
 		}
 	}
 
-	public abstract class FileValue extends AbstractValue<File> {
+	public abstract static class FileValue extends AbstractValue<File> {
 		protected FileValue(String key, File defaultValue) { super(key, defaultValue); }
 
 		public File stringToValue(String v) {
@@ -419,15 +426,15 @@ public File stringToValue(String v) {
 	}
 
 
-	public abstract class BooleanValue extends AbstractValue<Boolean> {
+	public abstract static class BooleanValue extends AbstractValue<Boolean> {
 		protected BooleanValue(String key, boolean defaultValue) { super(key, defaultValue); }
 
 		public Boolean stringToValue(String v) {
 			return Boolean.valueOf(v);
 		}
 	}
 
-	public abstract class IntegerValue extends AbstractValue<Integer> {
+	public abstract static class IntegerValue extends AbstractValue<Integer> {
 		protected IntegerValue(String key, Integer defaultValue) { super(key, defaultValue); }
 
 		public Integer stringToValue(String v) {

src/main/java/de/haukerehfeld/quakeinjector/Installer.java

@@ -118,7 +118,9 @@ public void install(final Package selectedMap,
 	public void cancel(Package installerMap) {
 		Worker w;
 		synchronized (queue) { w = queue.get(installerMap); }
-		w.cancel();
+		if (w != null) {
+			w.cancel();
+		}
 	}
 
 

src/main/java/de/haukerehfeld/quakeinjector/Package.java

@@ -35,12 +35,16 @@ public class Package extends SortableRequirement implements Requirement {
 	 */
 	private ChangeListenerList listeners = new ChangeListenerList();
 
+	private String sha256;
+
+	private String filename;
+
+	private List<String> downloadUrls;
+
 	private String author;
 
 	private String title;
 
-	private Rating rating;
-
 	private float normalizedUsersRating;
 
 	private String description;
@@ -64,37 +68,29 @@ public class Package extends SortableRequirement implements Requirement {
 	private PackageFileList supposedFileList;
 
 	public Package(String id,
-				   String author,
-				   String title,
-				   int size,
-				   Date date,
-	               boolean isInstalled,
-	               Rating rating,
-	               float normalizedUsersRating,
-	               String description) {
-		this(id, author, title, size, date, isInstalled, rating, normalizedUsersRating, description, null, null, null, null);
-	}
-
-	public Package(String id,
+				   String sha256,
+				   String filename,
+				   List<String> downloadUrls,
 				   String author,
 				   String title,
 				   int size,
 				   Date date,
 				   boolean isInstalled,
-	               Rating rating,
 	               float normalizedUsersRating,
 	               String description,
 				   String relativeBaseDir,
 				   String commandline,
 				   List<String> startmaps,
 				   List<Requirement> requirements) {
 		super(id);
+		this.sha256 = sha256;
+		this.filename = filename;
+		this.downloadUrls = downloadUrls;
 		this.author = author;
 		this.title = title;
 		this.size = size;
 		this.date = date;
 		super.setInstalled(isInstalled);
-		this.rating = rating;
 		this.normalizedUsersRating = normalizedUsersRating;
 		this.description = description;
 		this.relativeBaseDir = relativeBaseDir;
@@ -113,7 +109,19 @@ public void addChangeListener(ChangeListener l) {
 	public void removeChangeListener(ChangeListener l) {
 		listeners.removeChangeListener(l);
 	}
-	
+
+	public String getSha256() {
+		return sha256;
+	}
+
+	public String getFilename() {
+		return filename;
+	}
+
+	public List<String> getDownloadUrls() {
+		return downloadUrls;
+	}
+
 	public String getAuthor() {
 		return author;
 	}
@@ -127,11 +135,6 @@ public Date getDate() {
 		return date;
 	}
 
-	/**
-	 * get rating
-	 */
-	public Rating getRating() { return rating; }
-
 	public float getNormalizedUsersRating() { return normalizedUsersRating; }
 
 
@@ -225,22 +228,6 @@ public String toString() {
  */
 	public void setSupposedFileList(PackageFileList supposedFileList) { this.supposedFileList = supposedFileList; }
 
-	public static enum Rating {
-		Unrated(0),
-		    Crap(1),
-		    Poor(2),
-		    Average(3),
-		    Nice(4),
-		    Excellent(5);
-
-		private int rating;
-		Rating(int rating) {
-			this.rating = rating;
-		}
 
-		public int getRating() {
-			return rating;
-		}
-	}
 }