Skip to content

Commit 33bbf1c

Browse files
committed
Update based on feedback and alignment
1 parent fd13c24 commit 33bbf1c

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

lib/js/src/manager/file/_DeleteFileOperation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class _DeleteFileOperation extends _Task {
7272
if (!this._remoteFileNames.includes(this._fileName)) {
7373
const errorMessage = 'File to delete is no longer on the head unit, aborting the operation';
7474
console.log(errorMessage);
75-
this._completionListener(false, null, null, errorMessage);
75+
this._completionListener(false, _FileManagerBase.SPACE_AVAILABLE_MAX_VALUE, this._remoteFileNames, errorMessage);
7676
return this.onFinished();
7777
}
7878
await this._deleteFile();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,5 +410,6 @@ class _FileManagerBase extends _SubManagerBase {
410410
}
411411

412412
const SPACE_AVAILABLE_MAX_VALUE = _FileManagerBase.SPACE_AVAILABLE_MAX_VALUE = 2000000000;
413+
_FileManagerBase.fileManagerCannotOverwriteError = 'Cannot overwrite remote file. The remote file system already has a file of this name, and the file manager is set to not automatically overwrite files.';
413414

414415
export { _FileManagerBase };

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class _UploadFileOperation extends _Task {
4747
}
4848

4949
if (!this._fileManager.fileNeedsUpload(file)) {
50-
const errorMessage = _UploadFileOperation.fileManagerCannotOverwriteError;
50+
const errorMessage = _FileManagerBase.fileManagerCannotOverwriteError;
5151
console.log(errorMessage);
5252
if (typeof this._fileWrapper.getCompletionListener() === 'function') {
5353
this._fileWrapper.getCompletionListener()(false, null, null, errorMessage);
@@ -259,6 +259,4 @@ class _UploadFileOperation extends _Task {
259259
}
260260
}
261261

262-
_UploadFileOperation.fileManagerCannotOverwriteError = 'Cannot overwrite remote file. The remote file system already has a file of this name, and the file manager is set to not automatically overwrite files.';
263-
264262
export { _UploadFileOperation };

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ class SdlArtwork extends SdlFile {
125125
clone () {
126126
const clonedParams = Object.assign({}, this); // shallow copy
127127

128+
if (clonedParams._imageRPC !== null) {
129+
clonedParams._imageRPC = Object.assign(new SdlArtwork(), clonedParams._artwork);
130+
}
128131
return Object.assign(new SdlArtwork(this.getName(), this.getType(), this.getFileData(), this.isPersistent()), clonedParams);
129132
}
130133
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@ class SdlFile {
223223
clone () {
224224
const clonedParams = Object.assign({}, this); // shallow copy
225225

226+
if (this.getFileData() !== null && this.getFileData() !== undefined) {
227+
return Object.assign(new SdlFile(this.getName(), this.getType(), Uint8Array.from(this.getFileData()), this.isPersistent()), clonedParams);
228+
}
226229
return Object.assign(new SdlFile(this.getName(), this.getType(), this.getFileData(), this.isPersistent()), clonedParams);
227230
}
228231
}

tests/managers/file/SdlFileTests.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ module.exports = function (appClient) {
1010
describe('SdlFileTests', function () {
1111
it('testFileEquality', function () {
1212
const fileName = 'testFile';
13-
const fileData = 'it is wednesday';
13+
const fileData = Uint8Array.from('it is wednesday');
1414
const filePath = './doesnt_go_anywhere.txt';
1515
const file = new SDL.manager.file.filetypes.SdlFile(fileName, SDL.rpc.enums.FileType.BINARY, fileData, true)
1616
.setFilePath(filePath)
17+
.setFileData(fileData)
1718
.setStaticIcon(true)
1819
.setOverwrite(true);
1920
const file2 = new SDL.manager.file.filetypes.SdlFile(fileName, SDL.rpc.enums.FileType.BINARY, fileData, true)
2021
.setFilePath(filePath)
22+
.setFileData(fileData)
2123
.setStaticIcon(true)
2224
.setOverwrite(true);
2325
Validator.assertTrue(file.equals(file2));
@@ -28,7 +30,7 @@ module.exports = function (appClient) {
2830

2931
fileClone.setName('something else');
3032
fileClone.setFilePath('./goes_nowhere.txt');
31-
fileClone.setFileData('my dudes');
33+
fileClone.setFileData(Uint8Array.from('my dudes'));
3234
fileClone.setType(SDL.rpc.enums.FileType.JSON);
3335
fileClone.setPersistent(false);
3436
fileClone.setStaticIcon(false);
@@ -55,7 +57,7 @@ module.exports = function (appClient) {
5557
describe('SdlArtworkTests', function () {
5658
it('testFileEquality', function () {
5759
const fileName = 'testFile';
58-
const fileData = 'it is wednesday';
60+
const fileData = Uint8Array.from('it is wednesday');
5961
const filePath = './doesnt_go_anywhere.txt';
6062
const file = new SDL.manager.file.filetypes.SdlArtwork(fileName, SDL.rpc.enums.FileType.GRAPHIC_JPEG, fileData, true)
6163
.setFilePath(filePath)
@@ -75,7 +77,7 @@ module.exports = function (appClient) {
7577

7678
fileClone.setName('something else');
7779
fileClone.setFilePath('./goes_nowhere.txt');
78-
fileClone.setFileData('my dudes');
80+
fileClone.setFileData(Uint8Array.from('my dudes'));
7981
fileClone.setType(SDL.rpc.enums.FileType.GRAPHIC_PNG);
8082
fileClone.setPersistent(false);
8183
fileClone.setStaticIcon(false);

tests/managers/file/UploadFileOperationTests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ module.exports = function (appClient) {
2626
Validator.assertNull(bytesAvailable);
2727
Validator.assertNull(fileNames);
2828
Validator.assertNotNullUndefined(errorMessage);
29-
Validator.assertEquals(errorMessage, SDL.manager.file._UploadFileOperation.fileManagerCannotOverwriteError);
29+
Validator.assertEquals(errorMessage, SDL.manager.file._FileManagerBase.fileManagerCannotOverwriteError);
3030
});
3131
const operation = new SDL.manager.file._UploadFileOperation(sdlManager._lifecycleManager, sdlManager.getFileManager(), testFileWrapper);
3232
await operation._start();

0 commit comments

Comments
 (0)