in progress file manager updates

Author: renonick87

lib/js/src/manager/file/_FileManagerBase.js

@@ -151,7 +151,6 @@ class _FileManagerBase extends _SubManagerBase {
                 this._bytesAvailable = bytesAvailable;
                 this._remoteFiles = _ArrayTools.arrayRemove(this._remoteFiles, fileName);
                 this._uploadedEphemeralFileNames = _ArrayTools.arrayRemove(this._uploadedEphemeralFileNames, fileName);
-                this._updatePendingOperationsWithNewRemoteFiles();
             }
             listener(success, bytesAvailable, fileNames, errorMessage);
         });
@@ -237,12 +236,6 @@ class _FileManagerBase extends _SubManagerBase {
             return;
         }
 
-        const msgVersion = this._lifecycleManager.getSdlMsgVersion();
-        const rpcVersion = new Version(msgVersion.getMajorVersion(), msgVersion.getMinorVersion(), msgVersion.getPatchVersion());
-        if (!file.isPersistent() && !this.hasUploadedFile(file) && new Version(4, 0, 0).isNewerThan(rpcVersion) === 1) {
-            file.setOverwrite(true);
-        }
-
         this._sdlUploadFilePrivate(file, listener);
     }
 
@@ -252,16 +245,16 @@ class _FileManagerBase extends _SubManagerBase {
      * @param {Function} listener - listener called when the upload has finished
      */
     _sdlUploadFilePrivate (file, listener) {
-        const fileName = file.getName();
+        const fileClone = file.clone();
+        const fileName = fileClone.getName();
 
-        const fileWrapper = new _SdlFileWrapper(file, (success, bytesAvailable, fileNames, errorMessage) => {
+        const fileWrapper = new _SdlFileWrapper(fileClone, (success, bytesAvailable, fileNames, errorMessage) => {
             if (success) {
                 this._bytesAvailable = bytesAvailable;
                 this._remoteFiles.push(fileName);
                 if (!file.isPersistent()) {
                     this._uploadedEphemeralFileNames.push(fileName);
                 }
-                this._updatePendingOperationsWithNewRemoteFiles();
             } else if (errorMessage !== 'File is already on the head unit, aborting upload operation') {
                 this._incrementFailedUploadCountForFileName(fileName, this._failedFileUploadsCount);
 
@@ -278,7 +271,7 @@ class _FileManagerBase extends _SubManagerBase {
             }
         });
 
-        const operation = new _UploadFileOperation(this._lifecycleManager, this, fileWrapper, this._remoteFiles);
+        const operation = new _UploadFileOperation(this._lifecycleManager, this, fileWrapper);
         this._addTask(operation);
     }
 
@@ -416,17 +409,6 @@ class _FileManagerBase extends _SubManagerBase {
         }
         return false;
     }
-
-    _updatePendingOperationsWithNewRemoteFiles () {
-        for (const op of this._getTasks()) {
-            if (op.getState() === _Task.IN_PROGRESS || op.getState() === _Task.CANCELED) {
-                continue;
-            }
-            if (op instanceof _UploadFileOperation || op instanceof _DeleteFileOperation) {
-                op.setRemoteFiles(this._remoteFiles);
-            }
-        }
-    }
 }
 
 const SPACE_AVAILABLE_MAX_VALUE = _FileManagerBase.SPACE_AVAILABLE_MAX_VALUE = 2000000000;

lib/js/src/manager/file/_UploadFileOperation.js

@@ -4,6 +4,7 @@ import { PutFile } from '../../rpc/messages/PutFile';
 import { _Task } from '../_Task';
 import { _FileManagerBase } from './_FileManagerBase';
 import { _FileUtils } from '../../util/_FileUtils';
+import { Version } from '../../util/Version';
 
 class _UploadFileOperation extends _Task {
     /**
@@ -12,14 +13,12 @@ class _UploadFileOperation extends _Task {
      * @param {_LifecycleManager} lifecycleManager - An instance of _LifecycleManager.
      * @param {FileManager} fileManager - An instance of FileManager.
      * @param {_SdlFileWrapper} fileWrapper - An instance of _SdlFileWrapper.
-     * @param {String[]} remoteFileNames - A list of file names uploaded to the system.
      */
-    constructor (lifecycleManager = null, fileManager = null, fileWrapper = null, remoteFileNames = []) {
+    constructor (lifecycleManager = null, fileManager = null, fileWrapper = null) {
         super('UploadFileOperation');
         this._lifecycleManager = lifecycleManager;
         this._fileManager = fileManager;
         this._fileWrapper = fileWrapper;
-        this._remoteFileNames = remoteFileNames;
     }
 
     /**
@@ -40,7 +39,14 @@ class _UploadFileOperation extends _Task {
             return;
         }
 
-        if (!this._fileWrapper.getFile().getOverwrite() && this._remoteFileNames.includes(this._fileWrapper.getFile().getName())) {
+        const file = this._fileWrapper.getFile();
+        const msgVersion = this._lifecycleManager.getSdlMsgVersion();
+        const rpcVersion = new Version(msgVersion.getMajorVersion(), msgVersion.getMinorVersion(), msgVersion.getPatchVersion());
+        if (!file.isPersistent() && !this.hasUploadedFile(file) && new Version(4, 4, 0).isNewerThan(rpcVersion) === 1) {
+            file.setOverwrite(true);
+        }
+
+        if (!this._fileManager.fileNeedsUpload(file)) {
             const errorMessage = 'File is already on the head unit, aborting upload operation';
             console.log(errorMessage);
             this._fileWrapper.getCompletionListener(false, null, null, errorMessage);
@@ -51,7 +57,7 @@ class _UploadFileOperation extends _Task {
         if (this._lifecycleManager !== null) {
             mtuSize = this._lifecycleManager.getMtu(_ServiceType.RPC);
         }
-        await this._sendFile(this._fileWrapper.getFile(), mtuSize, this._fileWrapper.getCompletionListener());
+        await this._sendFile(file, mtuSize, this._fileWrapper.getCompletionListener());
     }
 
     /**
@@ -249,10 +255,6 @@ class _UploadFileOperation extends _Task {
         const maxJSONSize = this._getMaxJSONSize(file, fileSize);
         return mtuSize - (frameHeaderSize + binaryHeaderSize + maxJSONSize);
     }
-
-    setRemoteFiles (remoteFiles) {
-        this._remoteFileNames = remoteFiles;
-    }
 }
 
 export { _UploadFileOperation };

lib/js/src/manager/file/filetypes/SdlFile.js

@@ -215,6 +215,16 @@ class SdlFile {
         }
         return true;
     }
+
+    /**
+     * Creates a deep copy of the object
+     * @returns {ChoiceCell} - A deep copy of the object
+     */
+    clone () {
+        const clonedParams = Object.assign({}, this); // shallow copy
+
+        return Object.assign(new SdlFile(this.getName(), this.getType(), this.getFileData(), this.isPersistent()), clonedParams);
+    }
 }