del file_manager pub;add send files

lib/models/file_model.dart

@@ -1,14 +1,9 @@
 import 'dart:convert';
-import 'dart:io';
+import 'package:path/path.dart' as p;
-import 'dart:typed_data';
-
-import 'package:file_manager/enums/sort_by.dart';
 import 'package:flutter/material.dart';
-
 import 'model.dart';
 
-//  BIG TODO  remove file manager !
+enum SortBy { name, type, date, size }
-
 
 // enum FileType {
 //   Dir = 0,
@@ -19,37 +14,30 @@ import 'model.dart';
 // }
 
 class FileDirectory {
-  // List<Entry> entries = [];
+  List<Entry> entries = [];
-  List<RemoteFileSystemEntity> entries = [];
   int id = 0;
   String path = "";
 
+  String get parent => p.dirname(path);
+
   FileDirectory();
 
-  FileDirectory.fromJson(Map<String, dynamic> json,SortBy sort) {
+  FileDirectory.fromJson(Map<String, dynamic> json, SortBy sort) {
     id = json['id'];
     path = json['path'];
     if (json['entries'] != null) {
-      entries = <RemoteFileSystemEntity>[];
+      entries = <Entry>[];
       json['entries'].forEach((v) {
-        entries.add(new Entry.fromJson(v).toRemoteFileSystemEntity(path));
+        entries.add(new Entry.fromJson(v));
       });
-      entries = _sortRemoteEntitiesList(entries, sort);
+      entries = _sortList(entries, sort);
     }
   }
 
-  changeSortStyle(SortBy sort){
+  changeSortStyle(SortBy sort) {
-    entries = _sortRemoteEntitiesList(entries, sort);
+    entries = _sortList(entries, sort);
   }
 
-  // Map<String, dynamic> toJson() {
-  //   final Map<String, dynamic> data = new Map<String, dynamic>();
-  //   data['entries'] = this.entries.map((v) => v.toJson()).toList();
-  //   data['id'] = this.id;
-  //   data['path'] = this.path;
-  //   return data;
-  // }
-
   clear() {
     entries = [];
     id = 0;
@@ -72,476 +60,157 @@ class Entry {
     size = json['size'];
   }
 
-  RemoteFileSystemEntity toRemoteFileSystemEntity(String parentPath) {
+  bool get isFile => entryType > 3;
-    return RemoteFileSystemEntity.from("$parentPath/$name", entryType, modifiedTime, size);
-  }
 
-  Map<String, dynamic> toJson() {
+  bool get isDirectory => entryType <= 3;
-    final Map<String, dynamic> data = new Map<String, dynamic>();
+
-    data['entry_type'] = this.entryType;
+  DateTime lastModified() {
-    data['modified_time'] = this.modifiedTime;
+    return DateTime.fromMillisecondsSinceEpoch(modifiedTime * 1000);
-    data['name'] = this.name;
-    data['size'] = this.size;
-    return data;
   }
 }
 
 // TODO 使用工厂单例模式
 
-class RemoteFileModel extends ChangeNotifier {
+class FileModel extends ChangeNotifier {
+  var _jobCount = 0;
 
   SortBy _sortStyle = SortBy.name;
+
   SortBy get sortStyle => _sortStyle;
 
+  FileDirectory _currentLocalDir = FileDirectory();
+
+  FileDirectory get currentLocalDir => _currentLocalDir;
+
   FileDirectory _currentRemoteDir = FileDirectory();
+
   FileDirectory get currentRemoteDir => _currentRemoteDir;
 
-  tryUpdateRemoteDir(String fd) {
+  tryUpdateDir(String fd, bool isLocal) {
-    debugPrint("tryUpdateRemoteDir:$fd");
     try {
-      final fileDir = FileDirectory.fromJson(jsonDecode(fd),_sortStyle);
+      final fileDir = FileDirectory.fromJson(jsonDecode(fd), _sortStyle);
-      _currentRemoteDir = fileDir;
+      if (isLocal) {
-      debugPrint("_currentRemoteDir:${_currentRemoteDir.path}");
+        _currentLocalDir = fileDir;
+      } else {
+        _currentRemoteDir = fileDir;
+      }
       notifyListeners();
     } catch (e) {
-      debugPrint("tryUpdateRemoteDir fail:$fd");
+      debugPrint("tryUpdateDir fail:$fd");
     }
   }
 
-  goToParentDirectory() {
+  refresh(bool isLocal){
-    var parentPath = "";
+    openDirectory(isLocal?_currentLocalDir.path:_currentRemoteDir.path,isLocal);
-    if (_currentRemoteDir.path == "") {
+  }
-      parentPath = "";
+
+  openDirectory(String path, bool isLocal) {
+    if (isLocal) {
+      final res = FFI.getByName("read_dir", path);
+      tryUpdateDir(res, true);
     } else {
-      parentPath = Directory(_currentRemoteDir.path).parent.path;
+      FFI.setByName("read_remote_dir", path);
     }
-    FFI.setByName("read_remote_dir", parentPath);
   }
 
-  changeSortStyle(SortBy sort){
+  goToParentDirectory(bool isLocal) {
+    final fd = isLocal ? _currentLocalDir : _currentRemoteDir;
+    openDirectory(fd.parent, isLocal);
+  }
+
+  sendFiles(String path, String to, bool showHidden, bool isRemote) {
+    _jobCount++;
+    final msg = {
+      "id": _jobCount.toString(),
+      "path": path,
+      "to": to,
+      "show_hidden": showHidden.toString(),
+      "is_remote": isRemote.toString() // isRemote 指path的位置而不是to的位置
+    };
+    FFI.setByName("send_files",jsonEncode(msg));
+  }
+
+  changeSortStyle(SortBy sort) {
+    _sortStyle = sort;
+    _currentLocalDir.changeSortStyle(sort);
     _currentRemoteDir.changeSortStyle(sort);
     notifyListeners();
   }
 
-  @override
+  void clear() {
-  void dispose() {
+    _currentLocalDir.clear();
     _currentRemoteDir.clear();
-    super.dispose();
   }
 }
 
-// int entryType = 4;
-// int modifiedTime = 0;
-// String name = "";
-// int size = 0;
-
-class RemoteFileSystemEntity extends FileSystemEntity {
-  int entryType;
-  int modifiedTime;
-  String path;
-  int size;
-
-  RemoteFileSystemEntity(this.path,
-      this.entryType,
-      this.modifiedTime,
-      this.size);
-
-
-  // 工厂模式 自动输出两个类型
-  factory RemoteFileSystemEntity.from(
-     String path,
-     int entryType,
-     int modifiedTime,
-     int size
-  ) {
-    if (entryType > 3) {
-      return RemoteFile(path,
-          entryType,
-          modifiedTime,
-          size);
-    } else {
-      return RemoteFile(path,
-          entryType,
-          modifiedTime,
-          size);
-    }
-  }
-
-  DateTime lastModifiedSync() {
-    return DateTime.fromMillisecondsSinceEpoch(modifiedTime * 1000);
-  }
-
-  int lengthSync() {
-    return size;
-  }
-
-  bool isFile(){
-    return entryType > 3;
-  }
-
-  @override
-  // TODO: implement absolute
-  FileSystemEntity get absolute => throw UnimplementedError();
-
-  @override
-  Future<bool> exists() {
-    // TODO: implement exists
-    throw UnimplementedError();
-  }
-
-  @override
-  bool existsSync() {
-    // TODO: implement existsSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<FileSystemEntity> rename(String newPath) {
-    // TODO: implement rename
-    throw UnimplementedError();
-  }
-
-  @override
-  FileSystemEntity renameSync(String newPath) {
-    // TODO: implement renameSync
-    throw UnimplementedError();
-  }
-}
-
-class RemoteDir extends RemoteFileSystemEntity implements Directory {
-  RemoteDir(path, entryType, modifiedTime, size)
-      : super(path, entryType, modifiedTime, size);
-
-  @override
-  // TODO: implement absolute
-  Directory get absolute => throw UnimplementedError();
-
-  @override
-  Future<Directory> create({bool recursive = false}) {
-    // TODO: implement create
-    throw UnimplementedError();
-  }
-
-  @override
-  void createSync({bool recursive = false}) {
-    // TODO: implement createSync
-  }
-
-  @override
-  Future<Directory> createTemp([String? prefix]) {
-    // TODO: implement createTemp
-    throw UnimplementedError();
-  }
-
-  @override
-  Directory createTempSync([String? prefix]) {
-    // TODO: implement createTempSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<bool> exists() {
-    // TODO: implement exists
-    throw UnimplementedError();
-  }
-
-  @override
-  bool existsSync() {
-    // TODO: implement existsSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Stream<FileSystemEntity> list(
-      {bool recursive = false, bool followLinks = true}) {
-    // TODO: implement list
-    throw UnimplementedError();
-  }
-
-  @override
-  List<FileSystemEntity> listSync(
-      {bool recursive = false, bool followLinks = true}) {
-    // TODO: implement listSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<Directory> rename(String newPath) {
-    // TODO: implement rename
-    throw UnimplementedError();
-  }
-
-  @override
-  Directory renameSync(String newPath) {
-    // TODO: implement renameSync
-    throw UnimplementedError();
-  }
-}
-
-class RemoteFile extends RemoteFileSystemEntity implements File {
-
-  RemoteFile(path, entryType, modifiedTime, size)
-      : super(path, entryType, modifiedTime, size);
-
-  // ***************************
-
-  @override
-  Future<int> length() {
-    // TODO: implement length
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<DateTime> lastModified() {
-    // TODO: implement lastModified
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<File> copy(String newPath) {
-    // TODO: implement copy
-    throw UnimplementedError();
-  }
-
-  @override
-  File copySync(String newPath) {
-    // TODO: implement copySync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<File> create({bool recursive = false}) {
-    // TODO: implement create
-    throw UnimplementedError();
-  }
-
-  @override
-  void createSync({bool recursive = false}) {
-    // TODO: implement createSync
-  }
-
-  @override
-  Future<bool> exists() {
-    // TODO: implement exists
-    throw UnimplementedError();
-  }
-
-  @override
-  bool existsSync() {
-    // TODO: implement existsSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<DateTime> lastAccessed() {
-    // TODO: implement lastAccessed
-    throw UnimplementedError();
-  }
-
-  @override
-  DateTime lastAccessedSync() {
-    // TODO: implement lastAccessedSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<RandomAccessFile> open({FileMode mode = FileMode.read}) {
-    // TODO: implement open
-    throw UnimplementedError();
-  }
-
-  @override
-  Stream<List<int>> openRead([int? start, int? end]) {
-    // TODO: implement openRead
-    throw UnimplementedError();
-  }
-
-  @override
-  RandomAccessFile openSync({FileMode mode = FileMode.read}) {
-    // TODO: implement openSync
-    throw UnimplementedError();
-  }
-
-  @override
-  IOSink openWrite({FileMode mode = FileMode.write, Encoding encoding = utf8}) {
-    // TODO: implement openWrite
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<Uint8List> readAsBytes() {
-    // TODO: implement readAsBytes
-    throw UnimplementedError();
-  }
-
-  @override
-  Uint8List readAsBytesSync() {
-    // TODO: implement readAsBytesSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<List<String>> readAsLines({Encoding encoding = utf8}) {
-    // TODO: implement readAsLines
-    throw UnimplementedError();
-  }
-
-  @override
-  List<String> readAsLinesSync({Encoding encoding = utf8}) {
-    // TODO: implement readAsLinesSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<String> readAsString({Encoding encoding = utf8}) {
-    // TODO: implement readAsString
-    throw UnimplementedError();
-  }
-
-  @override
-  String readAsStringSync({Encoding encoding = utf8}) {
-    // TODO: implement readAsStringSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future<File> rename(String newPath) {
-    // TODO: implement rename
-    throw UnimplementedError();
-  }
-
-  @override
-  File renameSync(String newPath) {
-    // TODO: implement renameSync
-    throw UnimplementedError();
-  }
-
-  @override
-  Future setLastAccessed(DateTime time) {
-    // TODO: implement setLastAccessed
-    throw UnimplementedError();
-  }
-
-  @override
-  void setLastAccessedSync(DateTime time) {
-    // TODO: implement setLastAccessedSync
-  }
-
-  @override
-  Future setLastModified(DateTime time) {
-    // TODO: implement setLastModified
-    throw UnimplementedError();
-  }
-
-  @override
-  void setLastModifiedSync(DateTime time) {
-    // TODO: implement setLastModifiedSync
-  }
-
-  @override
-  Future<File> writeAsBytes(List<int> bytes,
-      {FileMode mode = FileMode.write, bool flush = false}) {
-    // TODO: implement writeAsBytes
-    throw UnimplementedError();
-  }
-
-  @override
-  void writeAsBytesSync(List<int> bytes,
-      {FileMode mode = FileMode.write, bool flush = false}) {
-    // TODO: implement writeAsBytesSync
-  }
-
-  @override
-  Future<File> writeAsString(String contents,
-      {FileMode mode = FileMode.write,
-        Encoding encoding = utf8,
-        bool flush = false}) {
-    // TODO: implement writeAsString
-    throw UnimplementedError();
-  }
-
-  @override
-  void writeAsStringSync(String contents,
-      {FileMode mode = FileMode.write,
-        Encoding encoding = utf8,
-        bool flush = false}) {
-    // TODO: implement writeAsStringSync
-  }
-
-  @override
-  // TODO: implement absolute
-  File get absolute => throw UnimplementedError();
-}
-
-
 class _PathStat {
   final String path;
   final DateTime dateTime;
+
   _PathStat(this.path, this.dateTime);
 }
 
 // code from file_manager pkg after edit
-List<RemoteFileSystemEntity> _sortRemoteEntitiesList(
+List<Entry> _sortList(List<Entry> list, SortBy sortType) {
-    List<RemoteFileSystemEntity> list, SortBy sortType) {
   if (sortType == SortBy.name) {
     // making list of only folders.
-    final dirs = list.where((element) => element is Directory).toList();
+    final dirs = list.where((element) => element.isDirectory).toList();
     // sorting folder list by name.
-    dirs.sort((a, b) => a.path.toLowerCase().compareTo(b.path.toLowerCase()));
+    dirs.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
 
     // making list of only flies.
-    final files = list.where((element) => element is File).toList();
+    final files = list.where((element) => element.isFile).toList();
     // sorting files list by name.
-    files.sort((a, b) => a.path.toLowerCase().compareTo(b.path.toLowerCase()));
+    files.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
 
     // first folders will go to list (if available) then files will go to list.
     return [...dirs, ...files];
   } else if (sortType == SortBy.date) {
     // making the list of Path & DateTime
     List<_PathStat> _pathStat = [];
-    for (RemoteFileSystemEntity e in list) {
+    for (Entry e in list) {
-      _pathStat.add(_PathStat(e.path, e.lastModifiedSync()));
+      _pathStat.add(_PathStat(e.name, e.lastModified()));
     }
 
     // sort _pathStat according to date
     _pathStat.sort((b, a) => a.dateTime.compareTo(b.dateTime));
 
-    // sorting [list] accroding to [_pathStat]
+    // sorting [list] according to [_pathStat]
     list.sort((a, b) => _pathStat
-        .indexWhere((element) => element.path == a.path)
+        .indexWhere((element) => element.path == a.name)
-        .compareTo(_pathStat.indexWhere((element) => element.path == b.path)));
+        .compareTo(_pathStat.indexWhere((element) => element.path == b.name)));
     return list;
   } else if (sortType == SortBy.type) {
     // making list of only folders.
-    final dirs = list.where((element) => element is Directory).toList();
+    final dirs = list.where((element) => element.isDirectory).toList();
 
     // sorting folders by name.
-    dirs.sort((a, b) => a.path.toLowerCase().compareTo(b.path.toLowerCase()));
+    dirs.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
 
     // making the list of files
-    final files = list.where((element) => element is File).toList();
+    final files = list.where((element) => element.isFile).toList();
 
     // sorting files list by extension.
-    files.sort((a, b) => a.path
+    files.sort((a, b) => a.name
         .toLowerCase()
         .split('.')
         .last
-        .compareTo(b.path.toLowerCase().split('.').last));
+        .compareTo(b.name.toLowerCase().split('.').last));
     return [...dirs, ...files];
   } else if (sortType == SortBy.size) {
     // create list of path and size
     Map<String, int> _sizeMap = {};
-    for (RemoteFileSystemEntity e in list) {
+    for (Entry e in list) {
-      _sizeMap[e.path] = e.lengthSync();
+      _sizeMap[e.name] = e.size;
     }
 
     // making list of only folders.
-    final dirs = list.where((element) => element is Directory).toList();
+    final dirs = list.where((element) => element.isDirectory).toList();
     // sorting folder list by name.
-    dirs.sort((a, b) => a.path.toLowerCase().compareTo(b.path.toLowerCase()));
+    dirs.sort((a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()));
 
     // making list of only flies.
-    final files = list.where((element) => element is File).toList();
+    final files = list.where((element) => element.isFile).toList();
 
     // creating sorted list of [_sizeMapList] by size.
     final List<MapEntry<String, int>> _sizeMapList = _sizeMap.entries.toList();
@@ -549,9 +218,9 @@ List<RemoteFileSystemEntity> _sortRemoteEntitiesList(
 
     // sort [list] according to [_sizeMapList]
     files.sort((a, b) => _sizeMapList
-        .indexWhere((element) => element.key == a.path)
+        .indexWhere((element) => element.key == a.name)
         .compareTo(
-        _sizeMapList.indexWhere((element) => element.key == b.path)));
+            _sizeMapList.indexWhere((element) => element.key == b.name)));
     return [...dirs, ...files];
   }
   return [];

lib/models/model.dart

@@ -135,7 +135,7 @@ class FfiModel with ChangeNotifier {
       } else if (name == 'chat') {
         FFI.chatModel.receive(evt['text'] ?? "");
       } else if (name == 'file_dir') {
-        FFI.remoteFileModel.tryUpdateRemoteDir(evt['value'] ?? "");
+        FFI.fileModel.tryUpdateDir(evt['value'] ?? "",false);
       }
     }
     if (pos != null) FFI.cursorModel.updateCursorPosition(pos);
@@ -695,7 +695,7 @@ class FFI {
   static final canvasModel = CanvasModel();
   static final serverModel = ServerModel();
   static final chatModel = ChatModel();
-  static final remoteFileModel = RemoteFileModel();
+  static final fileModel = FileModel();
 
   static String getId() {
     return getByName('remote_id');

lib/pages/connection_page.dart

@@ -54,11 +54,12 @@ class _ConnectionPageState extends State<ConnectionPage> {
             getSearchBarUI(),
             Container(height: 12),
             getPeers(),
-            // ElevatedButton(
+            ElevatedButton(
-            //     onPressed: () {
+                onPressed: () {
-            //       toggleChatOverlay();
+                  final res = FFI.getByName("read_dir");
-            //     },
+                  debugPrint("read_dir : $res");
-            //     child: Text("Chat Debug"))
+                },
+                child: Text("Local File Debug"))
           ]),
     );
   }

lib/pages/file_manager_page.dart

@@ -1,11 +1,10 @@
 import 'dart:async';
-import 'dart:io';
-import 'package:file_manager/file_manager.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_hbb/models/file_model.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_breadcrumb/flutter_breadcrumb.dart';
+import 'package:path/path.dart' as p;
 
 import '../common.dart';
 import '../models/model.dart';
@@ -20,30 +19,33 @@ class FileManagerPage extends StatefulWidget {
 }
 
 class _FileManagerPageState extends State<FileManagerPage> {
-  final _localFileModel = FileManagerController();
+  final _fileModel = FFI.fileModel;
-  final _remoteFileModel = FFI.remoteFileModel;
   Timer? _interval;
   Timer? _timer;
   var _reconnects = 1;
+
   var _isLocal = false;
   var _selectMode = false;
-  final List<String> _selectedItems = [];
+  final List<String> _selectedItems = []; // 换成entry对象数组
 
-  // final _breadCrumbScrollController = ScrollController();
 
   @override
   void initState() {
     super.initState();
     showLoading(translate('Connecting...'));
     FFI.connect(widget.id, isFileTransfer: true);
+    Future.delayed(Duration(seconds: 1), () {
+      final res = FFI.getByName("read_dir", FFI.getByName("get_home_dir"));
+      debugPrint("read_dir local :$res");
+      _fileModel.tryUpdateDir(res, true);
+    });
     _interval = Timer.periodic(Duration(milliseconds: 30),
         (timer) => FFI.ffiModel.update(widget.id, context, handleMsgBox));
   }
 
   @override
   void dispose() {
-    _remoteFileModel.dispose();
+    _fileModel.clear();
-    _localFileModel.dispose();
     _interval?.cancel();
     FFI.close();
     EasyLoading.dismiss();
@@ -53,7 +55,7 @@ class _FileManagerPageState extends State<FileManagerPage> {
   @override
   Widget build(BuildContext context) {
     return ChangeNotifierProvider.value(
-        value: _remoteFileModel,
+        value: _fileModel,
         child: Scaffold(
           backgroundColor: MyTheme.grayBg,
           appBar: AppBar(
@@ -66,10 +68,11 @@ class _FileManagerPageState extends State<FileManagerPage> {
             title: Text(translate(_isLocal ? "Local" : "Remote")),
             actions: [
               IconButton(
-                  icon: Icon(Icons.change_circle),
+                icon: Icon(Icons.change_circle),
-                  onPressed: () => setState(() {
+                onPressed: () => setState(() {
-                        _isLocal = !_isLocal;
+                  _isLocal = !_isLocal;
-                      })),
+                }),
+              )
             ],
           ),
           body: body(),
@@ -77,94 +80,71 @@ class _FileManagerPageState extends State<FileManagerPage> {
         ));
   }
 
-  Widget body() => Consumer<RemoteFileModel>(
+  Widget body() => Consumer<FileModel>(builder: (context, fileModel, _child) {
-      builder: (context, remoteModel, _child) => FileManager(
+        final fd =
-          controller: _localFileModel,
+            _isLocal ? fileModel.currentLocalDir : fileModel.currentRemoteDir;
-          emptyFolder: emptyPage(),
+        final entries = fd.entries;
-          builder: (context, localSnapshot) {
+        return Column(children: [
-            final snapshot =
+          headTools(),
-                _isLocal ? localSnapshot : remoteModel.currentRemoteDir.entries;
+          Expanded(
-            return Column(children: [
+              child: ListView.builder(
-              headTools(),
+            itemCount: entries.length + 1,
-              Expanded(
+            itemBuilder: (context, index) {
-                  child: ListView.builder(
+              if (index >= entries.length) {
-                itemCount: snapshot.length + 1,
+                // 添加尾部信息 文件统计信息等
-                itemBuilder: (context, index) {
+                // 添加快速返回上部
-                  if (index >= snapshot.length) {
+                // 使用 bottomSheet 提示以选择的文件数量 点击后展开查看更多
-                    // 添加尾部信息 文件统计信息等
+                return listTail();
-                    // 添加快速返回上部
+              }
-                    // 使用 bottomSheet 提示以选择的文件数量 点击后展开查看更多
+              final path = p.join(fd.path,entries[index].name);
-                    return listTail();
+              var selected = false;
-                  }
+              if (_selectMode) {
-
+                selected = _selectedItems.any((e) => e == path);
-                  var isFile = false;
+              }
-                  if (_isLocal){
+              return Card(
-                    isFile = FileManager.isFile(snapshot[index]);
+                child: ListTile(
-                  }else {
+                  leading: entries[index].isFile
-                    isFile = (snapshot[index] as RemoteFileSystemEntity).isFile();
+                      ? Icon(Icons.feed_outlined)
-                  }
+                      : Icon(Icons.folder),
-
+                  title: Text(entries[index].name),
-                  final path = snapshot[index].path;
+                  trailing: _selectMode
-                  var selected = false;
+                      ? Checkbox(
-                  if (_selectMode) {
+                          value: selected,
-                    selected = _selectedItems.any((e) => e == path);
+                          onChanged: (v) {
-                  }
+                            if (v == null) return;
-                  return Card(
+                            if (v && !selected) {
-                    child: ListTile(
+                              setState(() {
-                      leading: isFile
+                                _selectedItems.add(path);
-                            ? Icon(Icons.feed_outlined)
+                              });
-                            : Icon(Icons.folder),
+                            } else if (!v && selected) {
-                      title: Text(FileManager.basename(snapshot[index])),
+                              setState(() {
-                      trailing: _selectMode
+                                _selectedItems.remove(path);
-                          ? Checkbox(
+                              });
-                              value: selected,
+                            }
-                              onChanged: (v) {
+                          })
-                                if (v == null) return;
+                      : null,
-                                if (v && !selected) {
+                  onTap: () {
-                                  setState(() {
+                    if (entries[index].isDirectory) {
-                                    _selectedItems.add(path);
+                      _fileModel.openDirectory(path,_isLocal);
-                                  });
+                    } else {
-                                } else if (!v && selected) {
+                      // Perform file-related tasks.
-                                  setState(() {
+                    }
-                                    _selectedItems.remove(path);
+                  },
-                                  });
+                  onLongPress: () {
-                                }
+                    setState(() {
-                              })
+                      _selectedItems.clear();
-                          : null,
+                      _selectMode = !_selectMode;
-                      onTap: () {
+                    });
-                        if (!isFile) {
+                  },
-                          if (_isLocal) {
+                ),
-                            _localFileModel.openDirectory(snapshot[index]);
+              );
-                          } else {
+            },
-                            readRemoteDir(path);
+          ))
-                          }
+        ]);
-                        } else {
+      });
-                          // Perform file-related tasks.
-                        }
-                      },
-                      onLongPress: () {
-                        setState(() {
-                          _selectedItems.clear();
-                          _selectMode = !_selectMode;
-                        });
-                      },
-                    ),
-                  );
-                },
-              ))
-            ]);
-          }));
 
   goBack() {
-    if (_isLocal) {
+    _fileModel.goToParentDirectory(_isLocal);
-      _localFileModel.goToParentDirectory();
-    } else {
-      _remoteFileModel.goToParentDirectory();
-    }
-  }
-
-  void readRemoteDir(String path) {
-    FFI.setByName("read_remote_dir", path);
   }
 
   void handleMsgBox(Map<String, dynamic> evt, String id) {
@@ -210,28 +190,42 @@ class _FileManagerPageState extends State<FileManagerPage> {
             children: [
               // IconButton(onPressed: () {}, icon: Icon(Icons.sort)),
               PopupMenuButton<SortBy>(
-                icon: Icon(Icons.sort),
+                  icon: Icon(Icons.sort),
                   itemBuilder: (context) {
-                    return SortBy.values.map((e) => PopupMenuItem(
+                    return SortBy.values
-                      child: Text(translate(e.toString().split(".").last)),
+                        .map((e) => PopupMenuItem(
-                      value: e,
+                              child:
-                    )).toList();
+                                  Text(translate(e.toString().split(".").last)),
+                              value: e,
+                            ))
+                        .toList();
                   },
-                  onSelected: changeSortStyle),
+                  onSelected: _fileModel.changeSortStyle),
-              IconButton(onPressed: () {}, icon: Icon(Icons.more_vert)),
+              PopupMenuButton<String>(
+                  icon: Icon(Icons.more_vert),
+                  itemBuilder: (context) {
+                    return [
+                      PopupMenuItem(
+                        child: Row(
+                          children: [
+                            Icon(Icons.refresh),
+                            Text("刷新")
+                          ],
+                        ),
+                        value: "refresh",
+                      )
+                    ];
+                  },
+                  onSelected: (v){
+                    if(v == "refresh"){
+                      _fileModel.refresh(_isLocal);
+                    }
+                  }),
             ],
           )
         ],
       ));
 
-  changeSortStyle(SortBy sort){
-    if(_isLocal){
-      _localFileModel.sortedBy = sort;
-    }else{
-      _remoteFileModel.changeSortStyle(sort);
-    }
-  }
-
   Widget emptyPage() {
     return Column(
       children: [
@@ -279,7 +273,10 @@ class _FileManagerPageState extends State<FileManagerPage> {
                     children: [
                       IconButton(
                         icon: Icon(Icons.paste),
-                        onPressed: () {},
+                        onPressed: () {
+                          debugPrint("paste");
+                          _fileModel.sendFiles(_selectedItems.first, _fileModel.currentRemoteDir.path+'/'+_selectedItems.first.split('/').last, false, false);
+                        },
                       ),
                       IconButton(
                         icon: Icon(Icons.delete_forever),
@@ -305,8 +302,8 @@ class _FileManagerPageState extends State<FileManagerPage> {
   List<BreadCrumbItem> getPathBreadCrumbItems(
       void Function() onHome, void Function(String) onPressed) {
     final path = _isLocal
-        ? _localFileModel.getCurrentPath
+        ? _fileModel.currentLocalDir.path
-        : _remoteFileModel.currentRemoteDir.path;
+        : _fileModel.currentRemoteDir.path;
     final list = path.trim().split('/');
     list.remove("");
     final breadCrumbList = [
@@ -325,14 +322,4 @@ class _FileManagerPageState extends State<FileManagerPage> {
     return breadCrumbList;
   }
 
-// // NOT GOOD
-// void breadCrumbToLast() {
-//   try {
-//     _breadCrumbScrollController.animateTo(
-//       _breadCrumbScrollController.position.maxScrollExtent,
-//       curve: Curves.easeOut,
-//       duration: const Duration(milliseconds: 300),
-//     );
-//   } catch (e) {}
-// }
 }

pubspec.yaml

@@ -48,7 +48,6 @@ dependencies:
   dash_chat: ^1.1.16
   draggable_float_widget: ^0.0.2
   settings_ui: ^2.0.2
-  file_manager: ^1.0.0
   flutter_breadcrumb: ^1.0.1
 
 dev_dependencies: