parent
aae25fbd99
commit
f3591f0af1
@ -128,7 +128,7 @@ public abstract class ClientManagement extends ServeErrors implements Runnable {
|
|||||||
hostList = ((DiscoverResponse)p).getHostList();
|
hostList = ((DiscoverResponse)p).getHostList();
|
||||||
}
|
}
|
||||||
closeTrackerSocket();
|
closeTrackerSocket();
|
||||||
} catch (SocketClosed e){
|
} catch (SocketClosed e) {
|
||||||
writeLog("listDirectory : SocketClosed", LogLevel.Error);
|
writeLog("listDirectory : SocketClosed", LogLevel.Error);
|
||||||
throw new ProtocolError();
|
throw new ProtocolError();
|
||||||
} catch (NotATracker e) {
|
} catch (NotATracker e) {
|
||||||
@ -202,7 +202,7 @@ public abstract class ClientManagement extends ServeErrors implements Runnable {
|
|||||||
} catch (EmptyFile e) {
|
} catch (EmptyFile e) {
|
||||||
writeLog(e, LogLevel.Error);
|
writeLog(e, LogLevel.Error);
|
||||||
throw new ProtocolError();
|
throw new ProtocolError();
|
||||||
} catch (SocketClosed e){
|
} catch (SocketClosed e) {
|
||||||
writeLog("listDirectory : SocketClosed", LogLevel.Error);
|
writeLog("listDirectory : SocketClosed", LogLevel.Error);
|
||||||
throw new ProtocolError();
|
throw new ProtocolError();
|
||||||
} catch (NotATracker e) {
|
} catch (NotATracker e) {
|
||||||
@ -271,33 +271,36 @@ public abstract class ClientManagement extends ServeErrors implements Runnable {
|
|||||||
/** Implementation of Runnable
|
/** Implementation of Runnable
|
||||||
*/
|
*/
|
||||||
public void run() {
|
public void run() {
|
||||||
boolean isrunning = true;
|
boolean isRunning = true;
|
||||||
while (isrunning){
|
while (isRunning) {
|
||||||
try {
|
try {
|
||||||
int i = 1;
|
int i = 1;
|
||||||
String[] list = listDirectory();
|
String[] list = listDirectory();
|
||||||
System.out.println("Files present on the server:");
|
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) {
|
for(String listItem: list) {
|
||||||
System.out.println(i + " : " + listItem);
|
System.out.println(i + ": " + listItem);
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
System.out.println("Type the number associated with the file to download:");
|
System.out.println("Type the number associated with the file to download:");
|
||||||
String f = scanner.nextLine();
|
String f = scanner.nextLine();
|
||||||
if(f.equals("0")){
|
if (f.equals("0")) {
|
||||||
isrunning = false;
|
isRunning = false;
|
||||||
}
|
} else if (f.equals("R") || f.equals("r")) {
|
||||||
else{
|
writeLog("File list refresh.", LogLevel.Info);
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
int j = Integer.parseInt(f);
|
int j = Integer.parseInt(f);
|
||||||
if(j <= list.length){
|
if (j <= list.length) {
|
||||||
j--;
|
j--;
|
||||||
download(list[j]);
|
download(list[j]);
|
||||||
System.out.println("File " + f + " sucessfully downloaded");
|
|
||||||
writeLog("File " + f + " sucessfully downloaded", LogLevel.Info);
|
writeLog("File " + f + " sucessfully downloaded", LogLevel.Info);
|
||||||
|
} else {
|
||||||
|
writeLog("File " + f + " unsucessfully downloaded, wrong number", LogLevel.Error);
|
||||||
}
|
}
|
||||||
else{
|
} catch (NumberFormatException e) {
|
||||||
System.out.println("File " + f + " unsucessfully downloaded, wrong number");
|
writeLog("File " + f + " unsucessfully downloaded, wrong number", LogLevel.Error);
|
||||||
writeLog("File " + f + " unsucessfully downloaded, wrong number", LogLevel.Info);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (EmptyDirectory e) {
|
} catch (EmptyDirectory e) {
|
||||||
|
@ -67,7 +67,7 @@ public class ClientP2P {
|
|||||||
System.out.println("usage :");
|
System.out.println("usage :");
|
||||||
System.out.println("\tjava clientP2P.ClientP2P");
|
System.out.println("\tjava clientP2P.ClientP2P");
|
||||||
System.out.println("or");
|
System.out.println("or");
|
||||||
System.out.println("java clientP2P.ClientP2P -- " +
|
System.out.println("\tjava clientP2P.ClientP2P -- " +
|
||||||
"<clientTransportProtocol> " +
|
"<clientTransportProtocol> " +
|
||||||
"<integratedServerHOSTNAME> <integratedServerPORT> " +
|
"<integratedServerHOSTNAME> <integratedServerPORT> " +
|
||||||
"<trackerHOSTNAME> <trackerPORT> ");
|
"<trackerHOSTNAME> <trackerPORT> ");
|
||||||
|
Loading…
Reference in New Issue
Block a user