Merge pull request #69 from ploiu/storage-ui

main - show storage used on title bar

Author: ploiu

.idea/workspace.xml

@@ -4,6 +4,7 @@
 import io.reactivex.rxjava3.core.Single;
 import ploiu.model.ApiInfo;
 import ploiu.model.CreatePasswordRequest;
+import ploiu.model.StorageInfo;
 import retrofit2.http.Body;
 import retrofit2.http.GET;
 import retrofit2.http.POST;
@@ -15,4 +16,7 @@ public interface ApiClient {
 
     @POST("/password")
     Completable setPassword(@Body CreatePasswordRequest req);
+
+    @GET("/api/disk")
+    Single<StorageInfo> getStorageInfo();
 }

src/main/java/ploiu/client/ApiClient.java

@@ -0,0 +1,7 @@
+package ploiu.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record StorageInfo(long totalSpace, long freeSpace) {
+}

src/main/java/ploiu/model/StorageInfo.java

@@ -158,7 +158,7 @@ enum Modes {
         /**
          * the default mode, set whenever we encounter a space and are either in "FILE_NAME", "ATTRIBUTE_VALUE", or "TAG_NAME"
          */
-        UNSET;
+        UNSET
     }
 
     record TokenAndMode(Token token, Modes mode) {

src/main/java/ploiu/search/SearchParser.java

@@ -33,5 +33,5 @@ public enum TokenTypes {
     /**
      * catch-all
      */
-    UNKNOWN;
+    UNKNOWN
 }

src/main/java/ploiu/search/TokenTypes.java

@@ -11,6 +11,7 @@
 import ploiu.config.ServerConfig;
 import ploiu.model.ApiInfo;
 import ploiu.model.CreatePasswordRequest;
+import ploiu.util.UIUtils;
 
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = @Inject)
@@ -48,4 +49,17 @@ public Single<Boolean> isCompatibleWithServer() {
                 })
                 .doOnError(e -> log.error("Failed to check server version", e));
     }
+
+    /**
+     * retrieves the used storage on the backend server and parses it as a human-readable format
+     *
+     * @return human readable format for how much storage has been used (e.g. "30gb / 1tb used")
+     */
+    public Single<String> getStorageUsed() {
+        return client
+                .getStorageInfo()
+                .observeOn(Schedulers.io())
+                .subscribeOn(Schedulers.io())
+                .map(info -> String.format("%s / %s used", UIUtils.convertSizeToBytes(info.totalSpace() - info.freeSpace()), UIUtils.convertSizeToBytes(info.totalSpace())));
+    }
 }

src/main/java/ploiu/service/ApiService.java

@@ -30,7 +30,7 @@ public void start(Stage stage) {
                     if (value) {
                         var root = new MainFrame();
                         Scene scene = new Scene(root);
-                        stage.setTitle("File Server UI");
+                        stage.setTitle("Ploiu File Server");
                         stage.setScene(scene);
                         stage.show();
                     } else {

src/main/java/ploiu/ui/App.java

@@ -13,6 +13,7 @@
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.TilePane;
+import javafx.stage.Stage;
 import lombok.extern.slf4j.Slf4j;
 import org.pdfsam.rxjavafx.schedulers.JavaFxScheduler;
 import ploiu.event.AsyncEventReceiver;
@@ -24,6 +25,7 @@
 import ploiu.exception.BadFileRequestException;
 import ploiu.exception.BadFileResponseException;
 import ploiu.model.*;
+import ploiu.service.ApiService;
 import ploiu.service.DragNDropService;
 import ploiu.service.FileService;
 import ploiu.service.FolderService;
@@ -41,6 +43,7 @@
 public class MainFrame extends AnchorPane {
     private final FolderService folderService = App.INJECTOR.getInstance(FolderService.class);
     private final FileService fileService = App.INJECTOR.getInstance(FileService.class);
+    private final ApiService apiService = App.INJECTOR.getInstance(ApiService.class);
     private final DragNDropService dragNDropService = App.INJECTOR.getInstance(DragNDropService.class);
     @FXML
     private ScrollPane scrollPane;
@@ -94,7 +97,9 @@ public class MainFrame extends AnchorPane {
     private final AsyncEventReceiver<FolderApi> asyncFolderUpdateEvent = event -> {
         if (event instanceof FolderUpdateEvent fe) {
             var folder = fe.get();
-            return folderService.updateFolder(new FolderRequest(Optional.of(folder.id()), folder.parentId(), folder.name(), folder.tags())).doOnSuccess(ignored -> asyncLoadFolder(currentFolder)).map(ignored -> true);
+            return folderService.updateFolder(new FolderRequest(Optional.of(folder.id()), folder.parentId(), folder.name(), folder.tags()))
+                    .doOnSuccess(ignored -> asyncLoadFolder(currentFolder))
+                    .map(ignored -> true);
         } else {
             return Single.error(new UnsupportedOperationException("Only type UPDATE is supported for updateFolderEvent"));
         }
@@ -263,15 +268,36 @@ private void loadInitialFolder() {
 
     private void asyncLoadFolder(FolderApi folder) {
         // pull the folder
-        var folderReq = folderService.getFolder(folder.id()).doOnSuccess(this::setCurrentFolder).doOnError(e -> showErrorDialog(e.getMessage(), "Failed to pull folder", null)).observeOn(JavaFxScheduler.platform()).toObservable().cache();
+        var folderReq = folderService.getFolder(folder.id())
+                .doOnSuccess(this::setCurrentFolder)
+                .doOnError(e -> showErrorDialog(e.getMessage(), "Failed to pull folder", null))
+                .observeOn(JavaFxScheduler.platform())
+                .toObservable()
+                .cache();
         // handle child folders
-        folderReq.doOnNext(ignored -> folderPane.getChildren().clear()).flatMapIterable(FolderApi::folders).map(this::createFolderEntry).toList().doOnSuccess(this.folderPane.getChildren()::addAll).subscribe(ignored -> drawAddFolder());
+        folderReq.doOnNext(ignored -> folderPane.getChildren().clear())
+                .flatMapIterable(FolderApi::folders)
+                .map(this::createFolderEntry)
+                .toList()
+                .doOnSuccess(this.folderPane.getChildren()::addAll)
+                .subscribe(ignored -> drawAddFolder());
 
         // handle child files
         folderReq.doOnNext(f -> {
-            loadFilePreviews(f);
-            filePane.getChildren().clear();
-        }).flatMapIterable(FolderApi::files).map(this::createFileEntry).toList().doOnSuccess(filePane.getChildren()::addAll).subscribe(ignored -> drawAddFile());
+                    loadFilePreviews(f);
+                    filePane.getChildren().clear();
+                })
+                .flatMapIterable(FolderApi::files)
+                .map(this::createFileEntry)
+                .toList()
+                .doOnSuccess(filePane.getChildren()::addAll)
+                .subscribe(ignored -> drawAddFile());
+        // pulling the folder was probably after an update or change of some sort, so update the title to reflect how much storage is next
+        apiService.getStorageUsed()
+                .subscribe(
+                        storageAmount -> Platform.runLater(() -> ((Stage) getScene().getWindow()).setTitle("Ploiu File Server " + storageAmount)),
+                        error -> log.error("Failed to pull storage amount", error)
+                );
     }
 
     private void loadFilePreviews(FolderApi folder) {

src/main/java/ploiu/ui/MainFrame.java

@@ -87,7 +87,7 @@ void testSaveAsChosenDirectory(FxRobot robot) {
 
         verify(fileReceiver).process(argThat(it -> {
             if (it instanceof FileSaveEvent evt) {
-                return it.get().equals(fileEntry.getFile()) && ((FileSaveEvent) it).getDirectory() != null;
+                return it.get().equals(fileEntry.getFile()) && evt.getDirectory() != null;
             } else {
                 return false;
             }