From 7eecb62f103c0aef5577bd61d90bea3c550f9bf5 Mon Sep 17 00:00:00 2001 From: niuhuan Date: Thu, 7 Oct 2021 11:47:28 +0800 Subject: [PATCH] chooser root option --- README.md | 3 +- go/go.mod | 1 + go/go.sum | 27 ++++++++++++++++ lib/basic/Cross.dart | 15 ++------- lib/basic/config/ChooserRoot.dart | 46 +++++++++++++++++++++++++++ lib/screens/DownloadImportScreen.dart | 19 ++--------- lib/screens/InitScreen.dart | 2 ++ lib/screens/SettingsScreen.dart | 10 ++++++ 8 files changed, 93 insertions(+), 30 deletions(-) create mode 100644 lib/basic/config/ChooserRoot.dart diff --git a/README.md b/README.md index 2765163..32f5a4c 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,8 @@ PIKAPI - 漫画客户端 - 美观易用且无广告的漫画客户端, 能运行在Windows/MacOS/Linux/Android/IOS中。 - 本仓库仅作为学习交流使用, 请您遵守当地法律法规以及开源协议。 -- 您的star和issue是对开发者的莫大鼓励, 可以源仓库下载最新的源码/安装包, 表示支持/提出建议。 +- 您的star和issue是对开发者的莫大鼓励, 可以源仓库下载最新的源码/安装包, 表示支持/提出建议。以及提出您在构建或运行时遇到的困难。 - 源仓库地址 [https://github.com/niuhuan/pikapi-flutter](https://github.com/niuhuan/pikapi-flutter) -- 此项目仅接受简体中文的issues。 ## 界面 / 功能 diff --git a/go/go.mod b/go/go.mod index e9d7dfb..922b6f5 100644 --- a/go/go.mod +++ b/go/go.mod @@ -11,6 +11,7 @@ require ( github.com/niuhuan/pica-go v0.0.0-20210923020558-090104e7b1a7 github.com/pkg/errors v0.9.1 golang.org/x/image v0.0.0-20190802002840-cff245a6509b + golang.org/x/mobile v0.0.0-20210924032853-1c027f395ef7 // indirect golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect gorm.io/driver/sqlite v1.1.4 gorm.io/gorm v1.21.12 diff --git a/go/go.sum b/go/go.sum index 886738f..ca8a902 100644 --- a/go/go.sum +++ b/go/go.sum @@ -1,3 +1,4 @@ +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/PuerkitoBio/goquery v1.7.1 h1:oE+T06D+1T7LNrn91B4aERsRIeCLJ/oPSa6xB9FPnz4= github.com/PuerkitoBio/goquery v1.7.1/go.mod h1:XY0pP4kfraEmmV1O7Uf6XyjoslwsneBbgeDjLYuN8xY= github.com/Xuanwo/go-locale v1.0.0 h1:oqC32Kyiu2XZq+fxtwEg0mWiv9WyDhyHu+sT5cDkgME= @@ -49,16 +50,34 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b h1:+qEpEAPhDZ1o0x3tHzZTQDArnOixOzGD9HUJfcg0mb4= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20210924032853-1c027f395ef7 h1:CyFUjc175y/mbMjxe+WdqI72jguLyjQChKCDe9mfTvg= +golang.org/x/mobile v0.0.0-20210924032853-1c027f395ef7/go.mod h1:c4YKU3ZylDmvbw+H/PSvm42vhdWbuxCzbonauEAP9B8= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200802091954-4b90ce9b60b3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -69,7 +88,15 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/lib/basic/Cross.dart b/lib/basic/Cross.dart index 9db159c..6b62373 100644 --- a/lib/basic/Cross.dart +++ b/lib/basic/Cross.dart @@ -8,6 +8,7 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:pikapi/basic/Common.dart'; import 'package:url_launcher/url_launcher.dart'; import 'Method.dart'; +import 'config/ChooserRoot.dart'; /// 复制内容到剪切板 void copyToClipBoard(BuildContext context, String string) { @@ -66,28 +67,18 @@ Future _saveImageAndroid(String path, BuildContext context) async { /// 选择一个文件夹用于保存文件 Future chooseFolder(BuildContext context) async { - late String root; - if (Platform.isWindows) { - root = '/'; - } else if (Platform.isMacOS) { - root = '/Users'; - } else if (Platform.isLinux) { - root = '/'; - } else if (Platform.isAndroid) { + if (Platform.isAndroid) { var p = await Permission.storage.request(); if (!p.isGranted) { return null; } - root = '/storage/emulated/0'; - } else { - throw 'error'; } return FilesystemPicker.open( title: '选择一个文件夹', pickText: '将文件保存到这里', context: context, fsType: FilesystemType.folder, - rootDirectory: Directory(root), + rootDirectory: Directory(currentChooserRoot()), ); } diff --git a/lib/basic/config/ChooserRoot.dart b/lib/basic/config/ChooserRoot.dart new file mode 100644 index 0000000..a5e300c --- /dev/null +++ b/lib/basic/config/ChooserRoot.dart @@ -0,0 +1,46 @@ +/// 文件夹选择器的根路径 + +import 'dart:io'; + +import 'package:flutter/material.dart'; + +import '../Common.dart'; +import '../Method.dart'; + +const _propertyName = "chooserRoot"; +late String _chooserRoot; + +Future initChooserRoot() async { + _chooserRoot = await method.loadProperty(_propertyName, ""); +} + +String currentChooserRoot() { + if (_chooserRoot == "") { + if (Platform.isWindows) { + return '/'; + } else if (Platform.isMacOS) { + return '/Users'; + } else if (Platform.isLinux) { + return '/'; + } else if (Platform.isAndroid) { + return '/storage/emulated/0'; + } else { + throw 'error'; + } + } + return _chooserRoot; +} + +Future inputChooserRoot(BuildContext context) async { + String? input = await displayTextInputDialog( + context, + '文件夹选择器根路径', + '请输入文件夹选择器根路径', + _chooserRoot, + "导出时选择目录的默认路径, 同时也是根路径, 不能正常导出时也可以尝试设置此选项。", + ); + if (input != null) { + await method.saveProperty(_propertyName, input); + _chooserRoot = input; + } +} diff --git a/lib/screens/DownloadImportScreen.dart b/lib/screens/DownloadImportScreen.dart index de136be..ba399fb 100644 --- a/lib/screens/DownloadImportScreen.dart +++ b/lib/screens/DownloadImportScreen.dart @@ -7,6 +7,7 @@ import 'package:permission_handler/permission_handler.dart'; import 'package:pikapi/basic/Channels.dart'; import 'package:pikapi/basic/Common.dart'; import 'package:pikapi/basic/Method.dart'; +import 'package:pikapi/basic/config/ChooserRoot.dart'; import 'components/ContentLoading.dart'; @@ -79,24 +80,10 @@ class _DownloadImportScreenState extends State { return MaterialButton( height: 80, onPressed: () async { - late String root; - if (Platform.isMacOS) { - root = '/Users'; - } else if (Platform.isWindows) { - root = '/'; - } else if (Platform.isAndroid) { - var p = await Permission.storage.request(); - if (!p.isGranted) { - return; - } - root = '/storage/emulated/0'; - } else { - throw 'error'; - } String? path = await FilesystemPicker.open( - title: 'Open file', + title: '选择要导入的文件', context: context, - rootDirectory: Directory(root), + rootDirectory: Directory(currentChooserRoot()), fsType: FilesystemType.file, folderIconColor: Colors.teal, allowedExtensions: ['.zip'], diff --git a/lib/screens/InitScreen.dart b/lib/screens/InitScreen.dart index 843be5a..878f2cc 100644 --- a/lib/screens/InitScreen.dart +++ b/lib/screens/InitScreen.dart @@ -3,6 +3,7 @@ import 'package:pikapi/basic/config/Address.dart'; import 'package:pikapi/basic/config/AndroidDisplayMode.dart'; import 'package:pikapi/basic/config/AutoClean.dart'; import 'package:pikapi/basic/config/AutoFullScreen.dart'; +import 'package:pikapi/basic/config/ChooserRoot.dart'; import 'package:pikapi/basic/config/ContentFailedReloadAction.dart'; import 'package:pikapi/basic/config/FullScreenAction.dart'; import 'package:pikapi/basic/config/FullScreenUI.dart'; @@ -54,6 +55,7 @@ class _InitScreenState extends State { await initVolumeController(); await initKeyboardController(); await initAndroidDisplayMode(); + await initChooserRoot(); // 登录, 如果token失效重新登录, 网络不好的时候可能需要1分钟 if (await method.preLogin()) { // 如果token或username+password有效则直接进入登录好的界面 diff --git a/lib/screens/SettingsScreen.dart b/lib/screens/SettingsScreen.dart index 34d8daf..d8aa637 100644 --- a/lib/screens/SettingsScreen.dart +++ b/lib/screens/SettingsScreen.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:pikapi/basic/config/AndroidDisplayMode.dart'; import 'package:pikapi/basic/config/AutoClean.dart'; import 'package:pikapi/basic/config/AutoFullScreen.dart'; +import 'package:pikapi/basic/config/ChooserRoot.dart'; import 'package:pikapi/basic/config/ContentFailedReloadAction.dart'; import 'package:pikapi/basic/config/FullScreenAction.dart'; import 'package:pikapi/basic/config/FullScreenUI.dart'; @@ -149,6 +150,15 @@ class _SettingsScreenState extends State { }, ), Divider(), + ListTile( + title: Text("文件夹选择器默认路径"), + subtitle: Text(currentChooserRoot()), + onTap: () async { + await inputChooserRoot(context); + setState(() {}); + }, + ), + Divider(), ], ), );