upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

fix: Limit trashbin restore/delete to 2 concurrent request to avoid locking in the backend

Browse source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2023-02-01 08:17:26 +01:00
parent 6f3c4f2255
commit d92538850f
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/files_trashbin/src/filelist.js
View file

@ -25,6 +25,9 @@
*
*/
// eslint-disable-next-line import/no-unresolved, node/no-missing-import
import PQueue from 'p-queue'
/* eslint-disable */
(function() {
var DELETED_REGEXP = new RegExp(/^(.+)\.d[0-9]+$/)
@ -61,6 +64,7 @@
var FileList = function($el, options) {
this.client = options.client
this.initialize($el, options)
this.deleteOperationQueue = new PQueue({ concurrency: 4 })
}
FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
/** @lends OCA.Trashbin.FileList.prototype */ {
@ -185,12 +189,10 @@
this.fileMultiSelectMenu.toggleLoading('restore', true)
var restorePromises = files.map(function(file) {
return self.client.move(OC.joinPaths('trash', self.getCurrentDirectory(), file), OC.joinPaths('restore', file), true)
.then(
function() {
self._removeCallback([file])
}
)
return self.deleteOperationQueue.add(async () => {
self.client.move(OC.joinPaths('trash', self.getCurrentDirectory(), file), OC.joinPaths('restore', file), true)
self._removeCallback([file])
})
})
return Promise.all(restorePromises).then(
function() {
@ -226,12 +228,10 @@
} else {
this.fileMultiSelectMenu.toggleLoading('delete', true)
var deletePromises = files.map(function(file) {
return self.client.remove(OC.joinPaths('trash', self.getCurrentDirectory(), file))
.then(
function() {
self._removeCallback([file])
}
)
return self.deleteOperationQueue.add(async () => {
await self.client.remove(OC.joinPaths('trash', self.getCurrentDirectory(), file))
self._removeCallback([file])
})
})
return Promise.all(deletePromises).then(
function() {