diff --git a/Lab3/src/main/java/org/lumijiez/Main.java b/Lab3/src/main/java/org/lumijiez/Main.java index b7c22c9..aa6e1f9 100644 --- a/Lab3/src/main/java/org/lumijiez/Main.java +++ b/Lab3/src/main/java/org/lumijiez/Main.java @@ -3,9 +3,16 @@ package org.lumijiez; import org.lumijiez.gui.MainFrame; import javax.swing.*; +import java.io.IOException; public class Main { public static void main(String[] args) { - SwingUtilities.invokeLater(() -> new MainFrame().setVisible(true)); + SwingUtilities.invokeLater(() -> { + try { + new MainFrame().setVisible(true); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); } } \ No newline at end of file diff --git a/Lab3/src/main/java/org/lumijiez/gui/MainFrame.java b/Lab3/src/main/java/org/lumijiez/gui/MainFrame.java index 837fc28..0d31c42 100644 --- a/Lab3/src/main/java/org/lumijiez/gui/MainFrame.java +++ b/Lab3/src/main/java/org/lumijiez/gui/MainFrame.java @@ -3,7 +3,10 @@ import org.lumijiez.tracker.TrackerThread; import javax.swing.*; import java.awt.*; +import java.io.File; +import java.io.IOException; import java.nio.file.Path; +import java.util.*; public class MainFrame extends JFrame { private final JScrollPane fileListScrollPane = new JScrollPane(); @@ -19,47 +22,38 @@ public class MainFrame extends JFrame { private final JMenuItem pickFolder = new JMenuItem(); private final JMenu settingsMenu = new JMenu(); private final JMenuItem settings = new JMenuItem(); + private final Map fileContents = new HashMap<>(); + private TrackerThread tracker; - public MainFrame() { + public MainFrame() throws IOException { initComponents(); } private void initComponents() { + mainTextPane.setContentType("text/html"); JFileChooser folderChooser = new JFileChooser(); folderChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - int returnVal = folderChooser.showOpenDialog(this); - if (returnVal == JFileChooser.APPROVE_OPTION) { - System.out.println("Selected folder: " + folderChooser.getSelectedFile().getAbsolutePath()); - TrackerThread tr = new TrackerThread(mainTextPane, Path.of(folderChooser.getSelectedFile().getAbsolutePath())); - tr.start(); - } - setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - fileList.setModel(new AbstractListModel<>() { - final String[] strings = {"Item 1", "Item 2", "Item 3", "Item 4", "Item 5"}; + int returnVal = folderChooser.showOpenDialog(this); + if (returnVal == JFileChooser.APPROVE_OPTION) { + tracker = new TrackerThread(mainTextPane, Path.of(folderChooser.getSelectedFile().getAbsolutePath()), fileContents, fileList); + tracker.start(); + } - public int getSize() { - return strings.length; - } - - public String getElementAt(int i) { - return strings[i]; - } - }); fileList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); fileListScrollPane.setViewportView(fileList); snapshotLabel.setFont(new java.awt.Font("Trebuchet MS", Font.PLAIN, 18)); // NOI18N - snapshotLabel.setText("Last snapshot:"); + snapshotLabel.setText("Last snapshot: " + new Date()); mainScrollPane.setViewportView(mainTextPane); pathLabel.setFont(new java.awt.Font("Trebuchet MS", Font.PLAIN, 18)); // NOI18N - pathLabel.setText("Currently tracking: "); + pathLabel.setText("Currently tracking: " + folderChooser.getSelectedFile().getAbsolutePath()); CommitButton.setText("Commit"); CommitButton.addActionListener(this::CommitButtonActionPerformed); @@ -119,13 +113,14 @@ public class MainFrame extends JFrame { .addComponent(CommitButton) .addPreferredGap(LayoutStyle.ComponentPlacement.RELATED) .addComponent(StatusButton))) - .addContainerGap()) - ); - + .addContainerGap())); pack(); } private void CommitButtonActionPerformed(java.awt.event.ActionEvent evt) { + tracker.reset(); + mainTextPane.setText(""); + snapshotLabel.setText("Last snapshot: " + new Date()); } private void StatusButtonActionPerformed(java.awt.event.ActionEvent evt) { diff --git a/Lab3/src/main/java/org/lumijiez/tracker/TrackerThread.java b/Lab3/src/main/java/org/lumijiez/tracker/TrackerThread.java index c9bd174..b50045b 100644 --- a/Lab3/src/main/java/org/lumijiez/tracker/TrackerThread.java +++ b/Lab3/src/main/java/org/lumijiez/tracker/TrackerThread.java @@ -1,60 +1,100 @@ package org.lumijiez.tracker; +import org.lumijiez.util.DiffType; +import org.lumijiez.util.FileDiffer; +import org.lumijiez.util.StateType; + import javax.swing.*; -import java.io.IOException; +import java.io.File; import java.nio.file.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; public class TrackerThread extends Thread { private final JTextPane textPane; private final Path path; + private Map fileContents; + private final JList fileList; + private final Map fileStates = new HashMap<>(); - public TrackerThread(JTextPane textPane, Path path) { + public TrackerThread(JTextPane textPane, Path path, Map files, JList fileList) { this.textPane = textPane; this.path = path; + this.fileContents = files; + this.fileList = fileList; + init(); } - public void checkDirectory(Path path) { - try { - WatchService watchService = FileSystems.getDefault().newWatchService(); - path.register(watchService, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_MODIFY, StandardWatchEventKinds.ENTRY_DELETE); + public void init() { + System.out.println("Init called"); + fileContents = FileDiffer.crawlDirectory(path); - while (true) { - WatchKey key; - try { - key = watchService.take(); - } catch (InterruptedException e) { - return; - } + ArrayList fileNames = new ArrayList<>(); - for (WatchEvent event : key.pollEvents()) { - WatchEvent.Kind kind = event.kind(); + for (File file : fileContents.keySet()) { + fileNames.add(file.getName()); + } + fileList.setModel(new AbstractListModel<>() { + public int getSize() { + return fileNames.size(); + } + public String getElementAt(int i) { + return fileNames.get(i); + } + }); + } - @SuppressWarnings("unchecked") - WatchEvent ev = (WatchEvent) event; - Path fileName = ev.context(); + public void reset() { + fileStates.clear(); + } - System.out.println(kind.name() + ": " + fileName); + public void checkDirectory() { + Map> result = FileDiffer.diff(fileContents, FileDiffer.crawlDirectory(path)); - if (kind == StandardWatchEventKinds.ENTRY_CREATE) { - textPane.setText(textPane.getText() + " file created\n"); - } else if (kind == StandardWatchEventKinds.ENTRY_MODIFY) { - textPane.setText(textPane.getText() + " file modified\n"); - } else if (kind == StandardWatchEventKinds.ENTRY_DELETE) { - textPane.setText(textPane.getText() + " file deleted\n"); - } - } + StringBuilder toShow = new StringBuilder(); - boolean valid = key.reset(); - if (!valid) { - break; + boolean created = false, deleted = false, modified = false; + if (!result.get(DiffType.CREATE).isEmpty()) { + created = true; + for (File file : result.get(DiffType.CREATE)) { + fileStates.put(file, StateType.NEW); + } + System.out.println("Created"); + } + + if (!result.get(DiffType.DELETE).isEmpty()) { + deleted = true; + for (File file : result.get(DiffType.DELETE)) { + fileStates.put(file, StateType.DELETED); + } + System.out.println("Deleted"); + } + + if (!result.get(DiffType.MODIFY).isEmpty()) { + modified = true; + for (File file : result.get(DiffType.MODIFY)) { + fileStates.put(file, StateType.MODIFIED); + } + System.out.println("Modified"); + } + + if (created || deleted || modified) { + init(); + for (File file : fileStates.keySet()) { + if (fileStates.get(file) != StateType.NONE) { + toShow.append(file.getName()).append(" has been ").append(fileStates.get(file).getName()).append("
"); } } - } catch (IOException e) { - e.printStackTrace(); + textPane.setText(toShow.toString()); } } + @Override public void run() { - checkDirectory(path); + while(this.isAlive()) { + checkDirectory(); + //Thread.sleep(200); + } } } diff --git a/Lab3/src/main/java/org/lumijiez/util/DiffType.java b/Lab3/src/main/java/org/lumijiez/util/DiffType.java new file mode 100644 index 0000000..2be9dfd --- /dev/null +++ b/Lab3/src/main/java/org/lumijiez/util/DiffType.java @@ -0,0 +1,5 @@ +package org.lumijiez.util; + +public enum DiffType { + CREATE, DELETE, MODIFY, NONE +} diff --git a/Lab3/src/main/java/org/lumijiez/util/FileDiffer.java b/Lab3/src/main/java/org/lumijiez/util/FileDiffer.java new file mode 100644 index 0000000..5316fe5 --- /dev/null +++ b/Lab3/src/main/java/org/lumijiez/util/FileDiffer.java @@ -0,0 +1,61 @@ +package org.lumijiez.util; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Stream; + +public class FileDiffer { + public static Map> diff(Map oldFiles, Map newFiles) { + Map> result = new HashMap<>(); + + ArrayList newFileList = new ArrayList<>(); + ArrayList deletedFileList = new ArrayList<>(); + ArrayList modifiedFileList = new ArrayList<>(); + + for (File file : oldFiles.keySet()) { + if (newFiles.get(file) != null) { + if (Arrays.compare(oldFiles.get(file), newFiles.get(file)) != 0) { + modifiedFileList.add(file); + } + } else { + deletedFileList.add(file); + } + } + + for (File file : newFiles.keySet()) { + if (oldFiles.get(file) == null) { + newFileList.add(file); + } + } + + result.put(DiffType.CREATE, newFileList); + result.put(DiffType.DELETE, deletedFileList); + result.put(DiffType.MODIFY, modifiedFileList); + + return result; + } + + public static Map crawlDirectory(Path path) { + Map newFileContents = new HashMap<>(); + try (Stream paths = Files.walk(path)) { + paths.forEach(p -> { + if (Files.isRegularFile(p)) { + try { + newFileContents.put(p.toFile(), Files.readAllBytes(p)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + }); + } catch (IOException e) { + e.printStackTrace(); + } + return newFileContents; + } +} diff --git a/Lab3/src/main/java/org/lumijiez/util/StateType.java b/Lab3/src/main/java/org/lumijiez/util/StateType.java new file mode 100644 index 0000000..66483ab --- /dev/null +++ b/Lab3/src/main/java/org/lumijiez/util/StateType.java @@ -0,0 +1,14 @@ +package org.lumijiez.util; + +public enum StateType { + NEW("Created"), MODIFIED("Modified"), DELETED("Deleted"), NONE("Nothing"); + + private final String name; + StateType(String name) { + this.name = name; + } + + public String getName() { + return this.name; + } +}