mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2026-02-23 16:45:27 +01:00
new: upgrade on macos
This commit is contained in:
@@ -82,7 +82,7 @@ class _PrivateKeyListState extends State<PrivateKeysListPage>
|
||||
if (isDesktop && store.box.keys.isEmpty) {
|
||||
final home = getHomeDir();
|
||||
if (home == null) return;
|
||||
final idRsaFile = File(pathJoin(home, '.ssh/id_rsa'));
|
||||
final idRsaFile = File(joinPath(home, '.ssh/id_rsa'));
|
||||
if (!idRsaFile.existsSync()) return;
|
||||
final sysPk = PrivateKeyInfo(
|
||||
id: 'system',
|
||||
|
||||
@@ -7,7 +7,7 @@ import 'package:provider/provider.dart';
|
||||
import 'package:toolbox/core/extension/media_queryx.dart';
|
||||
|
||||
import '../../../core/route.dart';
|
||||
import '../../../core/utils/misc.dart' hide pathJoin;
|
||||
import '../../../core/utils/misc.dart';
|
||||
import '../../../core/utils/platform.dart';
|
||||
import '../../../core/utils/ui.dart';
|
||||
import '../../../data/model/app/net_view.dart';
|
||||
|
||||
@@ -37,7 +37,7 @@ class LocalStoragePage extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _LocalStoragePageState extends State<LocalStoragePage> {
|
||||
PathWithPrefix? _path;
|
||||
LocalPath? _path;
|
||||
late S _s;
|
||||
|
||||
@override
|
||||
@@ -45,12 +45,12 @@ class _LocalStoragePageState extends State<LocalStoragePage> {
|
||||
super.initState();
|
||||
if (widget.initDir != null) {
|
||||
setState(() {
|
||||
_path = PathWithPrefix(widget.initDir!);
|
||||
_path = LocalPath(widget.initDir!);
|
||||
});
|
||||
} else {
|
||||
sftpDir.then((dir) {
|
||||
setState(() {
|
||||
_path = PathWithPrefix(dir.path);
|
||||
_path = LocalPath(dir.path);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ import '../../../core/extension/numx.dart';
|
||||
import '../../../core/extension/stringx.dart';
|
||||
import '../../../core/route.dart';
|
||||
import '../../../core/utils/misc.dart';
|
||||
import '../../../core/utils/platform.dart' hide pathJoin;
|
||||
import '../../../core/utils/platform.dart';
|
||||
import '../../../core/utils/ui.dart';
|
||||
import '../../../data/model/server/server_private_info.dart';
|
||||
import '../../../data/model/sftp/absolute_path.dart';
|
||||
|
||||
@@ -2,16 +2,16 @@ import 'dart:io';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_gen/gen_l10n/l10n.dart';
|
||||
import 'package:toolbox/data/provider/server.dart';
|
||||
|
||||
import '../../core/route.dart';
|
||||
import '../../core/utils/misc.dart' hide pathJoin;
|
||||
import '../../core/utils/misc.dart';
|
||||
import '../../core/utils/platform.dart';
|
||||
import '../../core/utils/server.dart';
|
||||
import '../../core/utils/ui.dart';
|
||||
import '../../data/model/app/menu.dart';
|
||||
import '../../data/model/server/server_private_info.dart';
|
||||
import '../../data/model/server/snippet.dart';
|
||||
import '../../data/provider/server.dart';
|
||||
import '../../data/provider/snippet.dart';
|
||||
import '../../locator.dart';
|
||||
import 'popup_menu.dart';
|
||||
@@ -161,7 +161,7 @@ Future<void> _gotoSSH(
|
||||
|
||||
final path = () {
|
||||
final tempKeyFileName = 'srvbox_pk_${spi.pubKeyId}';
|
||||
return pathJoin(Directory.systemTemp.path, tempKeyFileName);
|
||||
return joinPath(Directory.systemTemp.path, tempKeyFileName);
|
||||
}();
|
||||
final file = File(path);
|
||||
final shouldGenKey = spi.pubKeyId != null;
|
||||
|
||||
Reference in New Issue
Block a user