From 7a2112a759511b9bb662d9d4afba2aca02d3a80d Mon Sep 17 00:00:00 2001
From: Jannik <jannik008@gmail.com>
Date: Fri, 25 Aug 2017 14:57:15 +0200
Subject: [PATCH] smmd rework part 1

due to changes on the smmdb api i have to rework the smmdb integration
---
 bin/.gitignore                                |   1 +
 bin/application/MainWindowController$10.class | Bin 1723 -> 1723 bytes
 bin/application/MainWindowController$11.class | Bin 1307 -> 1307 bytes
 bin/application/MainWindowController$12.class | Bin 4908 -> 4908 bytes
 bin/application/MainWindowController$7.class  | Bin 3520 -> 3660 bytes
 bin/application/MainWindowController$8.class  | Bin 1745 -> 1745 bytes
 bin/application/MainWindowController$9.class  | Bin 1108 -> 1108 bytes
 bin/application/MainWindowController.class    | Bin 43951 -> 43986 bytes
 bin/application/SmmdbApiQuery.class           | Bin 5038 -> 4366 bytes
 bin/datatypes/SmmdbApiDataType.class          | Bin 5510 -> 5522 bytes
 src/application/MainWindowController.java     |  12 +--
 src/application/SmmdbApiQuery.java            |  78 ++++++++++++------
 src/datatypes/SmmdbApiDataType.java           |  18 ++--
 13 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/bin/.gitignore b/bin/.gitignore
index b42b859..9eb92dc 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1 +1,2 @@
 /application/
