From 4a63c91703816812bff19a048d4f64a4c317f339 Mon Sep 17 00:00:00 2001
From: g-mixalowski <mixalowski@bk.ru>
Date: Wed, 18 Mar 2026 17:17:38 +0300
Subject: [PATCH 1/3] commander: test

---
 .../java/commander/CommanderApplication.java  |   1 -
 .../hse/java/commander/MainController.java    | 196 ++++++++++++++++--
 .../hse/java/commander/commander-ui.fxml      |  16 +-
 3 files changed, 186 insertions(+), 27 deletions(-)

diff --git a/commander/src/main/java/hse/java/commander/CommanderApplication.java b/commander/src/main/java/hse/java/commander/CommanderApplication.java
index 471f6fd5..d5928f87 100644
--- a/commander/src/main/java/hse/java/commander/CommanderApplication.java
+++ b/commander/src/main/java/hse/java/commander/CommanderApplication.java
@@ -21,6 +21,5 @@ public void start(Stage stage) throws IOException {
         stage.setTitle("Commander");
         stage.setScene(scene);
         stage.show();
-        System.out.println("Hello world");
     }
 }
diff --git a/commander/src/main/java/hse/java/commander/MainController.java b/commander/src/main/java/hse/java/commander/MainController.java
index 5de3b66d..bd641a1a 100644
--- a/commander/src/main/java/hse/java/commander/MainController.java
+++ b/commander/src/main/java/hse/java/commander/MainController.java
@@ -1,45 +1,203 @@
 package hse.java.commander;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ListView;
+import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.MouseButton;
 
-import java.nio.file.Path;
+import java.io.IOException;
+import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.stream.Collectors;
 
 public class MainController {
 
     @FXML
-    public ListView<String> left;
+    public ListView<Path> left;
 
     @FXML
-    public ListView<String> right;
+    public ListView<Path> right;
 
+    @FXML
+    public Button leftBack;
+
+    @FXML
+    public Button rightBack;
+
+    
     @FXML
     public Button move;
 
-    private Path leftDir;
-    private Path rightDir;
+    private Path leftCurPath;
+    private Path rightCurPath;
 
-    // for testing
+    private boolean leftSelected;
+    
     public void setInitialDirs(Path leftStart, Path rightStart) {
-        this.leftDir = leftStart;
-        this.rightDir = rightStart;
+        leftCurPath = leftStart;
+        rightCurPath = rightStart;
+        initialize();
     }
 
     public void initialize() {
-        move.setOnMouseClicked(event -> {
+        showPanel(left);
+        showPanel(right);
 
-        });
-        System.out.println(System.getProperty("user.home"));
-        left.getItems().add("Kek");
+        updateLeft();
+        updateRight();
+
+        leftBack.setOnAction(e -> goParent(left));
+        rightBack.setOnAction(e -> goParent(right));
+
+        move.setOnAction(e -> moveSelected());
 
         left.setOnMouseClicked(event -> {
-            if (event.getClickCount() == 2) {
-                int index = left.getSelectionModel().getSelectedIndex();
-                if (index >= 0) {
-                    left.getItems().set(index, "clicked");
+            if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
+                goSelected(left);
+            }
+        });
+        right.setOnMouseClicked(event -> {
+            if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
+                goSelected(right);
+            }
+        });
+
+        left.getSelectionModel().selectedItemProperty().addListener((obs, oldVal, newVal) -> {
+            if (newVal != null) {
+                leftSelected = true;
+                right.getSelectionModel().clearSelection();
+            }
+        });
+        right.getSelectionModel().selectedItemProperty().addListener((obs, oldVal, newVal) -> {
+            if (newVal != null) {
+                leftSelected = false;
+                left.getSelectionModel().clearSelection();
+            }
+        });
+    }
+
+    private void showPanel(ListView<Path> paths) {
+        paths.setCellFactory(lv -> new ListCell<>() {
+            @Override
+            protected void updateItem(Path item, boolean empty) {
+                super.updateItem(item, empty);
+                if (empty || item == null) {
+                    setText(null);
+                } else {
+                    String name = item.getFileName().toString();
+                    if (Files.isDirectory(item)) {
+                        name += "/";
+                    }
+                    setText(name);
                 }
             }
         });
     }
-}
+
+    private void updateLeft() {
+        updatePanel(left, leftCurPath);
+    }
+
+    private void updateRight() {
+        updatePanel(right, rightCurPath);
+    }
+
+    private void updatePanel(ListView<Path> paths, Path dir) {
+        try {
+            ObservableList<Path> items = Files.list(dir).collect(Collectors.toCollection(FXCollections::observableArrayList));
+            paths.setItems(items);
+        } catch(IOException e) {
+            alert("Ошибка (highly likely permission denied)");
+            goParent(paths);
+        }
+    }
+
+    private void goParent(ListView<Path> paths) {
+        Path curPath = (paths == left) ? leftCurPath : rightCurPath;
+        Path parent = curPath.getParent();
+        goFolder(paths, parent);
+    }
+
+    private void goSelected(ListView<Path> paths) {
+        Path selected = paths.getSelectionModel().getSelectedItem();
+        goFolder(paths, selected);
+    }
+
+    private void moveSelected() {
+        Path source = leftSelected ? left.getSelectionModel().getSelectedItem() : right.getSelectionModel().getSelectedItem();
+        Path targetDir = leftSelected ? rightCurPath : leftCurPath;
+
+        if (!Files.isDirectory(targetDir)) {
+            alert("NO DIR HUH");
+            return;
+        }
+
+        Path target = targetDir.resolve(source.getFileName());
+
+        if (target.equals(source)) {
+            return;
+        }
+
+        try {
+            Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
+            updateLeft();
+            updateRight();
+        } catch(IOException e) {
+            try {
+                recCopy(source, target);
+                recDel(source);
+                updateLeft();
+                updateRight();
+            } catch(IOException e2) {
+                alert("CAN't MOVE");
+            }
+        }
+    }
+
+    private void recCopy(Path source, Path target) throws IOException {
+        if (Files.isDirectory(source)) {
+            Files.createDirectories(target);
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(source)) {
+                for (Path entry : stream) {
+                    recCopy(entry, target.resolve(entry.getFileName()));
+                }
+            }
+        } else {
+            Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
+
+    private void recDel(Path path) throws IOException {
+        if (Files.isDirectory(path)) {
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(path)) {
+                for (Path entry : stream) {
+                    recDel(entry);
+                }
+            }
+        }
+        Files.delete(path);
+    }
+
+    private void goFolder(ListView<Path> paths, Path folder) {
+        if (Files.isDirectory(folder)) {
+            if (paths == left) {
+                leftCurPath = folder;
+                updateLeft();
+            } else {
+                rightCurPath = folder;
+                updateRight();
+            }
+        }
+    }
+
+    private void alert(String name) {
+        Alert alert = new Alert(Alert.AlertType.WARNING);
+        alert.setTitle(name);
+        alert.setHeaderText(null);
+        alert.setContentText("https://www.youtube.com/watch?v=dQw4w9WgXcQ");
+        alert.showAndWait();
+    }
+
+}
\ No newline at end of file
diff --git a/commander/src/main/resources/hse/java/commander/commander-ui.fxml b/commander/src/main/resources/hse/java/commander/commander-ui.fxml
index 724bbc8a..5383d44b 100644
--- a/commander/src/main/resources/hse/java/commander/commander-ui.fxml
+++ b/commander/src/main/resources/hse/java/commander/commander-ui.fxml
@@ -5,12 +5,14 @@
 
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="421.0" prefWidth="627.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="hse.java.commander.MainController">
     <HBox prefHeight="370.0" prefWidth="627.0">
-        <ListView fx:id="left" id="left" prefHeight="318.0" prefWidth="311.0" />
-        <ListView fx:id="right" id="right" prefHeight="318.0" prefWidth="321.0" />
-    </HBox>
-    <HBox spacing="10.0">
-        <Button fx:id="copy" mnemonicParsing="false" text="Copy" />
-        <Button fx:id="move" mnemonicParsing="false" text="Move" />
-        <Button fx:id="delete" mnemonicParsing="false" text="Delete" />
+        <VBox prefHeight="318.0" prefWidth="311.0">
+            <Button fx:id="leftBack" text="&lt;-" maxWidth="Infinity" />
+            <ListView fx:id="left" prefHeight="318.0" prefWidth="311.0" />
+        </VBox>
+        <VBox prefHeight="318.0" prefWidth="321.0">
+            <Button fx:id="rightBack" text="&lt;-" maxWidth="Infinity" />
+            <ListView fx:id="right" prefHeight="318.0" prefWidth="321.0" />
+        </VBox>
     </HBox>
+    <Button fx:id="move" mnemonicParsing="false" text="Move" />
 </VBox>

From 95666ce736617d37ef5dd4e22dffbe00738dd3af Mon Sep 17 00:00:00 2001
From: g-mixalowski <mixalowski@bk.ru>
Date: Wed, 18 Mar 2026 17:31:52 +0300
Subject: [PATCH 2/3] commander: fix

---
 .../hse/java/commander/MainController.java    | 261 ++++++++----------
 .../hse/java/commander/commander-ui.fxml      |  30 +-
 2 files changed, 130 insertions(+), 161 deletions(-)

diff --git a/commander/src/main/java/hse/java/commander/MainController.java b/commander/src/main/java/hse/java/commander/MainController.java
index bd641a1a..4af8ec23 100644
--- a/commander/src/main/java/hse/java/commander/MainController.java
+++ b/commander/src/main/java/hse/java/commander/MainController.java
@@ -4,200 +4,157 @@
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
-import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseButton;
+import javafx.util.Callback;
 
 import java.io.IOException;
 import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Comparator;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class MainController {
 
-    @FXML
-    public ListView<Path> left;
+    @FXML private ListView<Path> leftPane;
+    @FXML private ListView<Path> rightPane;
+    @FXML private Label leftPathLabel;
+    @FXML private Label rightPathLabel;
+    @FXML private Button btnCopy;
+    @FXML private Button btnMove;
+    @FXML private Button btnDelete;
 
-    @FXML
-    public ListView<Path> right;
-
-    @FXML
-    public Button leftBack;
-
-    @FXML
-    public Button rightBack;
-
-    
-    @FXML
-    public Button move;
-
-    private Path leftCurPath;
-    private Path rightCurPath;
-
-    private boolean leftSelected;
-    
-    public void setInitialDirs(Path leftStart, Path rightStart) {
-        leftCurPath = leftStart;
-        rightCurPath = rightStart;
-        initialize();
-    }
+    private Path leftDir;
+    private Path rightDir;
+    private ListView<Path> focusedPane;
 
     public void initialize() {
-        showPanel(left);
-        showPanel(right);
-
-        updateLeft();
-        updateRight();
+        if (leftDir == null) leftDir = Paths.get(System.getProperty("user.home"));
+        if (rightDir == null) rightDir = Paths.get(System.getProperty("user.home"));
 
-        leftBack.setOnAction(e -> goParent(left));
-        rightBack.setOnAction(e -> goParent(right));
-
-        move.setOnAction(e -> moveSelected());
-
-        left.setOnMouseClicked(event -> {
-            if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
-                goSelected(left);
-            }
-        });
-        right.setOnMouseClicked(event -> {
-            if (event.getButton() == MouseButton.PRIMARY && event.getClickCount() == 2) {
-                goSelected(right);
-            }
-        });
-
-        left.getSelectionModel().selectedItemProperty().addListener((obs, oldVal, newVal) -> {
-            if (newVal != null) {
-                leftSelected = true;
-                right.getSelectionModel().clearSelection();
-            }
-        });
-        right.getSelectionModel().selectedItemProperty().addListener((obs, oldVal, newVal) -> {
-            if (newVal != null) {
-                leftSelected = false;
-                left.getSelectionModel().clearSelection();
-            }
-        });
-    }
-
-    private void showPanel(ListView<Path> paths) {
-        paths.setCellFactory(lv -> new ListCell<>() {
+        Callback<ListView<Path>, ListCell<Path>> cellFactory = lv -> new ListCell<>() {
             @Override
             protected void updateItem(Path item, boolean empty) {
                 super.updateItem(item, empty);
                 if (empty || item == null) {
                     setText(null);
                 } else {
-                    String name = item.getFileName().toString();
-                    if (Files.isDirectory(item)) {
-                        name += "/";
-                    }
-                    setText(name);
+                    if (item.getFileName() == null) setText(item.toString());
+                    else setText(item.getFileName().toString());
+                    if (Files.isDirectory(item)) setStyle("-fx-font-weight: bold;");
+                    else setStyle("");
                 }
             }
-        });
-    }
+        };
 
-    private void updateLeft() {
-        updatePanel(left, leftCurPath);
-    }
+        leftPane.setCellFactory(cellFactory);
+        rightPane.setCellFactory(cellFactory);
 
-    private void updateRight() {
-        updatePanel(right, rightCurPath);
-    }
+        setupPaneInteraction(leftPane, true);
+        setupPaneInteraction(rightPane, false);
 
-    private void updatePanel(ListView<Path> paths, Path dir) {
-        try {
-            ObservableList<Path> items = Files.list(dir).collect(Collectors.toCollection(FXCollections::observableArrayList));
-            paths.setItems(items);
-        } catch(IOException e) {
-            alert("Ошибка (highly likely permission denied)");
-            goParent(paths);
-        }
+        btnCopy.setOnAction(e -> transferSelected(TransferOp.COPY));
+        btnMove.setOnAction(e -> transferSelected(TransferOp.MOVE));
+        btnDelete.setOnAction(e -> transferSelected(TransferOp.DELETE));
+
+        refreshBoth();
     }
 
