From e796b582fa5a73b912872ad71d2e2ee4966c76bf Mon Sep 17 00:00:00 2001 From: Seil0 Date: Thu, 4 May 2017 22:32:25 +0200 Subject: [PATCH] a little clean up --- bin/.gitignore | 1 + bin/application/CloudController$1.class | Bin 1288 -> 1288 bytes bin/application/CloudController$2.class | Bin 1320 -> 1320 bytes bin/application/CloudController.class | Bin 2698 -> 2754 bytes .../GoogleDriveController.class | Bin 13689 -> 13770 bytes src/application/CloudController.java | 1 + .../GoogleDriveController.java | 11 ++++++----- 7 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/.gitignore b/bin/.gitignore index 4003d99..3f9dc07 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1 +1,2 @@ /cloudControllerInstances/ +/application/ diff --git a/bin/application/CloudController$1.class b/bin/application/CloudController$1.class index 96fd9ebd7483e4046b8ce2385714ee01b92487d9..5a40f24ba320429e8c17018d311443a01c5e72c9 100644 GIT binary patch delta 39 ucmeC+>fqX7$HM47*`6g`)RTdO!J9#l!Iwdv!H+?i!Jk2$A$0O?7GD6My9cEJ delta 39 ucmeC+>fqX7$HM3~*`6g`)PsS8!HYqV!G}Sf!Iwdq!H+?mA!PDy7GD6MLI<7z diff --git a/bin/application/CloudController$2.class b/bin/application/CloudController$2.class index 60b049ddd81177fe9332174dade5fc7fff6eea50..e8cb19dab7a7bc31d340c13000040427c84c190b 100644 GIT binary patch delta 39 ucmZ3%wSsFy91COYhy|>Nw@Rnp)CR%W5W<%b2>FE*L9%G#ZsqgJBsX7-gt(5aT&Btrr-C zw)Uj`Iws>36#KQHYbE#9kJC8g#RNmGmd~3;N-G(;Y%H!BSsB74rubuF&>zQHFJ>52 z{!&l{8Rz&9p&@c!#s!;CDd)|cmL4(9al_P$5*RMZn8$twvAC8^d2xxy#DmodBxU$< znPIGL`dRHhz9zO;Ca@^uDt|2wu^WU6)^S_Oun-DwBVb|Z1)5#&B$@hc zj9Zv?6SJGB3r9LE%x%IqbJ#*`i}q2_ixcQ1&fUZrMHT&HsHBX7F6==!f^@WY9Hq=L zih5?Kpcez^qk{~ik>Fu>90E5{M1v8qhp27uIC&L>7OAF>n)FlF2cdhyi%xrqdH&Q_ z-ocvNp?P220d~k;1qBuq;z-ciR00wox*Ftpv$R)O!7A^U WI)itqx&mvsM>arSf~@^%uK5jV0+oRP delta 827 zcmZWmO-~b16g{sq)6!v_mMY>W(4-{TV#&w{e0&u5OodKFl+md=)$%hzzL6;Eo1A78xe^xH8Q5<)Al%WeqF*hn$q} zyHqVQs3MC8f|}zAWm3vwnZHnG^+ya4(=83FSm!^L2&-__+ap&sY`h!teqoJIkRX#& zW3f=|Erz3e2-&#s2Ays;PT|lVCTvW*g&R9)i^lqF+}c6Q%xN3(Cf(r00D0X{T8Bw1 zN<)FTQw?Ge9T-BG@Lrrn48z17p=^}CWP?D_;H-cnI7%;ChDhf~R%9cTd5A6(eT)X2 zr)mqN*pv_bqKmvEW~-Aagai6VWEN@1_gJv8)TD~XSxa}&6fKv*0W3I^x#EwE-o?HD zC9S)7L{@ow$C^_f4N3vgN^Px<#8(dMlj%|uX+;;bt23hb>^G7_nmX!dFTJnf6mP3 z%b#B1dwO8^9sm(F?>^s4qpH1}Nfa(=ZHtAX9kH(V(s(GgrnM^`YHbh2m&HOCw{>(! zD?&byvnT#-(er)5W)(EA%UY zw#=1;YK{8X!Am?`Mbr$Q86jsn*`=?|Zt`}p+v25Mt>4cs4qPS=p4HJ7jdh0R%&e8{ z2Y9)~D|AWlV((I3W$|iWqkDo=`2+oIaDLhbUhClxiK@Z4R$9GKVDU%1PA|@x@7};} z4}Yxh%^C0Q;SClwf1=;ZDROV(bPsRTnYnkmZ?SkQZ`1v`lX!kwI z?dY@0Ht@h$$@!?*RvqjMa8;a_!nL7n^W z7T@8!y1rn(`+bWa@I!rj!7}H^#8`d3GfSUYnBnvBBYtY3h==sl&^Rf|KTWy+rQ1Wj zBmOPbYZcKA&hQ+P)Hmy%<&V|Dwn90mlxI=tNCs zQH{VFICJ~PF%z6=i{V5Xz{c%Qm5t=An(zZKpQ=0?hiy7~k$XRO z`#HmAO<3$kjN&eECH{)8>Z9TNGxWX5OPIM|PY<~}a0FZXki&88+<&$W4elcfEL&5O!y zF7dO?X1mS!UJNwIjs4iu?B|+3JX~ROt&OK_JR_09=4uC)7?>&vv&g`~9wF}`WMVIZ z3G7259>EkmiUoKK=i>1s?ocYJLEM>`$M5jFf_n;znUI|Ua3$A?r9=YmmTLpT6v5El<)WAGwkF+9l?cgdq58&9v<{?6Fl6dz188B&l%wil`*BP z7latGElCpdhe2Yv-p@bUeB~Q8HUv5EMsd(NNYFr|+*(s<69%>HD`YS5#s7r9rFvBU z2Lk#-OvXo;hEH$~K1CFVuu}G`@tJ>edm5$;7W*8GN~$mgCt%<-z-8bhD{inr zI3#DIMVMKeb@@t@AW}=Lyg!_kuWTXFuqw^F`0Wzvq_&; z7>0K8O`Csfs_19Bx#NUBX4-tOsh=M;kBFA{@e@OaX%R!hKm7b`sE=!%L;3ti@-Z4Y z+Q|tVJl4V~iF}R_4r3g?KqJ1yVhmt8iEb+N(19&G0(x|MVXF{gL^BRoCHq;S z8z=H}9u{HrATP z{WdrW*V-y5OsTwNh$0DLh)Rw0Fnm&NFGBR8p6NKB!w}_gtYii{>4)Y>+{G;1!+@SX zAy{C>TRozx#7qyIj|I|0UWuiVug0jcdd-BB6Q%!;grR;BWRg&stty)ahj?S9;YNnv zH>D${oAHS4~yZ^x;U&nbRe%Qm3lZWIYXD vHBnac>Qyt;=`v{EW{a#rE|qnbOo$HoQ!-o7RLOdVtogFe5&H&N=YszO^))Qj delta 3137 zcmZve3w+bn701u-=GpWQv<;A^v`yNyl%{Em(DG=N3gxA=JOnJALd{5^g+73$Py~%k z5H>`GTb*Ms5GR{wc*qcRn>Zi1hfZYzn>s-$o}083`7EDLa_>F&@jvH# zf9L#jeBtE3=&%@4ArRFlvo?T5F}~>Hq@cPf_l(k-r?QkH1noK zSS)uYR#@xMs3C+V8SnHsmhq#;H`E4#OWb#iEpjWLmTS0QPIAt*2C+)R_wcaPoujZu ze(szavlidCV4VteOHv-6`2(z%tCEzx(SpZ7KKW3>px$LQjUgL0;0X;Iu}Q`aNH@3O zb_<@ABL+Nc|EY$b;pZUBQh#kzaLPQ;K)EPA(^zc9R+*TbVtW>32>3%*JSR(%(~^Iw z;a7AN6gNK@D)rYl)Yr`Q*G~0^s;ziIu1wC3`88g&;5Q(bjPGlYuW861UsD^L8LFw} zIDd;B@=Wq1YYTR1cnL4d%#?xVHtexrx15&Z=(`t9AY*;7Ib@>({7%C@?3XK3ysm>F zRM{vChc&zcGrQyu1Y*&K-)r~-!tzMUYU6P$UX$giZk&yDV!LYpRH)k0I zYvBNu%7cj|+Js=J*e0A}fJG!pc!n5~MT#8eDS}Hb_KbF9fMS{!v4|9BwR@l@vcw>H z%rhg#%UTsVU8y0bX5?b9d@!T1SH2j+7{yS~&_QJ?m17k9aNyBbhSXT zvgjz;dhLxJTs;i5n12^glAN03pFNCrVl3^UC2YHktm9uz1 ztZc(wWjS_C*DVzW<{(T-S1g?NCcjd+zeX}l~td6Fj; zuw)X~sEW)Mf`tk!_@f0aWI>x8lkW|mQp&l0vr%cCW>##Q7h&~!7b`qs$Defk<)&*_ z%#7Q~<1}_L>zvG62j?LS0cB2tHRK(?EQV~aVqQWI64^Cn~)4QLK zGcu?ZVWn}H8Mgx7!r5iV*`Bm4_bDQ*o13qmO$WNc%&hP!TD$RA9q(88+7YXE^lC%A zj(=9P)qbd{!aZp{Ix8T=xE;RemLbeAh?;aHVs;^|?i1Q#@ihT(I3!Ln$kWQ9wvza=O9 zzi4Jq(SOCW92yzotU9hnmvX|DD_dNQ`qc$z&eh32T^Ki0 zyuv9gjFZPP741TcoY*FM^SF;)B=8Bj_jVm4`bLtitLQcBq90=riIF2x`G_9bc*(|h zW+69Xs0=omjb0Q$Z>mEdTEewf!cNbjAH9hFa^n!EOVzeA3JA9<9W2C|e$HFKw zs&y*zTy^!`+K5WS^lfRFqSA0?CUN`&_`Q-!{L-cS;HFxn(Mot|9WrPeGHE{s$_qms zVPB-W6CDt_5duZDCL#y}t)t-)K^SRUR1lm65P9TbVygC!VoIutYwaSx(%U9((M3Ve z>!ml(60-UIR!FfJ77?MUKB@*q-8M;&kl`r0Vb*kgc7*IG$TE#06H4Uy0+(T= z7%F=g=Jk0qvRV+uSw)d3mXitxPq~%P72-BAirX<{75Ut%&t_2~MstF^k1B4R{9mg| cjNwGD<9{8c9F3RTvE1^E7{~Ut+>R%F1HpJHBme*a diff --git a/src/application/CloudController.java b/src/application/CloudController.java index 2891616..40871d0 100644 --- a/src/application/CloudController.java +++ b/src/application/CloudController.java @@ -45,6 +45,7 @@ public class CloudController { void stratupCheck(String cloudService, String cemuDirectory) { if(cloudService == "GoogleDrive") { + System.out.println("starting startup check google drive..."); try { if (!googleDriveController.checkFolder()) { googleDriveController.creatFolder(); diff --git a/src/cloudControllerInstances/GoogleDriveController.java b/src/cloudControllerInstances/GoogleDriveController.java index 09a688b..25af9a7 100644 --- a/src/cloudControllerInstances/GoogleDriveController.java +++ b/src/cloudControllerInstances/GoogleDriveController.java @@ -177,6 +177,7 @@ public class GoogleDriveController { // upload file to cloud which don't exist in the cloud for (int j = 0; j < localSavegames.size(); j++) { if (!cloudSavegamesName.contains(localSavegamesName.get(j))) { + System.out.print("file doesn't exist in the cloud, "); uploadFile(localSavegames.get(j)); } } @@ -245,7 +246,7 @@ public class GoogleDriveController { //upload a file to the cloud from the local savegames folder public void uploadFile(java.io.File uploadFile) throws IOException{ - System.out.println("uploading ..."); + System.out.println("uploading " + uploadFile.getName() + "..."); File fileMetadata = new File(); fileMetadata.setName(uploadFile.getParentFile().getName()+"_"+uploadFile.getName()); fileMetadata.setParents(Collections.singletonList(folderID)); @@ -296,13 +297,13 @@ public class GoogleDriveController { public void uploadAllFiles() { new Thread() { public void run() { - try { + try { getLocalSavegames(); for (int i = 0; i < localSavegames.size(); i++) { - uploadFile(localSavegames.get(i)); - } + uploadFile(localSavegames.get(i)); + } } catch (IOException e) { - // Auto-generated catch block + //Auto-generated catch block e.printStackTrace(); } }