From 6c1663f3864ea8ea180cbc0fce3e6597bf9d4a63 Mon Sep 17 00:00:00 2001 From: Jannik Date: Wed, 30 Aug 2017 11:29:58 +0200 Subject: [PATCH] reworked loadSettings * loadSettings() should be 100% bulletproof * replaced a few more syso with logger --- bin/application/CloudController$1.class | Bin 2024 -> 2024 bytes bin/application/CloudController$2.class | Bin 2643 -> 2643 bytes bin/application/CloudController$3.class | Bin 1415 -> 1415 bytes bin/application/CloudController.class | Bin 3320 -> 3320 bytes bin/application/Main.class | Bin 7830 -> 7830 bytes bin/application/MainWindowController$1.class | Bin 2199 -> 2199 bytes 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 -> 4916 bytes bin/application/MainWindowController$2.class | Bin 4189 -> 4189 bytes bin/application/MainWindowController$3.class | Bin 4201 -> 4357 bytes bin/application/MainWindowController$4.class | Bin 4209 -> 4347 bytes bin/application/MainWindowController$5.class | Bin 1097 -> 1097 bytes bin/application/MainWindowController$6.class | Bin 1097 -> 1097 bytes bin/application/MainWindowController$7.class | Bin 3505 -> 3505 bytes bin/application/MainWindowController$8.class | Bin 1745 -> 1745 bytes bin/application/MainWindowController$9.class | Bin 1108 -> 1108 bytes bin/application/MainWindowController.class | Bin 45006 -> 45884 bytes bin/application/SmmdbApiQuery.class | Bin 4184 -> 4467 bytes bin/application/playGame.class | Bin 4412 -> 4412 bytes src/application/CloudController.java | 7 +- src/application/Main.java | 7 - src/application/MainWindowController.java | 170 +++++++++++------- src/application/SmmdbApiQuery.java | 13 +- src/application/playGame.java | 1 + 25 files changed, 117 insertions(+), 81 deletions(-) diff --git a/bin/application/CloudController$1.class b/bin/application/CloudController$1.class index 6961e59c8f51256dc7a74148e675dfa912404e85..b7c69cca68efd0be6bcc267e8b69ab6beca8e3d7 100644 GIT binary patch delta 45 zcmaFC|AK$RV>VtZ22KWB24My}1{ns&$sgFfSgjd^7;GlnvwN}H16dA}``DuZ22BcI delta 45 zcmaFC|AK$RV>Vt(22KVW24MzU1{ns2$sgFfSgja@7_2ATvwN}H0a^Bw``DuZ1)&O8 diff --git a/bin/application/CloudController$2.class b/bin/application/CloudController$2.class index 01416baefa6636008f2196a021ae2fa265f4b1ae..4862738a40c3b860c44c44da35deacb4efb463cd 100644 GIT binary patch delta 79 zcmcaCa#>_UJqKgxxIg?#D6Imk}gczbGuj2G#%>c48C;#M(0szr|5#9g* delta 79 zcmcaCa#>_UJqKgRzl4Dk%c3`q>O45gf; h44FXLtjR8%iLBuaLJSd;S8;l=rU6;$lYeqX0RYVT5x)Qc diff --git a/bin/application/CloudController$3.class b/bin/application/CloudController$3.class index 2132321368a2ffa8a6837abd4c8d0687ead3827f..d0b0686437b33a09602b93f5c1ade8572a25b4c6 100644 GIT binary patch delta 43 ycmZqYZs*>xhJ~?o@>-S>$qEJzhAIXTh8hMXhFS(ShB^ixhJ~?s@>-S>$x;RmhH?fGhDrt{hAIX%hH3^ahB^ilhQ`TOtiAyD8wvyf diff --git a/bin/application/CloudController.class b/bin/application/CloudController.class index 884bd0b10e1cb0f1b98cdb9fa026b1e18b492e72..1121c7a4c8a860c49f0c95e5671acc210d6bd960 100644 GIT binary patch delta 113 zcmew%`9pGpG?%0^g9C#LgENCGgC~PKgD-;zLm-1ULj;50WD~A7&QJy+hCBu_hJwk5 zxso|c8Mqi)8F(4mC+l)`Ywqyo9E_ZDf%# zq|h?M%pBaDxjOh4I@SI2iP>ZJbdxFMP$>q~HBObqrSc4_7u@QXVO78*21cX;uNWB> z3qGmEFAa=|jd5vaLRy)W4yL4sY3U;%Zf3b7)|8twR|o&XPImwF3E4yT%QDk=tBT-IQJgAHo4TW2CFxQ>xKx@RG0-bHxW$M^ zEc8hs{Zhh!*zig@gHnl4Y8a9RhNX#7>10gYOo$J^_?eUireu|X955|0W+cI^yfP;# z=H-(m`LYp|Z)OnQwz8#5+16F;=sI?FGke-WSa+}=|1-6y#zV4+ zkjD}E98|%=F9&FB$z7 Q44dDxQW*FMc3X=60d>(&jsO4v diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 0d34ffc065ac2a74799978fc5f51851c2ed27b51..650d653e163ec47c48dc46cbe850f1e97046d76b 100644 GIT binary patch delta 63 zcmbO(I9+gq5IdvaWMTGQx`7Nbj6n=)jKK_gj3Eq`jG+wnjA0C}jNuF^j1de)jFAlG Tj8P0#jL{5DjIon{vCjnnpQa7I delta 63 zcmbO(I9+gq5Idv)WMTGQx+ diff --git a/bin/application/MainWindowController$10.class b/bin/application/MainWindowController$10.class index 2f90ac0e495cc17a3d39d9bc26b5068b91a8d5b5..19e4c25363d67839c455a4f05b94e871d3faec5a 100644 GIT binary patch delta 56 zcmdnZyPJ2zA4W!_$$uIB8I3plGI=mFYEPcV+AFEYz`<<5AjoXUpu=p$;LdE!;Kyvj M5Xx*i*@mqi0JR7V!~g&Q delta 56 zcmdnZyPJ2zA4W#Q$$uIB8I3mkGI=mF8cd$X+AC?yz`<Hq)$ diff --git a/bin/application/MainWindowController$11.class b/bin/application/MainWindowController$11.class index ffb01c259dcef3c4de449033d1e60f657c51a4fc..01b571b974a590c59e3fdc692840f4ba53c59900 100644 GIT binary patch delta 34 qcmbQuHJfY0A4W!#&3_ranHVi5d$M?OS~GAn+b{?*+fJUtQV#&N!U-S% delta 34 qcmbQuHJfY0A4W#w&3_ranHX&+d$M?OIxuiEJ2D6{J58R$QV#&OjtMgW diff --git a/bin/application/MainWindowController$12.class b/bin/application/MainWindowController$12.class index 702260a6892143dcea3a10139d7c5361bd08d3b4..cc7b0033ed7941bade90b0399b859a6547d1bd32 100644 GIT binary patch delta 2152 zcmah~33O9M6us}yPkxqxhR}kPmX=VuP|DVYwa`KZicmoi1yPJNw8hdw8-aov*+gYg z7*RnKP!<(bsu%*u;x4Xo`4(#XW48r@TC_y<{dP^)4+dXz3p1 z9#-gSSzKCBP*hT&#5U6Ps8(yB*!dpDdPo3acJv>49Dxcc8aO(NnE?=xg9k zLbTXbE84`-4|j>_deizY4B)sM0}0mZs@kLz;-x~9)ZCSZhK~RY}Pf7tIxUmipEg zG0(tDghrx^-lze`d{vSmOB&!A=e5d;7I3_RSH)6Gx@$5PaV*9(LahQxC>rVMTkNjz z0Nn3%p4XhOXtO@KLyelSHbFGzl z-@to>y5f|zuG|!>@qsvOby-$m4MzZLMVPHe*m?q`D3uKy8?i}vY`tPW!Y2kkCe*3v zKyHcGBX>K;r}#|lv^BL<;tP&1u|-_6B{kSaaQ1eWdt*mcCEYyMTbl2#uwaMCv^Q+9 zOBNO4wc%@gYv3C(+Fm#6JA6+t4KFS&EtAD1<|O5)Y<^TV?-q;fk&d4UT4AgW3E0EY z3VX#?d*kSRa;M5ZsC{vO<2M|vS&G(eL}znC{lUt2nB#Z+QR7Rk@}&$^z9Sq*Z;ne% zRp?(Fe}_b*iTQjBT^9MZ7BWV#DS=EvtDXoem#tT)mN zfo1xe9i5g0JA9)pL9}>U0AJ0@FyA5|!d#f2VFVqrC%%M15#|7XkfP3?q)>$6$1l!b zZ%8gj$_?(V`WMnZ#SCEoeAt54q2Tc6yz9WRN_n6$G?dRdh?C}i9}?I>G-rp=IWruI?)ncqiwoQ2Xqr%*3DXkZfKdhMa$By+6cXt=GA?*wF$aIo2u8*X6WIF zl9>&GRec_aMkD#Atm8NVLK52HBu>e*ID^vg4^B&~C%JG&VvL589cQJbQ-yqeEP2F}fjk2%#42ZaVIJUcIIg C4>!mF delta 2256 zcmZuy33wAl6#n1tCYz)~TS5bTS|B|rJtzfwSSXDk6)d(|#RJreX}fKMX;PE4P!$6L zDvBtK7oY-O^+M$^1W`orq6ngRi{gbSsDO%ML2$OIwBcj(CG+-wZ{GXopLvB=$z^6GIc%`(h(1H;tQZbUy>kJ_bqmWHd8}(Ukj|C2lR&g%DE*KaX z#^5|&FJEac!8jG?6O#B+IZ5E-aRL8Lw$lV2rzDz6QN~b?i+HY*YplSfDlXw}C0U+` z%lJZNU>^srV7L;K2xez>wdVJy4$mW`@t!P&A5siiCAf;=YFtB5{H_}{v8eQnQk~1S z3{!Ajw`uv@ZWuMzfhvaTC`W-Ft})a`q37smJ%bBVyCo?kj25+1`4&U}Np2xtcJ1`+ zCQps#bGtm+NPDf*?bnJd@SstJmvELYTX5X#xLw6~O78z4!CL0@2keb*XNy)d*zVDq zHJ=5Gu~fwpeuF8c&%+((Na%2xHa%b#OL~-H8J6?sO!>)k@fgG7m`CVQCjwjzT17`5 zo!gTPPob4d=KPdr#QxhGTpkmiBUoC*lU-h(T~lMhO1!Az1wu04&636OdkL%fEOV)G z4PI8UmhUw8l|xv^515lpE3uy86>Q)(%lNq02$Zc?d7WVs-r(0;CJfkuw^Y1I=-Jg! zrJjIRrwjKs-r*lv2AbAjD?=N$af-y`w~F(L`VRI(#39rAGNI z*oBW(d_;)ts$1?1h{O2_J|!4x-CnOx2#{WqQKB>cT-W6baX1I1mu5t|JJS3eTUTVl zZh};Aw_p&yW*CY+d}mBjzi&nF2nF>c^*zH6*xR+E!-nx#mYLwdK8Bz0bC)AmcMQtD zLZ5Vi;g{}{a);~aZwv>cX5{kaY%87MQ+q6v4P@jj_A~l{?~NT`X@dbKK)P!+kBv(T zhEOOMw<0}rE#ku{PF#<%lGusT5H8FL;o_$dqk9s=xO|R8iJejFF`2O9b&4ri^8^hS_&=E@r??#~oN>s)JcG+-tgk6hBaRMDf;M9qpNXQ@FGV4n z8p2oBZ%&nLMRvE?)AQ;2b(2qbhw1B3E@ zWXcCnBL9LiVNa0{VXAx>P4e%UDIdXn`7b;x|BW`e9Y^G2MDlUUlK-V4@(IdQK;smm zN=2e+ib69K1I<&6#1)m6DJFVMG1FEhhW03o+LazsFC|tgQsN|s5--&&36f8-Nx>GS zk2G89E8VG_jYPrh8kqIwKtJ>sZ@P5|he4u=3-LSt5O;qb<>5~p5!N_L#$N)Hsgh#w zx3CnNCZdlD%RueoZvIDDMyVIl(Jm|%$3)6pu;a+2B&i)w7M_0+l`yIx6%{I05{V1J zmUaw*lgNM+!GZYr_%RrO_IhgcKN(y5rhN(DZrKl)PRT*kBuw+wLpN57swWOszZ8_L->F7dNS9-cJ v(4C>a3>Uv9)KQfT1pobj8sP vS9iwx;u2;;oGEE$6qr+DK^YH=B`sFitl6_6z~}M5m%)}dJ3buF#i+p#LlP){ diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index 5a1b8825713cae03d8967676cd9f82b5cc068449..ecc531cdc098e1fb8ea68aaea6de8c3a0a8a5e59 100644 GIT binary patch delta 1958 zcmah~d2kbD6#u>E*iEuXjW7^KA=1v+K-*BnLBb(7R-hmhu~@_>vqiO{~QUr+j@F(IF&M)Wej zQ5Dw&M5%(w!pQ~fWJoM(Xi=kBn{BwbW>Xa01l4@d-nnxanuIb!rW%h&^ss8^v1o9# zsz((}L%F%vp2KPA3T9xY`G-BgOof6dVrH%*&~F%SR**m;K^ZcpXn5hc(SwQ$#}vsh zIGf6NnQCZ$(W6-kZo$RpdsHB!%B*p8_s_xY5^f`SXQ;E(V5Ol)f@9($1T~`I4y4S3 zjxNr*m?z;blbqSM`B-4)IJ?u`X0fwtn}ulW#zHJoa3AhB=Q(?iuf{_X9^`P+czP^2 zT#sl9YEVFETdo;{rY2*NN<$l~8q;N%1j=(`F&>q$giDY%il{s)=(Ly{)d-4ZwSpJ%62Ym>){{n(V9N^J+lI?`L~Cb)JHwVD@uE}=ta$kUmQm?fTCI%Xd881#s#D_vYE zIG_Nu!>m#AQd64H+uOGp{WH*l!6j=kv=P^Y>^{49w1qLejk8efv$r6t#5=JOmvw7^ z(u58cx_L`@v5;@!2A^Gs8*pO-rdpWpvs;KvtfPLX5#whO8Hy3pP{}h;sU}pOg<&_| z+5dqSa`+q;Ze5EzSK#XwEG%inJt3#h`A@(1h9sY4;en!D@52@z3CS&}F3D>|ZOA1k z;rDd(Pc-2v_U~P8A=S+%+j@#@p5w(Q+Xc-@2`e|3Ca)PQGQfn-ZDD1a5!9+$xWv9@ zq9|W|T7DXPoww0K^BJ1!u*t`YP1tt!^!4+nHa_M2dwch!?d#AsHv=7BYez*+RAF5;2@khi5>V9pFtuS7Cy%z zhV$|p{RPWhG=i_bFPU;vGh2Oyui?Qr>|0^Cr_sJ;`FAXt49A~XBw_I>hVY~$kc7j` zrvHN_%#pBALbZhN(`z+w0wX2tJH_7^=Q(Xi5W2uAc3?X%M&=;2#}6#@u&)3z_yJtq zx^KZ@3qRH~laX$wlU2AhW?rVJ;AmR<6Mjzbzu;Hi?R??EN3z75mJ9-6(#-kJHgFJm+!GkdbDKj@`Le{h?8F^W`IU*Kv zb>)F#SykM2j#nzdhkjhYTvVh4gR#jX0-DJ>*j)xyK#<^EATO4a%2kgyDK}uGAbTa0 zW3iTFjkYbpGXg3I(OQKg+9KguJf~Gz2h;Oft2HK~65Z{n#ETMM!pquq>xk)Lydq#3 z=hOk}@h462cohlDkxb}bqNo{jgMM$hs!WyD`66B;P=XyR@rHocxepyqUfEZYG+iz8 z_(~+aiMOVfEd`q#DleNLY(?+9hFlsEW{|u+&>LG`X-mSXQVS=Upgb z1IH<}Ba9?t*(_lTwi2w$5>HU&4w&NNXBmoZ61E!(OX-?4r+c&PB%n!~Y>PD=MzglamU90Qp67s9t`KpIvn%%dln3lM zfl~rbYUgcz==6arwpOC=v|2}hx~R1|qUcBMnxl$-*Oo~tt9mi{6p`1DpDYTpR@v)lGgMWq9h~vXr2a&1} zOY4zH8}JZq#8}#dEZU5zv;_g$iV#&JOxv)WwqrHzzOrF4u|&~aKzC#afEa&o8G z^)!35vh^7{MCah-M3*AMm@3?hp1d=-56}w!;ZQx!;6rr7O&r2m=1driOq|0(2q$Cfy3C)zhG|CS}QVfhEk1+2VUKjW7U`YRU)F0v07 Tca=FO>xilGr1MSj#~9bY*$vcw diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index cc7c3c3b2921ca4d51449da06c5846460f70d69b..3d27cb5a615d074a9078c7096865a1cf2dc70200 100644 GIT binary patch delta 2056 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 u)n*(EP{=0~uSab3ju{3{O_`7qto9kb@gXj?e diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index e4d7831f726915faa52f273b4a07b04d7dd73b9e..24e3ed6791753d76bc8b68e7d0e621c9a3e495f1 100644 GIT binary patch delta 37 tcmX@fagt-hQbtCjiSyJqpJiOg$jCZ5pV^a>gMo{QlR=P)d-6f%4gleF3LF3c delta 37 tcmX@fagt-hQbtC@iSyJqpJiOg$jCN1pV^a>lYxtgi$RcyXYxVj4gleW3LgLf diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 44f5e345997e2e0de3dd46b0af0375bcc37cfef8..ac200b5361098cb3e2a5a8ec135cc126344447a2 100644 GIT binary patch delta 37 tcmX@fagt-hQbtCjiSyJqpJiOg$jCQ2pV^aBkb#Ryh(VA^Wb#4g4glj43P1n= delta 37 tcmX@fagt-hQbtC@iSyJqpJiOg$jCoApV^aBh=Geqm_d+9bn-#w4gljL3PS(@ diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 5c179a1fb95e0d28a9c3badf9a7f3f6dbd673440..9d192a742d03c0d7d745ee32b6f2657d1c979867 100644 GIT binary patch delta 176 zcmdley-|9D2@{JkBZK$kkF2VjW0?#X8BHelG25}2GBWsr#3siwDNYt+kzp}oWKabP zs7#Jx>0~iyWH6sRky&{%7wcn2i_Py?r!cZuGBP*;6=+Ug&%Tq@$bgZ-4$2dmyoy7N z(QxxYjt5MP5}OxsYcm>3Gl($BG3YZXFqkqaG6XXzGn6x_Fmy1fGE8AoW0=XL&M=Qj VgJC_B7Q=C%n%hjelmGE-1^@&?ETRAa delta 176 zcmdley-|9D2@{JEBZK$kkF2VjW0?#X8I33RG25}2Ff#ap#3siwDNYt+kzp}qWKabP zs7#Jx>0~iuWH6sRky&{%7wcn2^Ud#Ar!cZuFfup+6=+Ug&%Tq@(2|kC4$2dmyoy7N z(O~mIjt5MPlA9NCYcm?kFo-b8Gw3rZGMF+cF$6QIGL$o^F?2AgGfZL9V3^6I$uN&e Vi(x&J4#RPvn%hkJlmGE-1^@+ZEVuvw diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class index 0b2559a08ece5bfa6721aa7f7ac2d606c0c495c7..a432aa62cc9046874de54e1c55a2618e4c09ccba 100644 GIT binary patch delta 39 vcmcb}dy#j;Mpj0H$(vY9M2#7EnM@c&namhen9Lb8m@F7{n5-vTvrPj4%N7WH delta 39 vcmcb}dy#j;Mpj0n$(vY9L`@lZnamhOnJgGom@FAIn5-Cdm~1CovrPj4%m@gI diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class index 6a6cb291e92b6b5ce26c37c5df7ea8a7147ec17a..2956abae69dd7a6116d4dd73c94af6fec5af1b8c 100644 GIT binary patch delta 23 fcmcb@afM^U1ZGD6$rG9FS%VnZnSv)@Wv&MRUTX(W delta 23 fcmcb@afM^U1ZKvd$rG9FSwk7vnZhPtWv&MRUcv`h diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 83521de83069f776422b830c5461eb749b4b9632..767fc9700f1bcbfdca19b8a3856e36334b9a0504 100644 GIT binary patch delta 13916 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 delta 12934 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 literal 4184 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 diff --git a/src/application/CloudController.java b/src/application/CloudController.java index 069c45b..7f1d1a0 100644 --- a/src/application/CloudController.java +++ b/src/application/CloudController.java @@ -53,7 +53,8 @@ void stratupCheck(String cloudService, String cemuDirectory) { main.mainWindowController.saveSettings(); Thread thread = new Thread(new Runnable() { - public void run() { + @Override + public void run() { Platform.runLater(() -> { main.mainWindowController.getPlayBtn().setText("syncing..."); }); @@ -82,6 +83,7 @@ void sync(String cloudService, String cemuDirectory) { //running sync in a new thread, instead of blocking the main thread Thread thread = new Thread(new Runnable() { + @Override public void run() { Platform.runLater(() -> { main.mainWindowController.getPlayBtn().setText("syncing..."); @@ -113,7 +115,8 @@ void uploadFile(String cloudService, File file) { //running uploadFile in a new thread, instead of blocking the main thread new Thread() { - public void run() { + @Override + public void run() { System.out.println("starting uploadFile in new thread..."); if(cloudService.equals("GoogleDrive")) { diff --git a/src/application/Main.java b/src/application/Main.java index bf653a5..39dcbd0 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -91,7 +91,6 @@ private void mainWindow(){ //check if client_secret.jason is present if (Main.class.getResourceAsStream("/resources/client_secret.json") == null) { LOGGER.error("client_secret is missing!!!!!"); -// System.err.println("client_secret is missing!!!!!"); Alert alert = new Alert(AlertType.ERROR); alert.setTitle("cemu_UI"); @@ -102,18 +101,14 @@ private void mainWindow(){ LOGGER.info("Directory: " + directory.exists()); LOGGER.info("Configfile: " + configFile.exists()); -// System.out.println("Directory: " + directory.exists()); -// System.out.println("configfile: " + configFile.exists()); if(!directory.exists()){ LOGGER.info("creating cemu_UI directory"); -// System.out.println("mkdir all"); directory.mkdir(); pictureCache.mkdir(); } if(!configFile.exists()){ LOGGER.info("firststart, setting default values"); -// System.out.println("firststart"); firstStart(); mainWindowController.setColor("00a8cc"); mainWindowController.setxPosHelper(0); @@ -129,14 +124,12 @@ private void mainWindow(){ if(gamesDBFile.exists() != true){ try { LOGGER.info("downloading games.db... "); -// System.out.print("downloading games.db... "); URL website = new URL(gamesDBdownloadURL); ReadableByteChannel rbc = Channels.newChannel(website.openStream()); FileOutputStream fos = new FileOutputStream(gamesDBFile); fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); fos.close(); LOGGER.info("finished downloading games.db"); -// System.out.println("done!"); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index fc82318..64741bd 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -229,8 +229,8 @@ public class MainWindowController { private DirectoryChooser directoryChooser = new DirectoryChooser(); private File dirWin = new File(System.getProperty("user.home") + "/Documents/cemu_UI"); private File dirLinux = new File(System.getProperty("user.home") + "/cemu_UI"); - private File fileWin = new File(dirWin + "/config.xml"); - private File fileLinux = new File(dirLinux + "/config.xml"); + private File configFileWin = new File(dirWin + "/config.xml"); + private File configFileLinux = new File(dirLinux + "/config.xml"); File pictureCacheWin = new File(dirWin+"/picture_cache"); File pictureCacheLinux = new File(dirLinux+"/picture_cache"); private ObservableList smmIDs = FXCollections.observableArrayList("fe31b7f2", "44fc5929"); //TODO add more IDs @@ -301,7 +301,6 @@ void initUI(){ */ void initActions() { LOGGER.info("initializing Actions... "); -// System.out.println("initializing Actions... "); HamburgerBackArrowBasicTransition burgerTask = new HamburgerBackArrowBasicTransition(menuHam); menuHam.addEventHandler(MouseEvent.MOUSE_PRESSED, (e)->{ @@ -409,7 +408,7 @@ public void handle(ActionEvent event) { String updatePath; System.out.println("update: "+selectedGameTitleID); if(selectedGameTitleID == null){ - System.out.println("trying to update null! null is not valid!"); + LOGGER.error("trying to update null! null is not valid!"); Alert alert = new Alert(AlertType.WARNING); alert.setTitle("edit"); alert.setHeaderText("cemu_UI"); @@ -433,21 +432,21 @@ public void handle(ActionEvent event) { File srcDir = new File(updatePath); File destDir = new File(cemuPath+"\\mlc01\\usr\\title\\"+parts[0]+"\\"+parts[1]); - System.out.println(updatePath); - System.out.println(destDir.toString()); + LOGGER.info(updatePath); + LOGGER.info(destDir.toString()); if(destDir.exists() != true){ destDir.mkdir(); } try { - System.out.println("copying files..."); + LOGGER.info("copying files..."); playBtn.setText("updating..."); playBtn.setDisable(true); FileUtils.copyDirectory(srcDir, destDir); //TODO progress indicator playBtn.setText("play"); playBtn.setDisable(false); - System.out.println("done!"); + LOGGER.info("copying files done!"); } catch (IOException e) { e.printStackTrace(); } @@ -464,7 +463,7 @@ public void handle(ActionEvent event) { String titleID = selectedGameTitleID; String dlcPath; - System.out.println("add DLC: "+selectedGameTitleID); + LOGGER.info("add DLC: "+selectedGameTitleID); if(selectedGameTitleID == null){ System.out.println("trying to add a dlc to null! null is not valid!"); Alert alert = new Alert(AlertType.WARNING); @@ -490,21 +489,21 @@ public void handle(ActionEvent event) { File srcDir = new File(dlcPath); File destDir = new File(cemuPath+"\\mlc01\\usr\\title\\"+parts[0]+"\\"+parts[1]+"\\aoc"); - System.out.println(dlcPath); - System.out.println(destDir.toString()); + LOGGER.info(dlcPath); + LOGGER.info(destDir.toString()); if(destDir.exists() != true){ destDir.mkdir(); } try { - System.out.println("copying files..."); + LOGGER.info("copying files..."); playBtn.setText("copying files..."); playBtn.setDisable(true); FileUtils.copyDirectory(srcDir, destDir); //TODO progress indicator playBtn.setText("play"); playBtn.setDisable(false); - System.out.println("done!"); + LOGGER.info("copying files done!"); } catch (IOException e) { e.printStackTrace(); } @@ -545,7 +544,6 @@ public void changed(ObservableValue observable, Object oldVal, Object newVal) for (int i = 0; i < courses.size(); i++) { if (courses.get(i).getId() == id) { try { -// 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); @@ -573,7 +571,6 @@ public void handle(MouseEvent mouseEvent) { } }); LOGGER.info("initializing Actions done!"); -// System.out.println("initializing Actions done!"); } @FXML @@ -677,7 +674,7 @@ void lastTimePlayedBtnAction(ActionEvent event){ void cemuTFBtnAction(ActionEvent event) { File cemuDirectory = directoryChooser.showDialog(main.primaryStage); if(cemuDirectory == null){ - System.out.println("No Directory selected"); + LOGGER.info("No Directory selected"); }else{ setCemuPath(cemuDirectory.getAbsolutePath()); saveSettings(); @@ -696,7 +693,7 @@ void cemuTFBtnAction(ActionEvent event) { void romTFBtnAction(ActionEvent event) { File romDirectory = directoryChooser.showDialog(main.primaryStage); if(romDirectory == null){ - System.out.println("No Directory selected"); + LOGGER.info("No Directory selected"); }else{ setRomPath(romDirectory.getAbsolutePath()); saveSettings(); @@ -727,7 +724,7 @@ void smmdbDownloadBtnAction(ActionEvent event){ pm.setMaximum(conn.getContentLength()); // tell the progress bar the total number of bytes we are going to read. FileUtils.copyInputStreamToFile(pmis, new File(downloadFileURL)); //download file + "/mlc01/emulatorSave" pmis.close(); - System.out.println("downloaded successfull"); + LOGGER.info("downloaded successfull"); File downloadFile = new File(downloadFileURL); @@ -765,16 +762,14 @@ void smmdbDownloadBtnAction(ActionEvent event){ //rename zipfile File course = new File(destination + "/course000"); course.renameTo( new File(destination + "/" + courseName)); - System.out.println("Added new course: " + courseName + ", full path is: " + destination + "/" + courseName); + LOGGER.info("Added new course: " + courseName + ", full path is: " + destination + "/" + courseName); } catch (ZipException e) { - e.printStackTrace(); - System.err.println("an error occurred during unziping the file!"); + LOGGER.error("an error occurred during unziping the file!", e); } downloadFile.delete(); } catch (IOException e) { - System.err.println("something went wrong during downloading the course"); - e.printStackTrace(); + LOGGER.error("something went wrong during downloading the course", e); } } @@ -934,7 +929,7 @@ void addBtnAction(ActionEvent event){ * then add the rom to the local_roms database */ if(exit){ - System.out.println("No parameter set!"); + LOGGER.info("No parameter set!"); }else{ coverName = new File(coverPath).getName(); try { @@ -950,16 +945,14 @@ void addBtnAction(ActionEvent event){ ImageIO.write(resizeImagePNG, "png", new File(pictureCache+"\\"+coverName)); //save image to pictureCache coverPath = pictureCache+"\\"+coverName; } catch (IOException e) { - System.out.println("Ops something went wrong!"); + LOGGER.error("Ops something went wrong!", e); } try { dbController.addRom(title, coverPath, romPath, titleID, "", "", "", "0"); dbController.loadSingleRom(titleID); } catch (SQLException e) { - // Auto-generated catch block - System.out.println("Oops, something went wrong! Error during adding a game."); - e.printStackTrace(); + LOGGER.error("Oops, something went wrong! Error during adding a game.", e); } } } @@ -980,7 +973,7 @@ void addGame(String title, String coverPath, String romPath, String titleID){ Image coverImage = new Image(coverFile.toURI().toString()); generatePosition(); - System.out.println("add " + getxPos()); //TODO debug + LOGGER.info("add " + getxPos()); //TODO debug VBox.setLayoutX(getxPos()); VBox.setLayoutY(getyPos()); VBox.getChildren().addAll(gameTitleLabel,gameBtn); @@ -996,7 +989,7 @@ void addGame(String title, String coverPath, String romPath, String titleID){ gameBtn.addEventHandler(MouseEvent.MOUSE_CLICKED, new EventHandler() { @Override public void handle(MouseEvent event) { - System.out.println("selected: "+title+"; ID: "+titleID); + LOGGER.info("selected: "+title+"; ID: "+titleID); //getting the selected game index by comparing event.getSource() with games.get(i).getButton() for(int i=0; i startQuery() { BufferedReader ina = new BufferedReader(new InputStreamReader(apiUrl.openStream())); output = ina.readLine(); ina.close(); - System.out.println("response from " + URL + " was valid"); + LOGGER.info("response from " + URL + " was valid"); } catch (IOException e) { - System.out.println("error while making api request or reading response"); - System.out.println("response from " + URL + " was: " + output); - e.printStackTrace(); + LOGGER.error("error while making api request or reading response"); + LOGGER.error("response from " + URL + " was: " + output, e); } String apiOutput = "{ \"courses\": " + output + "}"; @@ -116,6 +120,7 @@ public ArrayList startQuery() { } catch (Exception e) { nintendoid = "notset"; } + try { title = item.asObject().getString("title", "");; } catch (Exception e) { diff --git a/src/application/playGame.java b/src/application/playGame.java index 9b13711..256896b 100644 --- a/src/application/playGame.java +++ b/src/application/playGame.java @@ -28,6 +28,7 @@ public playGame(MainWindowController m, dbController db){ dbController = db; } + @Override public void run(){ String selectedGameTitleID = mainWindowController.getSelectedGameTitleID(); String executeComand;