Skip to content

Commit 2750412

Browse files
authored
migrate: webdav_client_plus (#729)
Fixes #723
1 parent dd5fea0 commit 2750412

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ untranlated.json
6565
.vscode/settings.json
6666
more_build_data.json
6767
trans.txt
68+
android/app/.cxx

lib/core/sync.dart

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ final icloud = ICloud(containerId: 'iCloud.tech.lolli.serverbox');
1010
final class BakSyncer extends SyncIface<Backup> {
1111
const BakSyncer._() : super();
1212

13-
@override
14-
void init() {
15-
Webdav.shared.prefix = 'serverbox/';
16-
}
17-
1813
@override
1914
Future<void> saveToFile() => Backup.backup();
2015

lib/view/page/backup.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:server_box/data/provider/snippet.dart';
1313
import 'package:server_box/data/res/misc.dart';
1414
import 'package:server_box/data/res/store.dart';
1515
import 'package:icons_plus/icons_plus.dart';
16-
import 'package:webdav_client/webdav_client.dart';
16+
import 'package:webdav_client_plus/webdav_client_plus.dart';
1717

1818
class BackupPage extends StatefulWidget {
1919
const BackupPage({super.key});
@@ -416,7 +416,8 @@ final class _BackupPageState extends State<BackupPage>
416416
await Webdav.test(url_, user_, pwd_);
417417
context.showSnackBar(libL10n.success);
418418

419-
Webdav.shared.client = WebdavClient(url: url_, user: user_, pwd: pwd_);
419+
Webdav.shared.client =
420+
WebdavClient.basicAuth(url: url_, user: user_, pwd: pwd_);
420421
PrefProps.webdavUrl.set(url_);
421422
PrefProps.webdavUser.set(user_);
422423
PrefProps.webdavPwd.set(pwd_);

pubspec.lock

+12-12
Original file line numberDiff line numberDiff line change
@@ -405,18 +405,18 @@ packages:
405405
dependency: "direct main"
406406
description:
407407
name: extended_image
408-
sha256: "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae"
408+
sha256: fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2
409409
url: "https://pub.dev"
410410
source: hosted
411-
version: "9.1.0"
411+
version: "10.0.0"
412412
extended_image_library:
413413
dependency: transitive
414414
description:
415415
name: extended_image_library
416-
sha256: e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1
416+
sha256: ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5
417417
url: "https://pub.dev"
418418
source: hosted
419-
version: "4.0.6"
419+
version: "5.0.0"
420420
fake_async:
421421
dependency: transitive
422422
description:
@@ -445,10 +445,10 @@ packages:
445445
dependency: "direct main"
446446
description:
447447
name: file_picker
448-
sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810
448+
sha256: "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b"
449449
url: "https://pub.dev"
450450
source: hosted
451-
version: "8.3.7"
451+
version: "9.2.1"
452452
fixnum:
453453
dependency: transitive
454454
description:
@@ -478,8 +478,8 @@ packages:
478478
dependency: "direct main"
479479
description:
480480
path: "."
481-
ref: "v1.0.251"
482-
resolved-ref: "5774f9e56e6255293a40dc750692dc600056a288"
481+
ref: "v1.0.257"
482+
resolved-ref: af64c32469b797d98fa539f04592b06bdb977d1a
483483
url: "https://github.com/lppcg/fl_lib"
484484
source: git
485485
version: "0.0.1"
@@ -1654,12 +1654,12 @@ packages:
16541654
url: "https://pub.dev"
16551655
source: hosted
16561656
version: "3.0.2"
1657-
webdav_client:
1657+
webdav_client_plus:
16581658
dependency: "direct main"
16591659
description:
16601660
path: "."
1661-
ref: "v1.0.66"
1662-
resolved-ref: "1908cd0f4909730d9ae4d4fc4c05fb2576b3f674"
1661+
ref: "v1.0.86"
1662+
resolved-ref: "7e08000e20c001b15a747c9564adfbfd45c7cadc"
16631663
url: "https://github.com/lollipopkit/webdav_client"
16641664
source: git
16651665
version: "1.2.2"
@@ -1730,4 +1730,4 @@ packages:
17301730
version: "1.1.2"
17311731
sdks:
17321732
dart: ">=3.7.0 <4.0.0"
1733-
flutter: ">=3.27.0"
1733+
flutter: ">=3.29.0"

pubspec.yaml

+8-6
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dependencies:
2525
fl_chart: ^0.70.2
2626
wakelock_plus: ^1.2.4
2727
wake_on_lan: ^4.1.1+3
28-
extended_image: ^9.0.7
29-
file_picker: ^8.3.7
28+
extended_image: ^10.0.0
29+
file_picker: ^9.2.1
3030
json_annotation: ^4.9.0
3131
choice: ^2.3.2
3232
flutter_reorderable_grid_view: ^5.1.0
@@ -54,16 +54,18 @@ dependencies:
5454
git:
5555
url: https://github.com/lollipopkit/plain_notification_token
5656
ref: v1.0.23
57-
webdav_client:
57+
webdav_client_plus:
5858
git:
5959
url: https://github.com/lollipopkit/webdav_client
60-
ref: v1.0.66
60+
ref: v1.0.86
6161
fl_lib:
6262
git:
6363
url: https://github.com/lppcg/fl_lib
64-
ref: v1.0.251
64+
ref: v1.0.257
6565

66-
# dependency_overrides:
66+
dependency_overrides:
67+
# webdav_client_plus:
68+
# path: ../webdav_client
6769
# dartssh2:
6870
# path: ../dartssh2
6971
# xterm:

0 commit comments

Comments
 (0)