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

fix file transfer local Windows path can't split

Browse Source
This commit is contained in:
csf 2022-12-04 23:44:03 +09:00
parent 5b9a76f8a5
commit c79b6eb0bb
3 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flutter/lib/desktop/pages/file_manager_page.dart
View File

@ -825,7 +825,7 @@ class _FileManagerPageState extends State<FileManagerPage>
final x = offset.dx; final x = offset.dx;
final y = offset.dy + size.height + 1; final y = offset.dy + size.height + 1;
final isPeerWindows = isWindows(isLocal); final isPeerWindows = model.getCurrentIsWindows(isLocal);
final List<MenuEntryBase> menuItems = [ final List<MenuEntryBase> menuItems = [
MenuEntryButton( MenuEntryButton(
childBuilder: (TextStyle? style) => isPeerWindows childBuilder: (TextStyle? style) => isPeerWindows
@ -913,7 +913,8 @@ class _FileManagerPageState extends State<FileManagerPage>
bool isLocal, void Function(List<String>) onPressed) { bool isLocal, void Function(List<String>) onPressed) {
final path = model.getCurrentDir(isLocal).path; final path = model.getCurrentDir(isLocal).path;
final breadCrumbList = List<BreadCrumbItem>.empty(growable: true); final breadCrumbList = List<BreadCrumbItem>.empty(growable: true);
if (isWindows(isLocal) && path == '/') { final isWindows = model.getCurrentIsWindows(isLocal);
if (isWindows && path == '/') {
breadCrumbList.add(BreadCrumbItem( breadCrumbList.add(BreadCrumbItem(
content: TextButton( content: TextButton(
child: buildWindowsThisPC(), child: buildWindowsThisPC(),
@ -922,7 +923,7 @@ class _FileManagerPageState extends State<FileManagerPage>
onPressed: () => onPressed(['/'])) onPressed: () => onPressed(['/']))
.marginSymmetric(horizontal: 4))); .marginSymmetric(horizontal: 4)));
} else { } else {
final list = PathUtil.split(path, model.getCurrentIsWindows(isLocal)); final list = PathUtil.split(path, isWindows);
breadCrumbList.addAll(list.asMap().entries.map((e) => BreadCrumbItem( breadCrumbList.addAll(list.asMap().entries.map((e) => BreadCrumbItem(
content: TextButton( content: TextButton(
child: Text(e.value), child: Text(e.value),
@ -934,14 +935,6 @@ class _FileManagerPageState extends State<FileManagerPage>
return breadCrumbList; return breadCrumbList;
} }
bool isWindows(bool isLocal) {
if (isLocal) {
return Platform.isWindows;
} else {
return _ffi.ffiModel.pi.platform.toLowerCase() == "windows";
}
}
breadCrumbScrollToEnd(bool isLocal) { breadCrumbScrollToEnd(bool isLocal) {
Future.delayed(Duration(milliseconds: 200), () { Future.delayed(Duration(milliseconds: 200), () {
final breadCrumbScroller = getBreadCrumbScrollController(isLocal); final breadCrumbScroller = getBreadCrumbScrollController(isLocal);

11
flutter/lib/mobile/pages/file_manager_page.dart
View File

@ -138,7 +138,7 @@ class _FileManagerPageState extends State<FileManagerPage> {
child: Row( child: Row(
children: [ children: [
Icon( Icon(
model.currentShowHidden model.getCurrentShowHidden()
? Icons.check_box_outlined ? Icons.check_box_outlined
: Icons.check_box_outline_blank, : Icons.check_box_outline_blank,
color: Theme.of(context).iconTheme.color), color: Theme.of(context).iconTheme.color),
@ -185,7 +185,8 @@ class _FileManagerPageState extends State<FileManagerPage> {
model.createDir(PathUtil.join( model.createDir(PathUtil.join(
model.currentDir.path, model.currentDir.path,
name.value.text, name.value.text,
model.currentIsWindows)); model
.getCurrentIsWindows()));
close(); close();
} }
}, },
@ -351,12 +352,12 @@ class _FileManagerPageState extends State<FileManagerPage> {
if (model.currentHome.startsWith(list[0])) { if (model.currentHome.startsWith(list[0])) {
// absolute path // absolute path
for (var item in list) { for (var item in list) {
path = PathUtil.join(path, item, model.currentIsWindows); path = PathUtil.join(path, item, model.getCurrentIsWindows());
} }
} else { } else {
path += model.currentHome; path += model.currentHome;
for (var item in list) { for (var item in list) {
path = PathUtil.join(path, item, model.currentIsWindows); path = PathUtil.join(path, item, model.getCurrentIsWindows());
} }
} }
model.openDirectory(path); model.openDirectory(path);
@ -500,7 +501,7 @@ class _FileManagerPageState extends State<FileManagerPage> {
List<BreadCrumbItem> getPathBreadCrumbItems( List<BreadCrumbItem> getPathBreadCrumbItems(
void Function() onHome, void Function(List<String>) onPressed) { void Function() onHome, void Function(List<String>) onPressed) {
final path = model.currentShortPath; final path = model.currentShortPath;
final list = PathUtil.split(path, model.currentIsWindows); final list = PathUtil.split(path, model.getCurrentIsWindows());
final breadCrumbList = [ final breadCrumbList = [
BreadCrumbItem( BreadCrumbItem(
content: IconButton( content: IconButton(

33
flutter/lib/models/file_model.dart
View File

@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/common.dart';
@ -144,18 +145,14 @@ class FileModel extends ChangeNotifier {
} }
} }
bool get currentShowHidden => bool getCurrentShowHidden([bool? isLocal]) {
_isSelectedLocal ? _localOption.showHidden : _remoteOption.showHidden; final isLocal_ = isLocal ?? _isSelectedLocal;
return isLocal_ ? _localOption.showHidden : _remoteOption.showHidden;
bool getCurrentShowHidden(bool isLocal) {
return isLocal ? _localOption.showHidden : _remoteOption.showHidden;
} }
bool get currentIsWindows => bool getCurrentIsWindows([bool? isLocal]) {
_isSelectedLocal ? _localOption.isWindows : _remoteOption.isWindows; final isLocal_ = isLocal ?? _isSelectedLocal;
return isLocal_ ? _localOption.isWindows : _remoteOption.isWindows;
bool getCurrentIsWindows(bool isLocal) {
return isLocal ? _localOption.isWindows : _remoteOption.isWindows;
} }
final _fileFetcher = FileFetcher(); final _fileFetcher = FileFetcher();
@ -330,13 +327,13 @@ class FileModel extends ChangeNotifier {
_localOption.showHidden = (await bind.sessionGetPeerOption( _localOption.showHidden = (await bind.sessionGetPeerOption(
id: parent.target?.id ?? "", name: "local_show_hidden")) id: parent.target?.id ?? "", name: "local_show_hidden"))
.isNotEmpty; .isNotEmpty;
_localOption.isWindows = Platform.isWindows;
_remoteOption.showHidden = (await bind.sessionGetPeerOption( _remoteOption.showHidden = (await bind.sessionGetPeerOption(
id: parent.target?.id ?? "", name: "remote_show_hidden")) id: parent.target?.id ?? "", name: "remote_show_hidden"))
.isNotEmpty; .isNotEmpty;
_remoteOption.isWindows = parent.target?.ffiModel.pi.platform == "Windows"; _remoteOption.isWindows =
parent.target?.ffiModel.pi.platform.toLowerCase() == "windows";
debugPrint("remote platform: ${parent.target?.ffiModel.pi.platform}");
await Future.delayed(Duration(milliseconds: 100)); await Future.delayed(Duration(milliseconds: 100));
@ -404,14 +401,10 @@ class FileModel extends ChangeNotifier {
if (!isBack) { if (!isBack) {
pushHistory(isLocal); pushHistory(isLocal);
} }
final showHidden = final showHidden = getCurrentShowHidden(isLocal);
isLocal ? _localOption.showHidden : _remoteOption.showHidden; final isWindows = getCurrentIsWindows(isLocal);
final isWindows =
isLocal ? _localOption.isWindows : _remoteOption.isWindows;
// process /C:\ -> C:\ on Windows // process /C:\ -> C:\ on Windows
if (isLocal if (isWindows && path.length > 1 && path[0] == '/') {
? _localOption.isWindows
: _remoteOption.isWindows && path.length > 1 && path[0] == '/') {
path = path.substring(1); path = path.substring(1);
if (path[path.length - 1] != '\\') { if (path[path.length - 1] != '\\') {
path = "$path\\"; path = "$path\\";