flavien/Projet_JAVA_P2P_STRI2A
3
2
Fork 0
Code Issues 11 Pull Requests Releases 13 Activity

Fix #112 Fix #107 (#113)
All checks were successful
flavien's git/Projet_JAVA_P2P_STRI2A/pipeline/head This commit looks good
Details

Browse Source 
Fix #112 Fix #107
This commit is contained in:
Louis Royer 2020-04-03 22:04:20 +02:00
parent 31a2802cd1
commit f0f18d64b5
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/clientP2P/ClientManagement.java
View File

@ -128,7 +128,7 @@ public abstract class ClientManagement extends ServeErrors implements Runnable {
hostList = ((DiscoverResponse)p).getHostList();
}
closeTrackerSocket();
} catch (SocketClosed e){
} catch (SocketClosed e) {
writeLog("listDirectory : SocketClosed", LogLevel.Error);
throw new ProtocolError();
} catch (NotATracker e) {
@ -202,7 +202,7 @@ public abstract class ClientManagement extends ServeErrors implements Runnable {
} catch (EmptyFile e) {
writeLog(e, LogLevel.Error);
throw new ProtocolError();
} catch (SocketClosed e){
} catch (SocketClosed e) {
writeLog("listDirectory : SocketClosed", LogLevel.Error);
throw new ProtocolError();
} catch (NotATracker e) {
@ -271,33 +271,36 @@ public abstract class ClientManagement extends ServeErrors implements Runnable {
/** Implementation of Runnable
*/
public void run() {
boolean isrunning = true;
while (isrunning){
boolean isRunning = true;
while (isRunning) {
try {
int i = 1;
String[] list = listDirectory();
System.out.println("Files present on the server:");
System.out.println("0 : Exit the program");
System.out.println("R: Refresh file list");
System.out.println("0: Exit the program");
for(String listItem: list) {
System.out.println(i + " : " + listItem);
System.out.println(i + ": " + listItem);
i++;
}
System.out.println("Type the number associated with the file to download:");
String f = scanner.nextLine();
if(f.equals("0")){
isrunning = false;
}
else{
int j = Integer.parseInt(f);
if(j <= list.length){
j--;
download(list[j]);
System.out.println("File " + f + " sucessfully downloaded");
writeLog("File " + f + " sucessfully downloaded", LogLevel.Info);
}
else{
System.out.println("File " + f + " unsucessfully downloaded, wrong number");
writeLog("File " + f + " unsucessfully downloaded, wrong number", LogLevel.Info);
if (f.equals("0")) {
isRunning = false;
} else if (f.equals("R") || f.equals("r")) {
writeLog("File list refresh.", LogLevel.Info);
} else {
try {
int j = Integer.parseInt(f);
if (j <= list.length) {
j--;
download(list[j]);
writeLog("File " + f + " sucessfully downloaded", LogLevel.Info);
} else {
writeLog("File " + f + " unsucessfully downloaded, wrong number", LogLevel.Error);
}
} catch (NumberFormatException e) {
writeLog("File " + f + " unsucessfully downloaded, wrong number", LogLevel.Error);
}
}
} catch (EmptyDirectory e) {

2
src/clientP2P/ClientP2P.java
View File

@ -67,7 +67,7 @@ public class ClientP2P {
System.out.println("usage :");
System.out.println("\tjava clientP2P.ClientP2P");
System.out.println("or");
System.out.println("java clientP2P.ClientP2P -- " +
System.out.println("\tjava clientP2P.ClientP2P -- " +
"<clientTransportProtocol> " +
"<integratedServerHOSTNAME> <integratedServerPORT> " +
"<trackerHOSTNAME> <trackerPORT> ");