From 917a2f4dc708abaa0b8e0d0442d2ed646afb07d0 Mon Sep 17 00:00:00 2001 From: Maschell Date: Mon, 14 Nov 2016 17:04:24 +0100 Subject: [PATCH] Make it compileable again. Fixed one small issue while copying files. --- jwupclient.jar | Bin 40137 -> 40445 bytes src/de/mas/wupclient/Starter.java | 11 +++-------- src/de/mas/wupclient/client/WUPClient.java | 5 +++-- .../client/operations/DumperOperations.java | 6 ------ .../client/operations/FileOperations.java | 2 +- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/jwupclient.jar b/jwupclient.jar index 7bee75abd750777fe624b1f5d839208f172ab605..230bedb5f4b740c2b9e8086d1c821aab44f9e4bf 100644 GIT binary patch delta 10291 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 delta 9948 zcmZWv1z1#Fw;qOWiJ`l@yFnVHI|QVq8w44;8DdCDX^?J|ly2!p8c`ag6wZbx_a|_L?kt!foI}DPZWp$bPspqz|hWUe<|O z&Mc13tcnpp%B}bSMj9d_Sa}W@8Y5&T6;JxXPAjj41@yJZCxalOMG`UXS{+``=xO0j7@GK~bG2 zly!N-)y%VW=3UibOId8tC^B_6$0m~zkXnauMOJ1$!d;8S#?TT02beuo5s_R18eq(> z*Xq8_eq3cD_a4DN2Ko;<2zk?p$Nh` z;aplJ4C0d>az&e3%ImW$vI4ejHu!1I-p5=&)uA4P$j5eReI=k-JjF7_{$0+jB7&MU z!uO1p3zHlXGrKW$rVS9Hz1Wlps}L@1>u)8=6E0xk3H1~Bz=ScX!4OcT4F*v{1Yzo+ zsHU8#6*5C@JBDQqCAQLqH76!Fr<~59zJ20GITJKRu@Hguj6{iQ=VJ(qKYDDrak>)W z$h8ojDdk(48&qA=b{DB*wdMFIZ=4 zl=;9#!UT{-`x(4)wTU-+9=t4RZEQAu*g8CUn?}Xq=IKG)K_Bq@V{;jYcl}72U0`C( zugmS5Vw1CYUU+i3C?Tp!08tSuOzQTleL3W_`&a@x7Tu_scAGi(8B-718eLaCBTDSJ*V6t07;Hti6Uya%a7H+A;~4 zJ2=H9WI=b6sBw~_D`1;hjC&aIKytHb%>ZPATOt^CU6*G^y=}8JUNeC$LAo4603AJg4YDFxCvIv)$;jhz4#VhJz zJJ_Rp)uA8!Y@Gh$%#KAzFd4r=fMVC2W1gmnS^d1*)2RD-PqA8aRvG40r<#C8ujSIk zw`TGgVYZfr%1Y_A=Tg%esHG>) z+fS%Sa6xC{*jz_9RQiLi$DJ1V)zP;!tftYA@+BSVc$d08<7wxo*yv6i-IfRSI^Bk7 zKKcVZ=A%Ven4Uv?x1o@xli~KocfE^=){~U4PMGOF9(^(-dRSQLWTY_{6Ai6``Gk1$GT1(Rca*X`0-)t*{vEyfsAx$Qu8YHO@-~ZDSmvZEj5=pTs^EUs9Q3pDX z3vpD-uEn8ARJhvM3cbta;Bp79==>GFxJpJZ<{!(zH+urV+-`3%gb{zhW3g$nO`H<$)$AFFF3zzUxh@a zlYdsdfmI&a+tv|eN~B?g4P`~W#&OefzpVA1e$J)Vur%?kjis^MYTbS?$z`i1XSO20 zGWw!XUVM4m55s(0RR5IZRB=+TgS0Yx(AQZ3hg^4T*W9fk8a)2v!wPM?;pDu|0kXF% zlVRBmkE3sADcCZ&d}FwZacRWmq>t1ovuC2&V~ETzcD_^Yz~ zlpO4%gy!*tByeHR5>5NgGhRlQ_?}>hfuy2{>c$U<#Y;sIvg3WXmEiS4n79vIu}&;X zk>UC!ajwcP%Edh@7+)1559FA{Btu^$?eBV*mdw)C`INc2m7Q|E=G0B*4{Z$SKdLwv z-9BF-P`rCN2mgsfx7HY6OUI75jVhFou;PfMPXAg>eCoj4Sfg>3*2!^n@8zVs_{4j{`yl^FcUtNe ze(qg}f21_BU==1U1~x6%5Mgz^=0;CMjUeSybVXeFa

