Merge pull request #3498 from grummbeer/file-manager-file-basename

File Manager. Show filename instead of path in tranfer list
This commit is contained in:
RustDesk 2023-03-04 14:36:15 +08:00 committed by GitHub
commit aed8a72bd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View File

@ -645,7 +645,7 @@ class _FileManagerPageState extends State<FileManagerPage>
Duration(milliseconds: 500), Duration(milliseconds: 500),
message: item.jobName, message: item.jobName,
child: Text( child: Text(
item.jobName, item.fileName,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
).paddingSymmetric(vertical: 10), ).paddingSymmetric(vertical: 10),

View File

@ -500,6 +500,7 @@ class FileModel extends ChangeNotifier {
for (var from in items.items) { for (var from in items.items) {
final jobId = ++_jobId; final jobId = ++_jobId;
_jobTable.add(JobProgress() _jobTable.add(JobProgress()
..fileName = path.basename(from.path)
..jobName = from.path ..jobName = from.path
..totalSize = from.size ..totalSize = from.size
..state = JobState.inProgress ..state = JobState.inProgress
@ -853,7 +854,9 @@ class FileModel extends ChangeNotifier {
int fileNum = jobDetail['file_num']; int fileNum = jobDetail['file_num'];
bool isRemote = jobDetail['is_remote']; bool isRemote = jobDetail['is_remote'];
final currJobId = _jobId++; final currJobId = _jobId++;
String fileName = path.basename(isRemote ? remote : to);
var jobProgress = JobProgress() var jobProgress = JobProgress()
..fileName = fileName
..jobName = isRemote ? remote : to ..jobName = isRemote ? remote : to
..id = currJobId ..id = currJobId
..isRemote = isRemote ..isRemote = isRemote
@ -1121,6 +1124,7 @@ class JobProgress {
var fileCount = 0; var fileCount = 0;
var isRemote = false; var isRemote = false;
var jobName = ""; var jobName = "";
var fileName = "";
var remote = ""; var remote = "";
var to = ""; var to = "";
var showHidden = false; var showHidden = false;
@ -1133,6 +1137,7 @@ class JobProgress {
speed = 0; speed = 0;
finishedSize = 0; finishedSize = 0;
jobName = ""; jobName = "";
fileName = "";
fileCount = 0; fileCount = 0;
remote = ""; remote = "";
to = ""; to = "";