From 275041247a7ee33479f48e314a066871ea327e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lollipopkit=F0=9F=8F=B3=EF=B8=8F=E2=80=8D=E2=9A=A7?= =?UTF-8?q?=EF=B8=8F?= <10864310+lollipopkit@users.noreply.github.com> Date: Sat, 22 Mar 2025 01:27:17 +0800 Subject: [PATCH] migrate: `webdav_client_plus` (#729) Fixes #723 --- .gitignore | 1 + lib/core/sync.dart | 5 ----- lib/view/page/backup.dart | 5 +++-- pubspec.lock | 24 ++++++++++++------------ pubspec.yaml | 14 ++++++++------ 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 05001cd1..5043a870 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ untranlated.json .vscode/settings.json more_build_data.json trans.txt +android/app/.cxx diff --git a/lib/core/sync.dart b/lib/core/sync.dart index 28d87408..e60b26ea 100644 --- a/lib/core/sync.dart +++ b/lib/core/sync.dart @@ -10,11 +10,6 @@ final icloud = ICloud(containerId: 'iCloud.tech.lolli.serverbox'); final class BakSyncer extends SyncIface { const BakSyncer._() : super(); - @override - void init() { - Webdav.shared.prefix = 'serverbox/'; - } - @override Future saveToFile() => Backup.backup(); diff --git a/lib/view/page/backup.dart b/lib/view/page/backup.dart index 6e49eeaa..bcbbd62d 100644 --- a/lib/view/page/backup.dart +++ b/lib/view/page/backup.dart @@ -13,7 +13,7 @@ import 'package:server_box/data/provider/snippet.dart'; import 'package:server_box/data/res/misc.dart'; import 'package:server_box/data/res/store.dart'; import 'package:icons_plus/icons_plus.dart'; -import 'package:webdav_client/webdav_client.dart'; +import 'package:webdav_client_plus/webdav_client_plus.dart'; class BackupPage extends StatefulWidget { const BackupPage({super.key}); @@ -416,7 +416,8 @@ final class _BackupPageState extends State await Webdav.test(url_, user_, pwd_); context.showSnackBar(libL10n.success); - Webdav.shared.client = WebdavClient(url: url_, user: user_, pwd: pwd_); + Webdav.shared.client = + WebdavClient.basicAuth(url: url_, user: user_, pwd: pwd_); PrefProps.webdavUrl.set(url_); PrefProps.webdavUser.set(user_); PrefProps.webdavPwd.set(pwd_); diff --git a/pubspec.lock b/pubspec.lock index c6817e87..48f28dcf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -405,18 +405,18 @@ packages: dependency: "direct main" description: name: extended_image - sha256: "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae" + sha256: fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2 url: "https://pub.dev" source: hosted - version: "9.1.0" + version: "10.0.0" extended_image_library: dependency: transitive description: name: extended_image_library - sha256: e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1 + sha256: ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5 url: "https://pub.dev" source: hosted - version: "4.0.6" + version: "5.0.0" fake_async: dependency: transitive description: @@ -445,10 +445,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810 + sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b" url: "https://pub.dev" source: hosted - version: "8.3.7" + version: "9.2.1" fixnum: dependency: transitive description: @@ -478,8 +478,8 @@ packages: dependency: "direct main" description: path: "." - ref: "v1.0.251" - resolved-ref: "5774f9e56e6255293a40dc750692dc600056a288" + ref: "v1.0.257" + resolved-ref: af64c32469b797d98fa539f04592b06bdb977d1a url: "https://github.com/lppcg/fl_lib" source: git version: "0.0.1" @@ -1654,12 +1654,12 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - webdav_client: + webdav_client_plus: dependency: "direct main" description: path: "." - ref: "v1.0.66" - resolved-ref: "1908cd0f4909730d9ae4d4fc4c05fb2576b3f674" + ref: "v1.0.86" + resolved-ref: "7e08000e20c001b15a747c9564adfbfd45c7cadc" url: "https://github.com/lollipopkit/webdav_client" source: git version: "1.2.2" @@ -1730,4 +1730,4 @@ packages: version: "1.1.2" sdks: dart: ">=3.7.0 <4.0.0" - flutter: ">=3.27.0" + flutter: ">=3.29.0" diff --git a/pubspec.yaml b/pubspec.yaml index 619c0951..ec70a15f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -25,8 +25,8 @@ dependencies: fl_chart: ^0.70.2 wakelock_plus: ^1.2.4 wake_on_lan: ^4.1.1+3 - extended_image: ^9.0.7 - file_picker: ^8.3.7 + extended_image: ^10.0.0 + file_picker: ^9.2.1 json_annotation: ^4.9.0 choice: ^2.3.2 flutter_reorderable_grid_view: ^5.1.0 @@ -54,16 +54,18 @@ dependencies: git: url: https://github.com/lollipopkit/plain_notification_token ref: v1.0.23 - webdav_client: + webdav_client_plus: git: url: https://github.com/lollipopkit/webdav_client - ref: v1.0.66 + ref: v1.0.86 fl_lib: git: url: https://github.com/lppcg/fl_lib - ref: v1.0.251 + ref: v1.0.257 -# dependency_overrides: +dependency_overrides: + # webdav_client_plus: + # path: ../webdav_client # dartssh2: # path: ../dartssh2 # xterm: