Merge pull request #68 from ploiu/download-folder

Ability to download folder as a .tar

Author: ploiu

.idea/workspace.xml

@@ -41,10 +41,7 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-databind:$versions.jackson"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$versions.jackson"
     implementation 'org.jetbrains:annotations:24.0.1'
-    implementation 'com.google.inject:guice:5.1.0'
-    // TODO replace with retrofit (see #39) because apparently I can't properly build a multipart form to save my life
-    implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1'
-    implementation 'org.apache.httpcomponents:httpmime:4.5.14'
+    implementation 'com.google.inject:guice:7.0.0'
     // http client
     implementation 'com.squareup.okhttp3:okhttp:4.12.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'

build.gradle

@@ -14,9 +14,6 @@
     requires javafx.controls;
     requires javafx.media;
     requires org.jetbrains.annotations;
-    // TODO remove these next 2 once we're off of apache http client
-    requires org.apache.httpcomponents.client5.httpclient5;
-    requires org.apache.httpcomponents.core5.httpcore5;
     requires io.reactivex.rxjava3;
     requires org.pdfsam.rxjavafx;
     requires retrofit2;
@@ -34,4 +31,6 @@
     exports ploiu.config;
     exports ploiu.exception;
     exports ploiu.model;
+    exports ploiu.event.file to javafx.fxml, javafx.graphics;
+    exports ploiu.event.folder to javafx.fxml, javafx.graphics;
 }

src/main/java/module-info.java

@@ -28,6 +28,7 @@ public interface FileClient {
     @GET("/files/metadata/{id}")
     Maybe<FileApi> getMetadata(@Path("id") long id);
 
+    @Streaming
     @GET("/files/{id}")
     Single<ResponseBody> getFileContents(@Path("id") long id);
 

src/main/java/ploiu/client/FileClient.java

@@ -1,7 +1,9 @@
 package ploiu.client;
 
 import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Single;
+import okhttp3.ResponseBody;
 import ploiu.model.FolderApi;
 import ploiu.model.FolderRequest;
 import retrofit2.http.*;
@@ -12,6 +14,10 @@ public interface FolderClient {
     @GET("/folders/metadata/{id}")
     Single<FolderApi> getFolder(@Path("id") long id);
 
+    @Streaming
+    @GET("/folders/{id}")
+    Observable<ResponseBody> downloadFolder(@Path("id") long id);
+
     @GET("/folders/preview/{id}")
     Single<Map<Long, byte[]>> getPreviewsForFolder(@Path("id") long id);
 

src/main/java/ploiu/client/FolderClient.java

@@ -1,5 +1,6 @@
-package ploiu.event;
+package ploiu.event.file;
 
+import ploiu.event.Event;
 import ploiu.model.FileObject;
 
 public class FileDeleteEvent extends Event<FileObject> {

src/main/java/ploiu/event/FolderEvent.java

@@ -1,6 +1,7 @@
-package ploiu.event;
+package ploiu.event.file;
 
 import lombok.Getter;
+import ploiu.event.Event;
 import ploiu.model.FileObject;
 
 import java.io.File;

src/main/java/ploiu/event/FileDeleteEvent.java renamed to src/main/java/ploiu/event/file/FileDeleteEvent.java

@@ -1,5 +1,6 @@
-package ploiu.event;
+package ploiu.event.file;
 
+import ploiu.event.Event;
 import ploiu.model.FileObject;
 
 public class FileUpdateEvent extends Event<FileObject> {

src/main/java/ploiu/event/FileSaveEvent.java renamed to src/main/java/ploiu/event/file/FileSaveEvent.java

@@ -1,7 +1,8 @@
-package ploiu.event;
+package ploiu.event.file;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import ploiu.event.Event;
 
 import java.io.File;