JT&$(Li2Oz4 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 diff --git a/src/de/mas/wupclient/Starter.java b/src/de/mas/wupclient/Starter.java index b738c45..8eb1250 100644 --- a/src/de/mas/wupclient/Starter.java +++ b/src/de/mas/wupclient/Starter.java @@ -5,8 +5,6 @@ import java.util.Scanner; import de.mas.wupclient.client.WUPClient; import de.mas.wupclient.client.operations.DownloadUploadOperations; import de.mas.wupclient.client.operations.DumperOperations; -import de.mas.wupclient.client.operations.FileOperations; -import de.mas.wupclient.client.operations.SpecialOperations; import de.mas.wupclient.client.operations.UtilOperations; public class Starter { @@ -19,7 +17,8 @@ public class Starter { try { boolean exit = false; - System.out.println("JWUPClient. Please enter a command. Enter \"exit\" to exit."); + System.out.println("JWUPClient 0.1a"); + System.out.println("Please enter a command. Enter \"exit\" to exit."); System.out.println(); System.out.print(w.getCwd() + " > "); Scanner reader = new Scanner(System.in); // Reading from System.in @@ -29,6 +28,7 @@ public class Starter { String input = reader.nextLine(); if(input.equals("exit")){ exit = true; + break; } processCommand(input,w); @@ -52,7 +52,6 @@ public class Starter { return; } UtilOperations util = UtilOperations.UtilOperationsFactory(w); - SpecialOperations special = SpecialOperations.SpecialOperationsFactory(w); DownloadUploadOperations dlul = DownloadUploadOperations.DownloadUploadOperationsFactory(w); DumperOperations dump = DumperOperations.DumperOperationsFactory(w); @@ -118,10 +117,6 @@ public class Starter { dlul.downloadFile("", inputs[1],inputs[2] + "/" + w.getCwd()); } - break; - case "nandtickets": //download to full path - special.parseAndDownloadTickets(); - break; case "dumpdisc": String pattern = ".*"; diff --git a/src/de/mas/wupclient/client/WUPClient.java b/src/de/mas/wupclient/client/WUPClient.java index 1112e73..7897f79 100644 --- a/src/de/mas/wupclient/client/WUPClient.java +++ b/src/de/mas/wupclient/client/WUPClient.java @@ -125,10 +125,11 @@ public class WUPClient { clientSocket = new Socket(ip, 1337); } catch (UnknownHostException e) { Logger.logErr("Unkown Host"); - e.printStackTrace(); + Logger.logErr("Make sure you entered the correct ip (tried " + ip + ") and the wupserver in running."); + System.exit(-1); } catch (IOException e) { Logger.logErr("IO Error Host"); - e.printStackTrace(); + System.exit(-1); } setSocket(clientSocket); Logger.log("Connected to " + ip); diff --git a/src/de/mas/wupclient/client/operations/DumperOperations.java b/src/de/mas/wupclient/client/operations/DumperOperations.java index fa7988a..028b931 100644 --- a/src/de/mas/wupclient/client/operations/DumperOperations.java +++ b/src/de/mas/wupclient/client/operations/DumperOperations.java @@ -1,17 +1,11 @@ package de.mas.wupclient.client.operations; import java.io.ByteArrayInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.util.Arrays; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; -import java.util.Map.Entry; import de.mas.wupclient.client.WUPClient; -import de.mas.wupclient.client.utils.FEntry; import de.mas.wupclient.client.utils.Logger; import de.mas.wupclient.client.utils.MetaInformation; import de.mas.wupclient.client.utils.Utils; diff --git a/src/de/mas/wupclient/client/operations/FileOperations.java b/src/de/mas/wupclient/client/operations/FileOperations.java index 78c6ff7..967be14 100644 --- a/src/de/mas/wupclient/client/operations/FileOperations.java +++ b/src/de/mas/wupclient/client/operations/FileOperations.java @@ -118,7 +118,7 @@ public class FileOperations extends Operations { } i += result_val; Result result_write = fsa.FSA_WriteFilePtr(fsa_handle, dst_handle, 0x1, result_val, buffer_ptr); - int result_write_val = result_read.getResultValue(); + int result_write_val = result_write.getResultValue(); if(result_write_val < 0){ Logger.log("copyFile error: writing destination file failed."); result = false;