hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use multiple jobs to delete

Browse Source
This commit is contained in:
Starccy 2021-10-17 21:50:34 +08:00
parent eea85b9b5a
commit fb126164ef
2 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/common.tis
View File

@ -257,6 +257,10 @@ handler.msgbox = function(type, title, text, callback=null, height=180, width=50
self.timer(150ms, function() { msgbox(type, title, text, callback, height, width, retry); }); self.timer(150ms, function() { msgbox(type, title, text, callback, height, width, retry); });
} }
handler.block_msgbox = function(type, title, text, callback=null, height=180, width=500, retry=0) {
msgbox(type, title, text, callback, height, width, retry);
}
var reconnectTimeout = 1; var reconnectTimeout = 1;
handler.msgbox_retry = function(type, title, text, hasRetry, callback=null, height=180, width=500) { handler.msgbox_retry = function(type, title, text, hasRetry, callback=null, height=180, width=500) {
handler.msgbox(type, title, text, callback, height, width, hasRetry ? reconnectTimeout : 0); handler.msgbox(type, title, text, callback, height, width, hasRetry ? reconnectTimeout : 0);

41
src/ui/file_transfer.tis
View File

@ -407,20 +407,31 @@ class FolderView : Reactor.Component {
} }
event click $(.trash) () { event click $(.trash) () {
var row = this.getCurrentRow(); var rows = this.getCurrentRows();
if (!row) return; if (!rows || rows.length == 0) return;
var path = row[0];
var type = row[1]; var delete_dirs = new Array();
var new_history = [];
for (var i = 0; i < this.history.length; ++i) { for (var i = 0; i < rows.length; ++i) {
var h = this.history[i]; var row = rows[i];
if ((h + this.sep()).indexOf(path + this.sep()) == -1) new_history.push(h);
var path = row[0];
var type = row[1];
var new_history = [];
for (var j = 0; j < this.history.length; ++j) {
var h = this.history[j];
if ((h + this.sep()).indexOf(path + this.sep()) == -1) new_history.push(h);
}
this.history = new_history;
if (type == 1) {
delete_dirs.push(path);
} else {
confirmDelete(path, this.is_remote);
}
} }
this.history = new_history; for (var i = 0; i < delete_dirs.length; ++i) {
if (type == 1) { file_transfer.job_table.addDelDir(delete_dirs[i], this.is_remote);
file_transfer.job_table.addDelDir(path, this.is_remote);
} else {
confirmDelete(path, this.is_remote);
} }
} }
@ -594,7 +605,7 @@ var deleting_single_file_jobs = {};
var create_dir_jobs = {} var create_dir_jobs = {}
function confirmDelete(path, is_remote) { function confirmDelete(path, is_remote) {
handler.msgbox("custom-skip", "Confirm Delete", "<div .form> \ handler.block_msgbox("custom-skip", "Confirm Delete", "<div .form> \
<div>Are you sure you want to delete this file?</div> \ <div>Are you sure you want to delete this file?</div> \
<div.ellipsis style=\"font-weight: bold;\">" + path + "</div> \ <div.ellipsis style=\"font-weight: bold;\">" + path + "</div> \
</div>", function(res=null) { </div>", function(res=null) {
@ -614,7 +625,7 @@ handler.confirmDeleteFiles = function(id, i, name) {
if (i >= n) return; if (i >= n) return;
var file_path = job.path; var file_path = job.path;
if (name) file_path += handler.get_path_sep(job.is_remote) + name; if (name) file_path += handler.get_path_sep(job.is_remote) + name;
handler.msgbox("custom-skip", "Confirm Delete", "<div .form> \ handler.block_msgbox("custom-skip", "Confirm Delete", "<div .form> \
<div>Deleting #" + (i + 1) + " of " + n + " files.</div> \ <div>Deleting #" + (i + 1) + " of " + n + " files.</div> \
<div>Are you sure you want to delete this file?</div> \ <div>Are you sure you want to delete this file?</div> \
<div.ellipsis style=\"font-weight: bold;\" .text>" + name + "</div> \ <div.ellipsis style=\"font-weight: bold;\" .text>" + name + "</div> \