+/datatypes/
diff --git a/bin/application/MainWindowController$10.class b/bin/application/MainWindowController$10.class
index 809367865a20a6eefca945860bc3eab0366d529f..8395b7018a50a8f723c6a3321f48215b1f123d20 100644
GIT binary patch
delta 43
zcmdnZyPJ2zR8~gq$<tVSCG{9Mm<<>NnGG3qn2i|RnT;9zm`xZ$nN26#u+;+q->(SG

delta 43
zcmdnZyPJ2zR8~gK$<tVSC3P4$nDrP0ne`cTm<<@*nGG5In2i`hnT;pgu+;+q-g^kW

diff --git a/bin/application/MainWindowController$11.class b/bin/application/MainWindowController$11.class
index 27d8d04d75f1609bd9faeb24b8aa8755e4827a26..434e483e2b558eff57d202226298000281625588 100644
GIT binary patch
delta 27
icmbQuHJfXL2MeRcWKR|^PHP5kW*Y_}X4}bgSn2^>cm_NG

delta 27
icmbQuHJfXL2MeRwWKR|^PD=)EW-A6EX6wmwSn2^>90oK1

diff --git a/bin/application/MainWindowController$12.class b/bin/application/MainWindowController$12.class
index c33404791b35271f602ace633f3b28b4b0bbd5e9..e7bcebc70fc98c0e33357db4c0044cc5fc0e42db 100644
GIT binary patch
delta 161
zcmV;S0AByBCafl~-VOoZv)>NF0)OHFB?ILEDg)*KL<8plOatWrUjyp^Y6I*5bp!1H
zfCKOVj05oissr)>$^-QP^#k?+0R#5|D+BleE(7@iGz0qqMg#l-T?73AcLV<ceFOjj
zi39-wlLP_*p9BK|q67p1$pi)g-vkE%`UD6969fqYI|K>>J_HK_Xao-eat;I#0(k@y
P0)qq-0*V9{lP(hetA8wt

delta 161
zcmV;S0AByBCafl~-VOoXv)>NF0)OBDB?IFCDg)#IL<8jjOatQpUjyj?Y6I#3bpz`F
zfCKITj05igssr!<$^-KN^#k+)0R!~`D+BfcE(7-gGz0koMg#f*T?6|8cLV(aeFOdh
zi39%ulLP<(p9BE`q67i~$pi!e-vk8#`UD0769fkWI|K*<J_HE@Xao%cat;Iz0(k@w
P0)qq*0*V9_lP(he6oM{3

diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class
index 814c074ca4f53a2e808696e410ce688528dc36cd..06a27476c0b4f9443a31329a850b80bfbc2d33c2 100644
GIT binary patch
delta 967
zcmaKqTWl0n9L9g=Fgvre3}Go<=xr-4mq3kfQc+0>F_P4TgcxA4NkLtgc3HM;w{^QM
z1(b4AE^_VRj%c}AP*6+D^rnUfo(u^j%8N?E3$MgCV}jtB?Y@v0Cz<(w=l^~GZ@!sx
zZk6Au2>$$Z>?dF$KUzpZwW<=;1GT4pZ`!QkU5mAXU`xC!9!bYD$w+i_M=sIo@E-3A
zCbf0u1fk`5I@K0gkxgZC(OfnWZ(VHhfqLkxFxClX^_nwYYijGvb|g}*$w+`0%?>sR
zJv)D5c)~lU=aY*UG<b@n!v<2S(X1)oD3}sk-<eLo+|r(Wqie}49<MWOAft|(wf-3G
z4j+<Lcg;EVIl3%51=If{l*1<PrB=I_Go7*6EO7F=Od=O~XVvlm-85T#r2aO;{%*E8
z^srr3TH!f6X}8$*ynI=JtuzNH<5Pz{>{T%<YVYTO#b<&F^~5Z(8&Zi)4hK1;{;*y$
zkI-vzR894lyr2jQrsji0bMdB)tF!T@glBc!;RGkuTmF^iX@@hMRp<PxgXbK+phjSH
zq_!k1`joI|iwlEu?VCc3sNVxsVqE<b7_y(?!vayR#wNcW{<UTZXNdZcG0HN@E#7un
z;q^v{_NhN7hk6=}KC(Ax94FRT6d$Ikz`Cq2YH>-sw7GPQ)BS&nVYbxy#@X6f>T~(n
zWydhP>&ywKPfAUfef?C{`8@V;Kg9*YD?K9|)3gV@`?;tioZ4-OkWnB;`CM@RS=9iN
z4EOkjFAMcN2GjHjUP=&Th+;W|T3Ny(SxSQ}BO}8cmX!?3S=^RY+>_PZm$Ugz&h6oW
zoX2B1UzoB)l*tz<(nhQBd%uwB6zi3TE^-NxN0<3Z2k?6R8cpI=9&v@MI>I1fzUCXf
z0k?6u#&t~Y>(#e>r=Q<zBd6eTkpYcv=uUkQ^9hT@U!1WxVh3l+ypjG4hM1`ZlAE}?
X8v0}mGpbRM?&&D`YaV0#VA%fxoFncH

delta 846
zcmY+C>u(HE7{-6+barNUJ7R6SC@oq|LlfPkA*2!s;=?8)Y0+fWrQ3Gt(w$ak>rUP8
zlpgo{z3!CSsv`X$J_!GS@BRiMf;033Cz<m;^Stl8?{l6r9}9=Zhd%s#^%j`UGYcsw
zQN^O9xAMF%VzEqMuT5-7M4e<Ny0m7Y#d2kvg>zO4rZs0WZB@~zn@%@1R5Ud?ZiQEr
zO0S7Fwsy3;NjI8l?npN{iByXl4N^zFO@M?TqK3@;+**%nv}q!#Hksw&H3FleE!F7J
zDUV*O-k6pCI$CVfIO?leYR0LzSg-1>qF5Z)CPRn7muX#E6BC4{OkMbo*4XSI8)>oF
z^#2)RLE5MfGLEe_+t{w&TZ_$3c3JFH6aB?GyV;}W`=<r=alm4~AWu~X^KxtssxJRn
z^RUekj;crgYV){F7blbvSQ6^CQIzWgxT!5ki_@w(Fj<^^el+kxlszIO$W1w^%-qII
zs?~9|oS5Sz+vm3=T<wy@Q_u6loDy{?w=3`&AC|t2@2c3IDW0piUDVlK-iO`Cf`~Cd
zOftlxEVafpst1Y32dRsPSM;;WD|*S|EDhn+S(>w~>!-EKH%ME&z?Y>x%Z7e7SDAn7
zwiK9IcJwfz%I9VG_K-iE_!|!CtcUcYMvn+}9@}e(h~Y6>$N(n=*MH6HMdI*;XPg?2
zXD}G0<<DUx$O!pzG?j8Jvt$9aay*VKqFYYjrkuzVIf*`5%z&KCYgx)CS;iM#`%O+I
ztb5ep_lzKqd^$DK@Eqq6f6xUk>fs)DNuwNQ@Q%w|(c`-*;wsm)k2kTo&J9fZ{=D7N
z`)&P=J>26QcQoqJObGJ_v&2_6TkH#j#z@`guI4587~{oK?(;wcL;p7qd8|=bCp{_N
KD$^eH8iC*92gi^A

diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class
index 95da18fdc8e3ebad26007b5a17c652b9a8cf8a00..9ebc86b3fe16bdb73c6c08aa2cdd6cfa50688500 100644
GIT binary patch
delta 39
vcmcb}dy#j;Mpj0>$(vY9L=72unT!}jnM@c|m`oWon9LY-m@Fq-vrPj4$|MMG

