include optimised sync client, and required ui code changes

Peergos · Nov 13, 2024 · 64c91f9 · 64c91f9
1 parent 5886ce6
commit 64c91f9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/peergos b/peergos
diff --git a/src/components/sandbox/AppInstall.vue b/src/components/sandbox/AppInstall.vue
@@ -267,7 +267,7 @@ module.exports = {
                                     .thenApply(function(reader) {
                                         filesProcessedCounter++;
                                         let fup = new peergos.shared.user.fs.FileWrapper.FileUploadProperties(fileProps.name, {get_0: () => reader},
-                                            (fileProps.size_0 - (fileProps.size_0 % Math.pow(2, 32))) / Math.pow(2, 32), fileProps.size_0, false,
+                                            (fileProps.size_0 - (fileProps.size_0 % Math.pow(2, 32))) / Math.pow(2, 32), fileProps.size_0, java.util.Optional.empty(), java.util.Optional.empty(), false,
                                             true, x => {});
                                         fileUploadList.push(fup);
                                         if (filesProcessedCounter == files.length) {

diff --git a/src/views/Calendar.vue b/src/views/Calendar.vue
@@ -920,7 +920,7 @@ module.exports = {
         }
         let reader = new peergos.shared.user.fs.AsyncReader.ArrayBacked(bytes);
         let fup = new peergos.shared.user.fs.FileWrapper.FileUploadProperties(filename, {get_0: () => reader},
-            (fileSize - (fileSize % Math.pow(2, 32))) / Math.pow(2, 32), fileSize, false,
+            (fileSize - (fileSize % Math.pow(2, 32))) / Math.pow(2, 32), fileSize, java.util.Optional.empty(), java.util.Optional.empty(), false,
             true, updateProgressBar);
         let fileUploadList = uploadParams.fileUploadProperties[foundDirectoryIndex];
         fileUploadList.push(fup);

diff --git a/src/views/Drive.vue b/src/views/Drive.vue
@@ -2154,7 +2154,7 @@ module.exports = {
             let reader = new browserio.JSFileReader(file);
             let java_reader = new peergos.shared.user.fs.BrowserFileReader(reader);
             let fup = new peergos.shared.user.fs.FileWrapper.FileUploadProperties(file.name, {get_0: () => java_reader},
-                (file.size - (file.size % Math.pow(2, 32))) / Math.pow(2, 32), file.size, false,
+                (file.size - (file.size % Math.pow(2, 32))) / Math.pow(2, 32), file.size, java.util.Optional.empty(), java.util.Optional.empty(), false,
                 overwriteExisting ? true : false, updateProgressBar);
 
             let fileUploadList = uploadParams.fileUploadProperties[foundDirectoryIndex];
@@ -2993,7 +2993,7 @@ module.exports = {
             let manifestReader = new peergos.shared.user.fs.AsyncReader.ArrayBacked(appManifest);
             let manifestProps =
                     new peergos.shared.user.fs.FileWrapper.FileUploadProperties("peergos-app.json", {get_0: () => manifestReader}, 0,
-                        manifestUint8Array.byteLength, false, true, x => {});
+                        manifestUint8Array.byteLength, java.util.Optional.empty(), java.util.Optional.empty(), false, true, x => {});
             let html = '<!DOCTYPE html>\n' +
             '<html lang="en">\n' +
             '    <head>\n' +
@@ -3010,7 +3010,7 @@ module.exports = {
             let indexReader = new peergos.shared.user.fs.AsyncReader.ArrayBacked(appIndexPage);
             let indexPageProps =
                     new peergos.shared.user.fs.FileWrapper.FileUploadProperties("index.html", {get_0: () => indexReader}, 0,
-                        indexUint8Array.byteLength, false, true, x => {});
+                        indexUint8Array.byteLength, java.util.Optional.empty(), java.util.Optional.empty(), false, true, x => {});
             let folderUPList = [];
             let appFolderProps = new peergos.shared.user.fs.FileWrapper.FolderUploadProperties(
                 peergos.client.JsUtil.asList([appName]), peergos.client.JsUtil.asList([manifestProps]));
+6 −1		src/peergos/server/cli/CLI.java
+22 −0		src/peergos/server/crypto/hash/ScryptJava.java
+43 −1		src/peergos/server/sync/DirectorySync.java
+8 −16		src/peergos/server/sync/LocalFileSystem.java
+7 −0		src/peergos/server/sync/PeergosSyncFS.java
+3 −0		src/peergos/server/sync/SyncFilesystem.java
+2 −2		src/peergos/server/tests/RamUserTests.java
+4 −4		src/peergos/server/tests/UserTests.java
+2 −2		src/peergos/server/tests/slow/DeleteBenchmark.java
+1 −1		src/peergos/server/tests/slow/SmallFileBenchmark.java
+59 −8		src/peergos/shared/user/fs/FileWrapper.java