weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for file transfer: sort row and remove empty dir

Browse Source
This commit is contained in:
rustdesk 2021-07-26 02:50:33 +08:00
parent 9a86a595ff
commit 1ee92c9f68
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/file_transfer.tis
View File

@ -146,11 +146,15 @@ class JobTable: Reactor.Component {
var n = job.num_entries || job.entries.length; var n = job.num_entries || job.entries.length;
if (i > n) i = n; if (i > n) i = n;
var res = i + ' / ' + n + " files"; var res = i + ' / ' + n + " files";
if (job.total_size > 0) res += ", " + getSize(0, job.finished_size) + ' / ' + getSize(0, job.total_size); if (job.total_size > 0) {
var s = getSize(0, job.finished_size);
if (s) s += " / ";
res += ", " + s + getSize(0, job.total_size);
}
// below has problem if some file skipped // below has problem if some file skipped
var percent = (100. * job.finished_size / job.total_size).toInteger(); // (100. * i / (n || 1)).toInteger(); var percent = job.total_size == 0 ? 100 : (100. * job.finished_size / job.total_size).toInteger(); // (100. * i / (n || 1)).toInteger();
if (job.finished) percent = '100'; if (job.finished) percent = '100';
res += ", " + percent + "%"; if (percent) res += ", " + percent + "%";
if (job.finished) res = "Finished " + res; if (job.finished) res = "Finished " + res;
if (job.speed) res += ", " + getSize(0, job.speed) + "/s"; if (job.speed) res += ", " + getSize(0, job.speed) + "/s";
return res; return res;

2
src/ui/grid.tis
View File

@ -73,7 +73,7 @@ class Grid: Behavior {
var getValue = function(x) { var getValue = function(x) {
var value = x.attributes["value"]; var value = x.attributes["value"];
if (value == undefined) return x.text.toLowerCase(); if (value == undefined) return x.text.toLowerCase();
return value.toInteger(); return value.toFloat();
} }
var sort = function(r1, r2, asc) { var sort = function(r1, r2, asc) {
if (r1[1].text == "..") { if (r1[1].text == "..") {