delta 39
vcmcb}dy#j;Mpj0h$(vY9MD-bXnG6_2nT!}zn2Z@Tm`oUSn9L_zvrPj4$ubCF

diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class
index 19e5083bb9fa80b4b7f0a0f4bd7065859d9ad5f4..656851c6e7c2111bd3813f82392426487a9dadf4 100644
GIT binary patch
delta 23
fcmcb@afM^U1ZGCR$rG9FSpyl^nSv%?Wv&MRUQP#0

delta 23
fcmcb@afM^U1ZGB`$rG9FS^XK<nF1zXWv&MRUK9sL

diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class
index 51f185425f8256d8ad7b888bc933a4d3c15bf06d..a301f7ac27173e573820529c1b29cf0de35910f6 100644
GIT binary patch
delta 14241
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
Sm*g{J5(LrS#$;nE5Bh)n^IS9l

delta 14055
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

diff --git a/bin/application/SmmdbApiQuery.class b/bin/application/SmmdbApiQuery.class
index 4b5dc6888bdc98900e33a39e41fad951ee0bf832..bd33fc6621d0d46c0ea2a96198d1e9bbf7864b79 100644
GIT binary patch
literal 4366
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
V(x5BSWhV7C&86EP&{-e;@L%r{U8w*7

literal 5038
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
GhyMXnyP32A

diff --git a/bin/datatypes/SmmdbApiDataType.class b/bin/datatypes/SmmdbApiDataType.class
index e5bafb59fdbbfd220456deea55b15f97948b688d..12f1bba54a6d45c085c4d8bb60549d7d3c82aaff 100644
GIT binary patch
delta 166
zcmZqEo}|rn>ff$?3=9k=3`-_*)pDdK=B5^xROW2#uV;pHHjA-{Fmkv<r8XO}mNW9g
zc&UsGoH?6Uv2EvOoHlu*knH4oA<N0^!eW!p0qHOxEh}s}c`1<20n%T9^ll*SEFw0U
rOT=>WBp@9rV#zpf@?;S|=J^Z@CO;AJVO|KNjYWOf7Xh8c#IP6uoOL#F

delta 173
zcmbQF-KNcT>ff$?3=9k=42vgn)pF#dmZj#DR2FRPuV;pHHjA-{Fmm`nr8XO}mNPQ?
zY~IGUotu-B!H0p7L6BkEWJVFu$=yPhlS_rfCf@?mM}V}Zu;pZ7VX?^-KspIX9|zJK
zfwY*2<s=cY$*CfijB~*nw}@CW&tsTBd7+5#WM)xI<^@o8kf<g5LZIuI7#0Bl9bz>0

diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java
index 991150f..918b88a 100644
--- a/src/application/MainWindowController.java
+++ b/src/application/MainWindowController.java
@@ -534,11 +534,13 @@ public class MainWindowController {
 					id = idColumn.getCellData(selected); //get name of selected item
 					
 					for (int i = 0; i < courses.size(); i++) {
-						if (courses.get(i).getId() == id) {
-							
+						if (courses.get(i).getId() == id) {		
 							if (courses.get(i).getHasimage() == 1) {	
 								try {
-									URL url = new URL("http://smmdb.ddns.net/img/courses/thumbnails/" + id + ".pic");
+//									URL url = new URL("http://smmdb.ddns.net/img/courses/thumbnails/" + id + ".pic");	//alt
+									System.out.println("http://smmdb.ddns.net/courseimg/" + id + "_full.jpg?v=3");
+									URL url = new URL("http://smmdb.ddns.net/courseimg/" + id + "_full.jpg?v=3");
+									
 									Image image = new Image(url.toURI().toString());
 									smmdbImageView.setImage(image);
 								} catch (MalformedURLException | URISyntaxException e) {
@@ -709,7 +711,7 @@ public class MainWindowController {
     
     @FXML
     void smmdbDownloadBtnAction(ActionEvent event){
-    	String downloadUrl = "http://smmdb.ddns.net/courses/" + id;
+    	String downloadUrl = "http://smmdb.ddns.net/api/downloadcourse?id=" + id + "&type=zip";
     	String downloadFileURL = getCemuPath() + "/" + id + ".rar";	//getCemuPath() + "/" + smmID + "/" + id + ".rar"
     	String outputFile = getCemuPath() + "/";
     	
@@ -1076,7 +1078,7 @@ public class MainWindowController {
 			break;
 		}
     	
-    	switch (course.getLeveltype()) {
+    	switch (course.getGamestyle()) {
 		case 0:
 			leveltype = "NSMBU";
 			break;
diff --git a/src/application/SmmdbApiQuery.java b/src/application/SmmdbApiQuery.java
index 52d66c8..d441fe3 100644
--- a/src/application/SmmdbApiQuery.java
+++ b/src/application/SmmdbApiQuery.java
@@ -41,93 +41,117 @@ public class SmmdbApiQuery {
 			e.printStackTrace();
 		}
         
-        JsonObject mainObject = Json.parse(output).asObject().get("courses").asObject();
-        JsonArray objectAssets = Json.parse(output).asObject().get("order").asArray();
+        System.out.println(URL);
+        System.out.println("{ \"courses\": " + output + "}");
         
-        for (JsonValue asset : objectAssets) {
-        	courseIDs.add(asset.asInt());
-        }
+        String apiOutput = "{ \"courses\": " + output + "}";
         
-        //if value is 9 or "notset" the api returned NULL as value
-        for (int i = 0; i < courseIDs.size(); i++) {
-        	int id, owner, coursetype, leveltype, difficulty, lastmodified, uploaded, downloads, stars, hasimage, ispackage, updatereq;
+        JsonArray items = Json.parse(apiOutput).asObject().get("courses").asArray();
+        for (JsonValue item : items) {
+        	int id, owner, coursetype, gamestyle, difficulty, lastmodified, uploaded, downloads, stars, hasimage, ispackage, updatereq;
         	String nintendoid, title;
-        	JsonObject singleObject = mainObject.get(courseIDs.get(i).toString()).asObject();
-
+        	
+        	//TODO add "courseTheme", "time", "autoScroll"
+        	
+        	//geht
         	try {
-        		id = singleObject.getInt("id", 0);
+        		id = item.asObject().getInt("id", 0);
 			} catch (Exception e) {
 				id = 9;
 			}
+        	
+        	//geht
         	try {
-        		owner = singleObject.getInt("owner", 0);
+        		owner = item.asObject().getInt("owner", 0);
 			} catch (Exception e) {
 				owner = 9;
 			}
+        	
+        	//test
         	try {
-        		coursetype = singleObject.getInt("coursetype", 0);
+        		coursetype = item.asObject().getInt("coursetype", 0);
 			} catch (Exception e) {
 				coursetype = 9;
 			}
+        	
+        	//geht
         	try {
-        		leveltype = singleObject.getInt("leveltype", 0);
+        		gamestyle = item.asObject().getInt("gamestyle", 0);
 			} catch (Exception e) {
-				leveltype = 9;
+				gamestyle = 9;
 			}
+        	
+        	//geht
         	try {
-        		difficulty = singleObject.getInt("difficulty", 0);
+        		difficulty = item.asObject().getInt("difficulty", 0);
 			} catch (Exception e) {
 				difficulty = 9;
 			}
+        	
+        	//geht
         	try {
-        		lastmodified = singleObject.getInt("lastmodified", 0);
+        		lastmodified = item.asObject().getInt("lastmodified", 0);
 			} catch (Exception e) {
 				lastmodified = 9;
 			}
+        	
+        	//geht
         	try {
-        		uploaded = singleObject.getInt("uploaded", 0);
+        		uploaded = item.asObject().getInt("uploaded", 0);
 			} catch (Exception e) {
 				uploaded = 9;
 			}
+        	
+        	//gestrichen
         	try {
-        		downloads = singleObject.getInt("downloads", 0);
+        		downloads = item.asObject().getInt("downloads", 0);
 			} catch (Exception e) {
 				downloads = 9;
 			}
+        	
+        	//geht
         	try {
-        		stars = singleObject.getInt("stars", 0);
+        		stars = item.asObject().getInt("stars", 0);
 			} catch (Exception e) {
 				stars = 9;
 			}
+        	
+        	//gestrichen
         	try {
-        		hasimage = singleObject.getInt("hasimage", 0);
+        		hasimage = item.asObject().getInt("hasimage", 0);
 			} catch (Exception e) {
 				hasimage = 9;
 			}
+        	
+        	//gestrichen
         	try {
-        		ispackage = singleObject.getInt("ispackage", 0);
+        		ispackage = item.asObject().getInt("ispackage", 0);
 			} catch (Exception e) {
 				ispackage = 9;
 			}
+        	
+        	//gestrichen
         	try {
-        		updatereq = singleObject.getInt("updatereq", 0);
+        		updatereq = item.asObject().getInt("updatereq", 0);
 			} catch (Exception e) {
 				updatereq = 9;
 			}
+        	
+        	//geht
         	try {
-        		nintendoid = singleObject.getString("nintendoid", "");
+        		nintendoid = item.asObject().getString("nintendoid", "");
 			} catch (Exception e) {
 				nintendoid = "notset";
 			}
         	try {
-        		title = singleObject.getString("title", "");;
+        		title = item.asObject().getString("title", "");;
 			} catch (Exception e) {
 				title = "notset";
 			}
 
-        	course.add(new SmmdbApiDataType(id, owner, coursetype, leveltype, difficulty, lastmodified, uploaded, downloads,
+        	course.add(new SmmdbApiDataType(id, owner, coursetype, gamestyle, difficulty, lastmodified, uploaded, downloads,
         			 						stars, hasimage, ispackage, updatereq, nintendoid, title));
-		}
+        }
         
 		return course;
 	}
diff --git a/src/datatypes/SmmdbApiDataType.java b/src/datatypes/SmmdbApiDataType.java
index 8c24c80..2284bb6 100644
--- a/src/datatypes/SmmdbApiDataType.java
+++ b/src/datatypes/SmmdbApiDataType.java
@@ -13,7 +13,7 @@ public class SmmdbApiDataType {
 	private final IntegerProperty id = new SimpleIntegerProperty();
 	private final IntegerProperty owner = new SimpleIntegerProperty();
 	private final IntegerProperty coursetype = new SimpleIntegerProperty();
-	private final IntegerProperty leveltype = new SimpleIntegerProperty();
+	private final IntegerProperty gamestyle = new SimpleIntegerProperty();
 	private final IntegerProperty difficulty = new SimpleIntegerProperty();
 	private final IntegerProperty lastmodified = new SimpleIntegerProperty();
 	private final IntegerProperty uploaded = new SimpleIntegerProperty();
@@ -25,13 +25,13 @@ public class SmmdbApiDataType {
 	private final StringProperty nintendoid = new SimpleStringProperty();
 	private final StringProperty title = new SimpleStringProperty();
 	
-	public SmmdbApiDataType(final int id, final int owner, final int coursetype, final int leveltype, final int difficulty, 
+	public SmmdbApiDataType(final int id, final int owner, final int coursetype, final int gamestyle, final int difficulty, 
 							final int lastmodified, final int uploaded, final int downloads, final int stars, final int hasimage,
 							final int ispackage, final int updatereq, final String nintendoid, final String title) {
 		this.id.set(id);
 		this.owner.set(owner);
 		this.coursetype.set(coursetype);
-		this.leveltype.set(leveltype);
+		this.gamestyle.set(gamestyle);
 		this.difficulty.set(difficulty);
 		this.lastmodified.set(lastmodified);
 		this.uploaded.set(uploaded);
@@ -60,8 +60,8 @@ public class SmmdbApiDataType {
 		return nintendoid;
 	}
 	
-	public IntegerProperty leveltypeProperty(){
-		return leveltype;
+	public IntegerProperty gamestyleProperty(){
+		return gamestyle;
 	}
 	
 	public IntegerProperty difficultyProperty(){
@@ -112,8 +112,8 @@ public class SmmdbApiDataType {
 		return coursetypeProperty().get();
 	}
 
-	public int getLeveltype() {
-		return leveltypeProperty().get();
+	public int getGamestyle() {
+		return gamestyleProperty().get();
 	}
 
 	public int getDifficulty() {
@@ -168,8 +168,8 @@ public class SmmdbApiDataType {
 		coursetypeProperty().set(coursetype);
 	}
 
-	public final void setLeveltype(int leveltype) {
-		leveltypeProperty().set(leveltype);
+	public final void setGamestyle(int leveltype) {
+		gamestyleProperty().set(leveltype);
 	}
 
 	public final void setDifficulty(int difficulty) {