-    private void goParent(ListView<Path> paths) {
-        Path curPath = (paths == left) ? leftCurPath : rightCurPath;
-        Path parent = curPath.getParent();
-        goFolder(paths, parent);
+    public void setInitialDirs(Path leftStart, Path rightStart) {
+        if (leftStart != null) leftDir = leftStart;
+        if (rightStart != null) rightDir = rightStart;
+        if (leftPane != null && rightPane != null) refreshBoth();
     }
 
-    private void goSelected(ListView<Path> paths) {
-        Path selected = paths.getSelectionModel().getSelectedItem();
-        goFolder(paths, selected);
+    private void setupPaneInteraction(ListView<Path> pane, boolean isLeft) {
+        pane.setOnMouseClicked(evt -> {
+            focusedPane = pane;
+            if (evt.getButton() == MouseButton.PRIMARY && evt.getClickCount() == 2) {
+                Path sel = pane.getSelectionModel().getSelectedItem();
+                if (sel == null) return;
+
+                Path current = isLeft ? leftDir : rightDir;
+
+                if (sel.equals(current.getParent())) {
+                    if (current.getParent() != null) {
+                        if (isLeft) leftDir = current.getParent();
+                        else rightDir = current.getParent();
+                        refreshBoth();
+                    }
+                    return;
+                }
+
+                if (Files.isDirectory(sel)) {
+                    if (isLeft) leftDir = sel;
+                    else rightDir = sel;
+                    refreshBoth();
+                }
+            }
+        });
     }
 
-    private void moveSelected() {
-        Path source = leftSelected ? left.getSelectionModel().getSelectedItem() : right.getSelectionModel().getSelectedItem();
-        Path targetDir = leftSelected ? rightCurPath : leftCurPath;
+    private enum TransferOp { COPY, MOVE, DELETE }
 
-        if (!Files.isDirectory(targetDir)) {
-            alert("NO DIR HUH");
-            return;
-        }
+    private void transferSelected(TransferOp op) {
+        if (focusedPane == null) return;
+        Path selected = focusedPane.getSelectionModel().getSelectedItem();
+        if (selected == null) return;
 
-        Path target = targetDir.resolve(source.getFileName());
+        Path sourceDir = (focusedPane == leftPane) ? leftDir : rightDir;
+        Path targetDir = (focusedPane == leftPane) ? rightDir : leftDir;
 
-        if (target.equals(source)) {
-            return;
-        }
+        if (selected.equals(sourceDir.getParent())) return;
 
-        try {
-            Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
-            updateLeft();
-            updateRight();
-        } catch(IOException e) {
+        Path src = sourceDir.resolve(selected.getFileName());
+
+        if (op == TransferOp.DELETE) {
             try {
-                recCopy(source, target);
-                recDel(source);
-                updateLeft();
-                updateRight();
-            } catch(IOException e2) {
-                alert("CAN't MOVE");
-            }
+                Files.deleteIfExists(src);
+            } catch (IOException ignored) {}
+            refreshBoth();
+            return;
         }
-    }
 
-    private void recCopy(Path source, Path target) throws IOException {
-        if (Files.isDirectory(source)) {
-            Files.createDirectories(target);
-            try (DirectoryStream<Path> stream = Files.newDirectoryStream(source)) {
-                for (Path entry : stream) {
-                    recCopy(entry, target.resolve(entry.getFileName()));
+        Path dst = targetDir.resolve(selected.getFileName());
+
+        try {
+            if (op == TransferOp.COPY) {
+                if (Files.isDirectory(src)) {
+                    if (!Files.exists(dst)) Files.createDirectories(dst);
+                } else {
+                    Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING);
                 }
+            } else if (op == TransferOp.MOVE) {
+                Files.move(src, dst, StandardCopyOption.REPLACE_EXISTING);
             }
-        } else {
-            Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
-        }
+        } catch (IOException ignored) {}
+
+        refreshBoth();
     }
 
-    private void recDel(Path path) throws IOException {
-        if (Files.isDirectory(path)) {
-            try (DirectoryStream<Path> stream = Files.newDirectoryStream(path)) {
-                for (Path entry : stream) {
-                    recDel(entry);
-                }
-            }
-        }
-        Files.delete(path);
+    private void refreshBoth() {
+        safeRefresh(leftPane, leftDir, leftPathLabel);
+        safeRefresh(rightPane, rightDir, rightPathLabel);
     }
 
-    private void goFolder(ListView<Path> paths, Path folder) {
-        if (Files.isDirectory(folder)) {
-            if (paths == left) {
-                leftCurPath = folder;
-                updateLeft();
-            } else {
-                rightCurPath = folder;
-                updateRight();
-            }
+    private void safeRefresh(ListView<Path> pane, Path dir, Label label) {
+        if (dir == null) {
+            pane.setItems(FXCollections.observableArrayList());
+            if (label != null) label.setText("");
+            return;
         }
-    }
 
-    private void alert(String name) {
-        Alert alert = new Alert(Alert.AlertType.WARNING);
-        alert.setTitle(name);
-        alert.setHeaderText(null);
-        alert.setContentText("https://www.youtube.com/watch?v=dQw4w9WgXcQ");
-        alert.showAndWait();
-    }
+        ObservableList<Path> items = FXCollections.observableArrayList();
+        Path parent = dir.getParent();
+        if (parent != null) items.add(parent);
+
+        try (Stream<Path> stream = Files.list(dir)) {
+            var sorted = stream
+                    .sorted(Comparator.comparing(p -> p.getFileName().toString().toLowerCase()))
+                    .collect(Collectors.toList());
+            items.addAll(sorted);
+        } catch (IOException ignored) {}
 
-}
\ No newline at end of file
+        pane.setItems(items);
+        if (label != null) label.setText(dir.toString());
+    }
+}
diff --git a/commander/src/main/resources/hse/java/commander/commander-ui.fxml b/commander/src/main/resources/hse/java/commander/commander-ui.fxml
index 5383d44b..0d4b6a2f 100644
--- a/commander/src/main/resources/hse/java/commander/commander-ui.fxml
+++ b/commander/src/main/resources/hse/java/commander/commander-ui.fxml
@@ -3,16 +3,28 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="421.0" prefWidth="627.0" xmlns="http://javafx.com/javafx/17.0.12" xmlns:fx="http://javafx.com/fxml/1" fx:controller="hse.java.commander.MainController">
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
+      prefHeight="421.0" prefWidth="627.0"
+      xmlns="http://javafx.com/javafx/17.0.12"
+      xmlns:fx="http://javafx.com/fxml/1"
+      fx:controller="hse.java.commander.FilePanelController">
+
     <HBox prefHeight="370.0" prefWidth="627.0">
-        <VBox prefHeight="318.0" prefWidth="311.0">
-            <Button fx:id="leftBack" text="&lt;-" maxWidth="Infinity" />
-            <ListView fx:id="left" prefHeight="318.0" prefWidth="311.0" />
+        <VBox>
+            <Label fx:id="leftPathLabel"/>
+            <ListView fx:id="leftPane" prefHeight="318.0" prefWidth="311.0"/>
         </VBox>
-        <VBox prefHeight="318.0" prefWidth="321.0">
-            <Button fx:id="rightBack" text="&lt;-" maxWidth="Infinity" />
-            <ListView fx:id="right" prefHeight="318.0" prefWidth="321.0" />
+
+        <VBox>
+            <Label fx:id="rightPathLabel"/>
+            <ListView fx:id="rightPane" prefHeight="318.0" prefWidth="321.0"/>
         </VBox>
     </HBox>
-    <Button fx:id="move" mnemonicParsing="false" text="Move" />
-</VBox>
+
+    <HBox spacing="10.0">
+        <Button fx:id="btnCopy" text="Copy"/>
+        <Button fx:id="btnMove" text="Move"/>
+        <Button fx:id="btnDelete" text="Delete"/>
+    </HBox>
+
+</VBox>
\ No newline at end of file

From 18b2c3226f4014d09a0ba9d401a841bd1bcaf33b Mon Sep 17 00:00:00 2001
From: g-mixalowski <mixalowski@bk.ru>
Date: Wed, 18 Mar 2026 17:36:43 +0300
Subject: [PATCH 3/3] commander: fix

---
 .../src/main/resources/hse/java/commander/commander-ui.fxml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commander/src/main/resources/hse/java/commander/commander-ui.fxml b/commander/src/main/resources/hse/java/commander/commander-ui.fxml
index 0d4b6a2f..e9ee9ab2 100644
--- a/commander/src/main/resources/hse/java/commander/commander-ui.fxml
+++ b/commander/src/main/resources/hse/java/commander/commander-ui.fxml
@@ -7,7 +7,7 @@
       prefHeight="421.0" prefWidth="627.0"
       xmlns="http://javafx.com/javafx/17.0.12"
       xmlns:fx="http://javafx.com/fxml/1"
-      fx:controller="hse.java.commander.FilePanelController">
+      fx:controller="hse.java.commander.MainController">
 
     <HBox prefHeight="370.0" prefWidth="627.0">
         <VBox>