diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-09-18 14:19:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-18 14:19:30 +0200 |
commit | f9dc6c456ecdd4802c4e7ed2e1ceb565480ae82f (patch) | |
tree | cd5451067939d2cfa6ae17d78451ecf8343e1f90 /apps/files | |
parent | bdba9871d0da1b62a7ab3c132ceb3b469848f535 (diff) | |
parent | 8c576a8d6374cabaa8807455b412603f0e8f1d45 (diff) | |
download | nextcloud-server-f9dc6c456ecdd4802c4e7ed2e1ceb565480ae82f.tar.gz nextcloud-server-f9dc6c456ecdd4802c4e7ed2e1ceb565480ae82f.zip |
Merge pull request #6014 from nextcloud/add-copy-action
Allows files/folders to be copied.
Diffstat (limited to 'apps/files')
-rw-r--r-- | apps/files/js/fileactions.js | 15 | ||||
-rw-r--r-- | apps/files/js/filelist.js | 124 | ||||
-rw-r--r-- | apps/files/templates/list.php | 4 | ||||
-rw-r--r-- | apps/files/tests/js/filelistSpec.js | 98 |
4 files changed, 227 insertions, 14 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 3e0cf998254..3da9b06b0d3 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -618,16 +618,21 @@ }); this.registerAction({ - name: 'Move', - displayName: t('files', 'Move'), + name: 'MoveCopy', + displayName: t('files', 'Move or copy'), mime: 'all', order: -25, permissions: OC.PERMISSION_UPDATE, iconClass: 'icon-external', actionHandler: function (filename, context) { - OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath) { - context.fileList.move(filename, targetPath); - }, false, "httpd/unix-directory", true); + OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) { + if (type === OC.dialogs.FILEPICKER_TYPE_COPY) { + context.fileList.copy(filename, targetPath); + } + if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) { + context.fileList.move(filename, targetPath); + } + }, false, "httpd/unix-directory", true, OC.dialogs.FILEPICKER_TYPE_COPY_MOVE); } }); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 95fbc2b7560..48ac0f4e33a 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -337,7 +337,7 @@ this.$el.on('urlChanged', _.bind(this._onUrlChanged, this)); this.$el.find('.select-all').click(_.bind(this._onClickSelectAll, this)); this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this)); - this.$el.find('.move').click(_.bind(this._onClickMoveSelected, this)); + this.$el.find('.copy-move').click(_.bind(this._onClickCopyMoveSelected, this)); this.$el.find('.delete-selected').click(_.bind(this._onClickDeleteSelected, this)); this.$el.find('.selectedActions a').tooltip({placement:'top'}); @@ -761,7 +761,7 @@ /** * Event handler for when clicking on "Move" for the selected files */ - _onClickMoveSelected: function(event) { + _onClickCopyMoveSelected: function(event) { var files; var self = this; @@ -779,14 +779,17 @@ OCA.Files.FileActions.updateFileActionSpinner(moveFileAction, false); }; - OCA.Files.FileActions.updateFileActionSpinner(moveFileAction, true); - OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath) { - self.move(files, targetPath, disableLoadingState); - }, false, "httpd/unix-directory", true); + OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) { + if (type === OC.dialogs.FILEPICKER_TYPE_COPY) { + self.copy(files, targetPath, disableLoadingState); + } + if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) { + self.move(files, targetPath, disableLoadingState); + } + }, false, "httpd/unix-directory", true, OC.dialogs.FILEPICKER_TYPE_COPY_MOVE); return false; }, - /** * Event handler for when clicking on "Delete" for the selected files */ @@ -1974,6 +1977,7 @@ } return index; }, + /** * Moves a file to a given target folder. * @@ -2038,6 +2042,112 @@ }, /** + * Copies a file to a given target folder. + * + * @param fileNames array of file names to copy + * @param targetPath absolute target path + * @param callback to call when copy is finished with success + */ + copy: function(fileNames, targetPath, callback) { + var self = this; + var filesToNotify = []; + var count = 0; + + var dir = this.getCurrentDirectory(); + if (dir.charAt(dir.length - 1) !== '/') { + dir += '/'; + } + var target = OC.basename(targetPath); + if (!_.isArray(fileNames)) { + fileNames = [fileNames]; + } + _.each(fileNames, function(fileName) { + var $tr = self.findFileEl(fileName); + self.showFileBusyState($tr, true); + if (targetPath.charAt(targetPath.length - 1) !== '/') { + // make sure we move the files into the target dir, + // not overwrite it + targetPath = targetPath + '/'; + } + self.filesClient.copy(dir + fileName, targetPath + fileName) + .done(function () { + filesToNotify.push(fileName); + + // if still viewing the same directory + if (OC.joinPaths(self.getCurrentDirectory(), '/') === dir) { + // recalculate folder size + var oldFile = self.findFileEl(target); + var newFile = self.findFileEl(fileName); + var oldSize = oldFile.data('size'); + var newSize = oldSize + newFile.data('size'); + oldFile.data('size', newSize); + oldFile.find('td.filesize').text(OC.Util.humanFileSize(newSize)); + } + }) + .fail(function(status) { + if (status === 412) { + // TODO: some day here we should invoke the conflict dialog + OC.Notification.show(t('files', 'Could not copy "{file}", target exists', + {file: fileName}), {type: 'error'} + ); + } else { + OC.Notification.show(t('files', 'Could not copy "{file}"', + {file: fileName}), {type: 'error'} + ); + } + }) + .always(function() { + self.showFileBusyState($tr, false); + count++; + + /** + * We only show the notifications once the last file has been copied + */ + if (count === fileNames.length) { + // Remove leading and ending / + if (targetPath.slice(0, 1) === '/') { + targetPath = targetPath.slice(1, targetPath.length); + } + if (targetPath.slice(-1) === '/') { + targetPath = targetPath.slice(0, -1); + } + + if (filesToNotify.length > 0) { + // Since there's no visual indication that the files were copied, let's send some notifications ! + if (filesToNotify.length === 1) { + OC.Notification.show(t('files', 'Copied {origin} inside {destination}', + { + origin: filesToNotify[0], + destination: targetPath + } + ), {timeout: 10}); + } else if (filesToNotify.length > 0 && filesToNotify.length < 3) { + OC.Notification.show(t('files', 'Copied {origin} inside {destination}', + { + origin: filesToNotify.join(', '), + destination: targetPath + } + ), {timeout: 10}); + } else { + OC.Notification.show(t('files', 'Copied {origin} and {nbfiles} other files inside {destination}', + { + origin: filesToNotify[0], + nbfiles: filesToNotify.length - 1, + destination: targetPath + } + ), {timeout: 10}); + } + } + } + }); + }); + + if (callback) { + callback(); + } + }, + + /** * Updates the given row with the given file info * * @param {Object} $tr row element diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 67c330c38c7..f3b6759644c 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -47,9 +47,9 @@ </label> <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> <span id="selectedActionsList" class="selectedActions"> - <a href="" class="move"> + <a href="" class="copy-move"> <span class="icon icon-external"></span> - <span><?php p($l->t('Move'))?></span> + <span><?php p($l->t('Move or copy'))?></span> </a> <a href="" class="download"> <span class="icon icon-download"></span> diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index a12c0ff49b6..5061d70c4c7 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -853,6 +853,104 @@ describe('OCA.Files.FileList tests', function() { .toEqual(OC.imagePath('core', 'filetypes/text.svg')); }); }); + + describe('Copying files', function() { + var deferredCopy; + var copyStub; + + beforeEach(function() { + deferredCopy = $.Deferred(); + copyStub = sinon.stub(filesClient, 'copy').returns(deferredCopy.promise()); + + fileList.setFiles(testFiles); + }); + afterEach(function() { + copyStub.restore(); + }); + + it('Copies single file to target folder', function() { + fileList.copy('One.txt', '/somedir'); + + expect(copyStub.calledOnce).toEqual(true); + expect(copyStub.getCall(0).args[0]).toEqual('/subdir/One.txt'); + expect(copyStub.getCall(0).args[1]).toEqual('/somedir/One.txt'); + + deferredCopy.resolve(201); + + // File is still here + expect(fileList.findFileEl('One.txt').length).toEqual(1); + + // folder size has increased + expect(fileList.findFileEl('somedir').data('size')).toEqual(262); + expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B'); + + // Copying sents a notification to tell that we've successfully copied file + expect(notificationStub.notCalled).toEqual(false); + }); + it('Copies list of files to target folder', function() { + var deferredCopy1 = $.Deferred(); + var deferredCopy2 = $.Deferred(); + copyStub.onCall(0).returns(deferredCopy1.promise()); + copyStub.onCall(1).returns(deferredCopy2.promise()); + + fileList.copy(['One.txt', 'Two.jpg'], '/somedir'); + + expect(copyStub.calledTwice).toEqual(true); + expect(copyStub.getCall(0).args[0]).toEqual('/subdir/One.txt'); + expect(copyStub.getCall(0).args[1]).toEqual('/somedir/One.txt'); + expect(copyStub.getCall(1).args[0]).toEqual('/subdir/Two.jpg'); + expect(copyStub.getCall(1).args[1]).toEqual('/somedir/Two.jpg'); + + deferredCopy1.resolve(201); + + expect(fileList.findFileEl('One.txt').length).toEqual(1); + + // folder size has increased during copy + expect(fileList.findFileEl('somedir').data('size')).toEqual(262); + expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('262 B'); + + deferredCopy2.resolve(201); + + expect(fileList.findFileEl('Two.jpg').length).toEqual(1); + + // folder size has increased + expect(fileList.findFileEl('somedir').data('size')).toEqual(12311); + expect(fileList.findFileEl('somedir').find('.filesize').text()).toEqual('12 KB'); + + expect(notificationStub.notCalled).toEqual(false); + }); + it('Shows notification if a file could not be copied', function() { + fileList.copy('One.txt', '/somedir'); + + expect(copyStub.calledOnce).toEqual(true); + + deferredCopy.reject(409); + + expect(fileList.findFileEl('One.txt').length).toEqual(1); + + expect(notificationStub.calledOnce).toEqual(true); + expect(notificationStub.getCall(0).args[0]).toEqual('Could not copy "One.txt"'); + }); + it('Restores thumbnail if a file could not be copied', function() { + fileList.copy('One.txt', '/somedir'); + + expect(OC.TestUtil.getImageUrl(fileList.findFileEl('One.txt').find('.thumbnail'))) + .toEqual(OC.imagePath('core', 'loading.gif')); + + expect(copyStub.calledOnce).toEqual(true); + + deferredCopy.reject(409); + + expect(fileList.findFileEl('One.txt').length).toEqual(1); + + expect(notificationStub.calledOnce).toEqual(true); + expect(notificationStub.getCall(0).args[0]).toEqual('Could not copy "One.txt"'); + + expect(OC.TestUtil.getImageUrl(fileList.findFileEl('One.txt').find('.thumbnail'))) + .toEqual(OC.imagePath('core', 'filetypes/text.svg')); + }); + }); + describe('Update file', function() { it('does not change summary', function() { var $summary = $('#filestable .summary'); |