From 08e9bfbdfe408b721be74e4712aeb35f43d07c8d Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Sat, 21 Apr 2018 16:48:56 +0530 Subject: [PATCH 1/9] Added Changes --- src/main/java/bishakh/psync/Discoverer.java | 32 ++++++++++++++++- src/main/java/bishakh/psync/SyncService.java | 38 ++++++++++++++++---- 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/src/main/java/bishakh/psync/Discoverer.java b/src/main/java/bishakh/psync/Discoverer.java index 15ba2fa..425c61c 100644 --- a/src/main/java/bishakh/psync/Discoverer.java +++ b/src/main/java/bishakh/psync/Discoverer.java @@ -9,6 +9,12 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; +import java.io.*; +import java.net.*; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; /** @@ -16,10 +22,13 @@ */ public class Discoverer { + HashMapmp = new HashMap<>(); /* Store contact information */ + String BROADCAST_IP; int PORT; String PEER_ID; Logger logger; + File file; /* File attribute added */ final Thread[] thread = new Thread[3]; final BroadcastThread broadcastThread; final ListenThread listenThread; @@ -31,11 +40,12 @@ public class Discoverer { public volatile ConcurrentHashMap> priorityPeerList; public volatile ConcurrentHashMap> originalPeerList; - public Discoverer(String BROADCAST_IP, String PEER_ID, int PORT, Logger LoggerObj) { + public Discoverer(String BROADCAST_IP, String PEER_ID, int PORT, Logger LoggerObj,File ffile) { this.BROADCAST_IP = BROADCAST_IP; this.PORT = PORT; this.PEER_ID = PEER_ID; this.logger = LoggerObj; + this.file = ffile; /*file is assigned*/ // Initialize priorities (lower int = higher priority) // The peers whose ID starts with these keywords will have the priority @@ -287,6 +297,26 @@ public void run() { if(willUpdatePeer) { String peerID = new String(datagramPacket.getData(), 0, datagramPacket.getLength()); updatePeers(datagramPacket.getAddress().getHostAddress(), peerID); + /////////Added code + + + DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss"); + Calendar cal = Calendar.getInstance(); + String timeStamp = dateFormat.format(cal.getTime()); + mp.put(peerID, timeStamp); + FileWriter fileWriter = new FileWriter(file.getAbsoluteFile(), true); + BufferedWriter bufferedWriter = new BufferedWriter(fileWriter); + PrintWriter printWriter = new PrintWriter(bufferedWriter); + PrintWriter writer = new PrintWriter(file); + writer.print(""); + writer.close(); + for(Map.Entry m:mp.entrySet()) + { + //System.out.println(m.getKey()+" "+m.getValue()); + printWriter.println(m.getKey()+" "+m.getValue()); + } + printWriter.close(); + /////////////////////////////////////////////////////////////////////// } } // end of while }catch (UnknownHostException e){ diff --git a/src/main/java/bishakh/psync/SyncService.java b/src/main/java/bishakh/psync/SyncService.java index 9920fb5..89a47b3 100644 --- a/src/main/java/bishakh/psync/SyncService.java +++ b/src/main/java/bishakh/psync/SyncService.java @@ -17,6 +17,7 @@ public class SyncService { private static String mapFileServerDirectory = "/home/alarm/DMS/"; private static String databaseAndLogDirectory = "/home/alarm/DMS/"; private static String databaseName = "fileDB.txt"; + private static String contactFile = "contact.txt"; public Logger logger; public WebServer webServer; @@ -24,14 +25,17 @@ public class SyncService { public FileManager fileManager; public FileTransporter fileTransporter; public Controller controller; + public File nfile; public SyncService() { + File nfile =new File(contactFile); logger = new Logger(databaseAndLogDirectory, PEER_ID); - discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger); + discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,nfile); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, 2, true); webServer = new WebServer(8080, controller, logger); + } @@ -40,9 +44,9 @@ public SyncService(String inputPeerId, String baseDirectory) { mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; - + File nfile =new File(contactFile); logger = new Logger(databaseAndLogDirectory, PEER_ID); - discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger); + discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,nfile); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, 2, true); @@ -55,8 +59,9 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; + File nfile =new File(contactFile); logger = new Logger(databaseAndLogDirectory, PEER_ID); - discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger); + discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,nfile); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, priorityMethod, true); @@ -68,18 +73,37 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; - + File nfile =new File(contactFile); logger = new Logger(databaseAndLogDirectory, PEER_ID); - discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger); + discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,nfile); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, priorityMethod, restrictedEpidemicFlag); webServer = new WebServer(8080, controller, logger); + } public void start(){ + + + FileReader fileReader = new FileReader(nfile); + BufferedReader bufferedReader = new BufferedReader(fileReader); + try { + String line =bufferedReader.readLine(); + while(line!=null) + { + String[] one=line.split(" ",100); /// here length of PEER_ID is restricted + discoverer.mp.put(one[0],one[1]); + line=bufferedReader.readLine(); + } + } catch (IOException e) { + e.printStackTrace(); + } + PrintWriter writer = new PrintWriter(file); + writer.print(""); + writer.close(); discoverer.startDiscoverer(); fileManager.startFileManager(); controller.startController(); @@ -147,6 +171,8 @@ public void uncaughtException(Thread t, Throwable e) { } } }); + + } } From 5c3622ecdfab299a650a3f4d08f176d8ce2c1fa5 Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Sat, 21 Apr 2018 16:52:19 +0530 Subject: [PATCH 2/9] Added changes --- src/main/java/bishakh/psync/SyncService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/bishakh/psync/SyncService.java b/src/main/java/bishakh/psync/SyncService.java index 89a47b3..bb26c7a 100644 --- a/src/main/java/bishakh/psync/SyncService.java +++ b/src/main/java/bishakh/psync/SyncService.java @@ -4,6 +4,12 @@ import java.io.*; import java.text.SimpleDateFormat; import java.util.Calendar; +import java.io.*; +import java.net.*; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; public class SyncService { From 7740ea9c27c80717d2af96a822b084d1dfeb7290 Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Sat, 21 Apr 2018 16:54:10 +0530 Subject: [PATCH 3/9] Added Changes --- src/main/java/bishakh/psync/SyncService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/bishakh/psync/SyncService.java b/src/main/java/bishakh/psync/SyncService.java index bb26c7a..3a0894e 100644 --- a/src/main/java/bishakh/psync/SyncService.java +++ b/src/main/java/bishakh/psync/SyncService.java @@ -107,7 +107,7 @@ public void start(){ } catch (IOException e) { e.printStackTrace(); } - PrintWriter writer = new PrintWriter(file); + PrintWriter writer = new PrintWriter(nfile); writer.print(""); writer.close(); discoverer.startDiscoverer(); From 08ab4ff3b689bc47c8c1cb09f487af84834518a1 Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Sat, 21 Apr 2018 17:27:44 +0530 Subject: [PATCH 4/9] New Changes --- psyncPC.iml | 11 +++++++---- src/main/java/bishakh/psync/Discoverer.java | 2 +- src/main/java/bishakh/psync/SyncService.java | 11 +++-------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/psyncPC.iml b/psyncPC.iml index e9ee694..0080e24 100644 --- a/psyncPC.iml +++ b/psyncPC.iml @@ -1,13 +1,16 @@ - - - + + + + + + - + \ No newline at end of file diff --git a/src/main/java/bishakh/psync/Discoverer.java b/src/main/java/bishakh/psync/Discoverer.java index 425c61c..bf0b4f1 100644 --- a/src/main/java/bishakh/psync/Discoverer.java +++ b/src/main/java/bishakh/psync/Discoverer.java @@ -316,7 +316,7 @@ public void run() { printWriter.println(m.getKey()+" "+m.getValue()); } printWriter.close(); - /////////////////////////////////////////////////////////////////////// + //////////// } } // end of while }catch (UnknownHostException e){ diff --git a/src/main/java/bishakh/psync/SyncService.java b/src/main/java/bishakh/psync/SyncService.java index 3a0894e..4563423 100644 --- a/src/main/java/bishakh/psync/SyncService.java +++ b/src/main/java/bishakh/psync/SyncService.java @@ -4,12 +4,7 @@ import java.io.*; import java.text.SimpleDateFormat; import java.util.Calendar; -import java.io.*; -import java.net.*; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; + public class SyncService { @@ -91,7 +86,7 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, - public void start(){ + public void start() throws FileNotFoundException { FileReader fileReader = new FileReader(nfile); @@ -127,7 +122,7 @@ public void stop() { webServer.stop(); } - public static void main(final String[] args) { + public static void main(final String[] args) throws FileNotFoundException { System.out.println(args.length); if(args.length < 2){ SyncService s = new SyncService(); From a78a0743f4eb380cada24a6e3e90e903128e837a Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Sat, 21 Apr 2018 21:37:03 +0530 Subject: [PATCH 5/9] Changed Including Contact --- src/main/java/bishakh/psync/Controller.java | 2 +- src/main/java/bishakh/psync/Discoverer.java | 43 +++++++++++- .../java/bishakh/psync/FileTransporter.java | 2 +- src/main/java/bishakh/psync/SyncService.java | 65 ++++++++----------- 4 files changed, 69 insertions(+), 43 deletions(-) diff --git a/src/main/java/bishakh/psync/Controller.java b/src/main/java/bishakh/psync/Controller.java index e1c7244..9411759 100644 --- a/src/main/java/bishakh/psync/Controller.java +++ b/src/main/java/bishakh/psync/Controller.java @@ -413,7 +413,7 @@ public void run() { } else{ try { - new Thread(fileTransporter.new ListFetcher(controller, new URL("http://"+s+":8080/list"), s)).start(); + new Thread(fileTransporter.new ListFetcher(controller, new URL("http://"+s+":5345/list"), s)).start(); } catch (MalformedURLException e) { e.printStackTrace(); } diff --git a/src/main/java/bishakh/psync/Discoverer.java b/src/main/java/bishakh/psync/Discoverer.java index bf0b4f1..2595b32 100644 --- a/src/main/java/bishakh/psync/Discoverer.java +++ b/src/main/java/bishakh/psync/Discoverer.java @@ -1,5 +1,6 @@ package bishakh.psync; +import javax.swing.plaf.basic.BasicInternalFrameTitlePane; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; @@ -25,6 +26,10 @@ public class Discoverer { HashMapmp = new HashMap<>(); /* Store contact information */ String BROADCAST_IP; + final String DATABASE_NAME; + final String DATABASE_PATH; + + int PORT; String PEER_ID; Logger logger; @@ -40,12 +45,26 @@ public class Discoverer { public volatile ConcurrentHashMap> priorityPeerList; public volatile ConcurrentHashMap> originalPeerList; - public Discoverer(String BROADCAST_IP, String PEER_ID, int PORT, Logger LoggerObj,File ffile) { + public Discoverer(String BROADCAST_IP, String PEER_ID, int PORT, Logger LoggerObj,String fileName,String databaseDirectory ) throws IOException { this.BROADCAST_IP = BROADCAST_IP; this.PORT = PORT; this.PEER_ID = PEER_ID; this.logger = LoggerObj; - this.file = ffile; /*file is assigned*/ + this.DATABASE_NAME = fileName; + this.DATABASE_PATH = databaseDirectory+DATABASE_NAME; + this.file = new File(DATABASE_PATH); + + if(file.exists()) + { + System.out.println("File exists"); + } + else + { + System.out.println("File not there"); + file.createNewFile(); + System.out.println("File is created"); + } + // Initialize priorities (lower int = higher priority) // The peers whose ID starts with these keywords will have the priority @@ -68,6 +87,7 @@ public Discoverer(String BROADCAST_IP, String PEER_ID, int PORT, Logger LoggerOb thread[0] = new Thread(broadcastThread); thread[1] = new Thread(listenThread); thread[2] = new Thread(peerExpiryThread); + } public void startBroadcast(){ @@ -123,7 +143,23 @@ public void stopPeerExpiry() { } } - public void startDiscoverer(){ + public void startDiscoverer() throws FileNotFoundException { + FileReader fileReader = new FileReader(file); + BufferedReader bufferedReader = new BufferedReader(fileReader); + try { + String line =bufferedReader.readLine(); + while(line!=null) + { + String[] one=line.split(" ",100); /// here length of PEER_ID is restricted + mp.put(one[0],one[1]); + line=bufferedReader.readLine(); + } + } catch (IOException e) { + e.printStackTrace(); + } + PrintWriter writer = new PrintWriter(file); + writer.print(""); + writer.close(); startBroadcast(); startListener(); startPeerExpiry(); @@ -412,4 +448,5 @@ public void stop() { } + } \ No newline at end of file diff --git a/src/main/java/bishakh/psync/FileTransporter.java b/src/main/java/bishakh/psync/FileTransporter.java index abcaca8..96c67cf 100644 --- a/src/main/java/bishakh/psync/FileTransporter.java +++ b/src/main/java/bishakh/psync/FileTransporter.java @@ -33,7 +33,7 @@ public void downloadFile(String fileID, String fileName, String filePath, String if(!parent.exists() && !parent.mkdirs()){ throw new IllegalStateException("Couldn't create dir: " + parent); } - URL fileUrl = new URL("http://"+ peerIP +":8080/getFile/" + fileID); + URL fileUrl = new URL("http://"+ peerIP +":5345/getFile/" + fileID); ResumeDownloadThread resumeDownloadThread = new ResumeDownloadThread(fileUrl , fileID, fileName, f, startByte, endByte, fileSize, peerID); Thread t = new Thread(resumeDownloadThread); ongoingDownloadThreads.put(t, resumeDownloadThread); diff --git a/src/main/java/bishakh/psync/SyncService.java b/src/main/java/bishakh/psync/SyncService.java index 4563423..edd6261 100644 --- a/src/main/java/bishakh/psync/SyncService.java +++ b/src/main/java/bishakh/psync/SyncService.java @@ -18,7 +18,8 @@ public class SyncService { private static String mapFileServerDirectory = "/home/alarm/DMS/"; private static String databaseAndLogDirectory = "/home/alarm/DMS/"; private static String databaseName = "fileDB.txt"; - private static String contactFile = "contact.txt"; + private static String contactName ="contact.txt"; + public Logger logger; public WebServer webServer; @@ -26,61 +27,64 @@ public class SyncService { public FileManager fileManager; public FileTransporter fileTransporter; public Controller controller; - public File nfile; + + + public SyncService() throws IOException { - public SyncService() { - File nfile =new File(contactFile); + //System.exit(0); logger = new Logger(databaseAndLogDirectory, PEER_ID); - discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,nfile); + discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,contactName,databaseAndLogDirectory); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, 2, true); - webServer = new WebServer(8080, controller, logger); + webServer = new WebServer(5345, controller, logger); } - public SyncService(String inputPeerId, String baseDirectory) { - syncDirectory = baseDirectory + File.separator + "sync" + File.separator; + public SyncService(String inputPeerId, String baseDirectory) throws IOException { + syncDirectory = baseDirectory + "sync" + "/"; mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; - File nfile =new File(contactFile); + + //System.exit(0); logger = new Logger(databaseAndLogDirectory, PEER_ID); - discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,nfile); + discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,contactName,databaseAndLogDirectory); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, 2, true); - webServer = new WebServer(8080, controller, logger); + webServer = new WebServer(5345, controller, logger); } - public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) { - syncDirectory = baseDirectory + File.separator + "sync" + File.separator; + public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) throws IOException { + syncDirectory = baseDirectory +"sync" + "/"; mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; - File nfile =new File(contactFile); + //System.exit(0); logger = new Logger(databaseAndLogDirectory, PEER_ID); - discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,nfile); + discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,contactName,databaseAndLogDirectory); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, priorityMethod, true); - webServer = new WebServer(8080, controller, logger); + webServer = new WebServer(5345, controller, logger); } - public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, boolean restrictedEpidemicFlag) { - syncDirectory = baseDirectory + File.separator + "sync" + File.separator; + public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, boolean restrictedEpidemicFlag) throws IOException { + + //System.exit(0); + syncDirectory = baseDirectory + "sync" + "/"; mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; - File nfile =new File(contactFile); logger = new Logger(databaseAndLogDirectory, PEER_ID); - discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,nfile); + discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,contactName,databaseAndLogDirectory); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, priorityMethod, restrictedEpidemicFlag); - webServer = new WebServer(8080, controller, logger); + webServer = new WebServer(5345, controller, logger); } @@ -89,22 +93,7 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, public void start() throws FileNotFoundException { - FileReader fileReader = new FileReader(nfile); - BufferedReader bufferedReader = new BufferedReader(fileReader); - try { - String line =bufferedReader.readLine(); - while(line!=null) - { - String[] one=line.split(" ",100); /// here length of PEER_ID is restricted - discoverer.mp.put(one[0],one[1]); - line=bufferedReader.readLine(); - } - } catch (IOException e) { - e.printStackTrace(); - } - PrintWriter writer = new PrintWriter(nfile); - writer.print(""); - writer.close(); + discoverer.startDiscoverer(); fileManager.startFileManager(); controller.startController(); @@ -122,7 +111,7 @@ public void stop() { webServer.stop(); } - public static void main(final String[] args) throws FileNotFoundException { + public static void main(final String[] args) throws IOException { System.out.println(args.length); if(args.length < 2){ SyncService s = new SyncService(); From 83b9d1e3c70070ef1f8479c9a29c0b12d1f66144 Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Sat, 21 Apr 2018 23:15:14 +0530 Subject: [PATCH 6/9] Changes are done --- src/main/java/bishakh/psync/Controller.java | 2 +- src/main/java/bishakh/psync/Discoverer.java | 3 --- src/main/java/bishakh/psync/FileTransporter.java | 2 +- src/main/java/bishakh/psync/SyncService.java | 10 +++++----- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/bishakh/psync/Controller.java b/src/main/java/bishakh/psync/Controller.java index 9411759..e1c7244 100644 --- a/src/main/java/bishakh/psync/Controller.java +++ b/src/main/java/bishakh/psync/Controller.java @@ -413,7 +413,7 @@ public void run() { } else{ try { - new Thread(fileTransporter.new ListFetcher(controller, new URL("http://"+s+":5345/list"), s)).start(); + new Thread(fileTransporter.new ListFetcher(controller, new URL("http://"+s+":8080/list"), s)).start(); } catch (MalformedURLException e) { e.printStackTrace(); } diff --git a/src/main/java/bishakh/psync/Discoverer.java b/src/main/java/bishakh/psync/Discoverer.java index 2595b32..942779c 100644 --- a/src/main/java/bishakh/psync/Discoverer.java +++ b/src/main/java/bishakh/psync/Discoverer.java @@ -1,6 +1,5 @@ package bishakh.psync; -import javax.swing.plaf.basic.BasicInternalFrameTitlePane; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; @@ -11,11 +10,9 @@ import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; import java.io.*; -import java.net.*; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; /** diff --git a/src/main/java/bishakh/psync/FileTransporter.java b/src/main/java/bishakh/psync/FileTransporter.java index 96c67cf..abcaca8 100644 --- a/src/main/java/bishakh/psync/FileTransporter.java +++ b/src/main/java/bishakh/psync/FileTransporter.java @@ -33,7 +33,7 @@ public void downloadFile(String fileID, String fileName, String filePath, String if(!parent.exists() && !parent.mkdirs()){ throw new IllegalStateException("Couldn't create dir: " + parent); } - URL fileUrl = new URL("http://"+ peerIP +":5345/getFile/" + fileID); + URL fileUrl = new URL("http://"+ peerIP +":8080/getFile/" + fileID); ResumeDownloadThread resumeDownloadThread = new ResumeDownloadThread(fileUrl , fileID, fileName, f, startByte, endByte, fileSize, peerID); Thread t = new Thread(resumeDownloadThread); ongoingDownloadThreads.put(t, resumeDownloadThread); diff --git a/src/main/java/bishakh/psync/SyncService.java b/src/main/java/bishakh/psync/SyncService.java index edd6261..9672045 100644 --- a/src/main/java/bishakh/psync/SyncService.java +++ b/src/main/java/bishakh/psync/SyncService.java @@ -18,7 +18,7 @@ public class SyncService { private static String mapFileServerDirectory = "/home/alarm/DMS/"; private static String databaseAndLogDirectory = "/home/alarm/DMS/"; private static String databaseName = "fileDB.txt"; - private static String contactName ="contact.txt"; + private static String contactName ="contactHistoryFile.txt"; public Logger logger; @@ -37,7 +37,7 @@ public SyncService() throws IOException { fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, 2, true); - webServer = new WebServer(5345, controller, logger); + webServer = new WebServer(8080, controller, logger); } @@ -54,7 +54,7 @@ public SyncService(String inputPeerId, String baseDirectory) throws IOException fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, 2, true); - webServer = new WebServer(5345, controller, logger); + webServer = new WebServer(8080, controller, logger); } public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) throws IOException { @@ -69,7 +69,7 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, priorityMethod, true); - webServer = new WebServer(5345, controller, logger); + webServer = new WebServer(8080, controller, logger); } public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, boolean restrictedEpidemicFlag) throws IOException { @@ -84,7 +84,7 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); fileTransporter = new FileTransporter(syncDirectory, logger); controller = new Controller(discoverer, fileManager, fileTransporter, syncInterval, maxRunningDownloads, logger, priorityMethod, restrictedEpidemicFlag); - webServer = new WebServer(5345, controller, logger); + webServer = new WebServer(8080, controller, logger); } From 8f11c647aff0e36192df1ebd902a7f796875d6c2 Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Sun, 22 Apr 2018 10:27:42 +0530 Subject: [PATCH 7/9] Unnecessary comments are removed --- src/main/java/bishakh/psync/Discoverer.java | 20 ++++++++++---------- src/main/java/bishakh/psync/SyncService.java | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/bishakh/psync/Discoverer.java b/src/main/java/bishakh/psync/Discoverer.java index 942779c..16fd556 100644 --- a/src/main/java/bishakh/psync/Discoverer.java +++ b/src/main/java/bishakh/psync/Discoverer.java @@ -20,7 +20,7 @@ */ public class Discoverer { - HashMapmp = new HashMap<>(); /* Store contact information */ + HashMapcontactMap = new HashMap<>(); /* Store contact information */ String BROADCAST_IP; final String DATABASE_NAME; @@ -53,13 +53,13 @@ public Discoverer(String BROADCAST_IP, String PEER_ID, int PORT, Logger LoggerOb if(file.exists()) { - System.out.println("File exists"); + } else { - System.out.println("File not there"); + file.createNewFile(); - System.out.println("File is created"); + } @@ -141,6 +141,7 @@ public void stopPeerExpiry() { } public void startDiscoverer() throws FileNotFoundException { + /*when discoverer starts, previous information in contactHistory.txt gets stored in HashMap contactMap*/ FileReader fileReader = new FileReader(file); BufferedReader bufferedReader = new BufferedReader(fileReader); try { @@ -148,7 +149,7 @@ public void startDiscoverer() throws FileNotFoundException { while(line!=null) { String[] one=line.split(" ",100); /// here length of PEER_ID is restricted - mp.put(one[0],one[1]); + contactMap.put(one[0],one[1]); line=bufferedReader.readLine(); } } catch (IOException e) { @@ -330,26 +331,25 @@ public void run() { if(willUpdatePeer) { String peerID = new String(datagramPacket.getData(), 0, datagramPacket.getLength()); updatePeers(datagramPacket.getAddress().getHostAddress(), peerID); - /////////Added code + /* While listening to a device, everytime contactHistory.txt file is updated*/ DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss"); Calendar cal = Calendar.getInstance(); String timeStamp = dateFormat.format(cal.getTime()); - mp.put(peerID, timeStamp); + contactMap.put(peerID, timeStamp); FileWriter fileWriter = new FileWriter(file.getAbsoluteFile(), true); BufferedWriter bufferedWriter = new BufferedWriter(fileWriter); PrintWriter printWriter = new PrintWriter(bufferedWriter); PrintWriter writer = new PrintWriter(file); writer.print(""); writer.close(); - for(Map.Entry m:mp.entrySet()) + for(Map.Entry m:contactMap.entrySet()) { - //System.out.println(m.getKey()+" "+m.getValue()); printWriter.println(m.getKey()+" "+m.getValue()); } printWriter.close(); - //////////// + } } // end of while }catch (UnknownHostException e){ diff --git a/src/main/java/bishakh/psync/SyncService.java b/src/main/java/bishakh/psync/SyncService.java index 9672045..d6e9f2d 100644 --- a/src/main/java/bishakh/psync/SyncService.java +++ b/src/main/java/bishakh/psync/SyncService.java @@ -31,7 +31,7 @@ public class SyncService { public SyncService() throws IOException { - //System.exit(0); + logger = new Logger(databaseAndLogDirectory, PEER_ID); discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,contactName,databaseAndLogDirectory); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); @@ -48,7 +48,7 @@ public SyncService(String inputPeerId, String baseDirectory) throws IOException databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; - //System.exit(0); + logger = new Logger(databaseAndLogDirectory, PEER_ID); discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,contactName,databaseAndLogDirectory); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); @@ -63,7 +63,7 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; - //System.exit(0); + logger = new Logger(databaseAndLogDirectory, PEER_ID); discoverer = new Discoverer(BROADCAST_IP, PEER_ID, PORT, logger,contactName,databaseAndLogDirectory); fileManager = new FileManager(PEER_ID, databaseName, databaseAndLogDirectory, syncDirectory, mapFileServerDirectory, logger); @@ -74,7 +74,7 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, boolean restrictedEpidemicFlag) throws IOException { - //System.exit(0); + syncDirectory = baseDirectory + "sync" + "/"; mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; From c6ae90d2eab10c011556b33641997e945dab8e87 Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Sun, 22 Apr 2018 10:31:04 +0530 Subject: [PATCH 8/9] Update Discoverer.java --- src/main/java/bishakh/psync/Discoverer.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/bishakh/psync/Discoverer.java b/src/main/java/bishakh/psync/Discoverer.java index 16fd556..03128cb 100644 --- a/src/main/java/bishakh/psync/Discoverer.java +++ b/src/main/java/bishakh/psync/Discoverer.java @@ -51,15 +51,9 @@ public Discoverer(String BROADCAST_IP, String PEER_ID, int PORT, Logger LoggerOb this.DATABASE_PATH = databaseDirectory+DATABASE_NAME; this.file = new File(DATABASE_PATH); - if(file.exists()) + if(!file.exists()) { - - } - else - { - - file.createNewFile(); - + file.createNewFile(); } @@ -141,7 +135,7 @@ public void stopPeerExpiry() { } public void startDiscoverer() throws FileNotFoundException { - /*when discoverer starts, previous information in contactHistory.txt gets stored in HashMap contactMap*/ + /*when discoverer starts, previous information in contactHistory.txt gets stored in HashMap "contactMap" */ FileReader fileReader = new FileReader(file); BufferedReader bufferedReader = new BufferedReader(fileReader); try { @@ -446,4 +440,4 @@ public void stop() { -} \ No newline at end of file +} From c34b1c1289a7f964b5ec6ba1b53549fc9155cc34 Mon Sep 17 00:00:00 2001 From: Chandrika Mukherjee Date: Mon, 23 Apr 2018 11:44:06 +0530 Subject: [PATCH 9/9] Update SyncService.java --- src/main/java/bishakh/psync/SyncService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/bishakh/psync/SyncService.java b/src/main/java/bishakh/psync/SyncService.java index d6e9f2d..36413bc 100644 --- a/src/main/java/bishakh/psync/SyncService.java +++ b/src/main/java/bishakh/psync/SyncService.java @@ -43,7 +43,7 @@ public SyncService() throws IOException { public SyncService(String inputPeerId, String baseDirectory) throws IOException { - syncDirectory = baseDirectory + "sync" + "/"; + syncDirectory = baseDirectory + "sync" + File.separator; mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; @@ -58,7 +58,7 @@ public SyncService(String inputPeerId, String baseDirectory) throws IOException } public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) throws IOException { - syncDirectory = baseDirectory +"sync" + "/"; + syncDirectory = baseDirectory +"sync" + File.separator; mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId; @@ -75,7 +75,7 @@ public SyncService(String inputPeerId, String baseDirectory, int priorityMethod) public SyncService(String inputPeerId, String baseDirectory, int priorityMethod, boolean restrictedEpidemicFlag) throws IOException { - syncDirectory = baseDirectory + "sync" + "/"; + syncDirectory = baseDirectory + "sync" + File.separator; mapFileServerDirectory = baseDirectory; databaseAndLogDirectory = baseDirectory; PEER_ID = inputPeerId;