Fix subfolder delete

dhzdhd · Jun 17, 2024 · cf16ffb · cf16ffb
1 parent 6973c90
commit cf16ffb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/lib/errors.dart b/lib/errors.dart
@@ -5,10 +5,13 @@ part 'errors.freezed.dart';
 
 extension ErrorSegregation on Object {
   AppError segregateError() {
+    // TODO: Log errors and return readable errors
     return switch (this) {
       AppError err => err,
       DioException err => HttpError(err.response.toString()),
+      StateError err => GeneralError(err.toString()),
       Exception err => GeneralError(err.toString()),
+      Error err => GeneralError(err.toString()),
       Object err => throw NoSuchMethodError.withInvocation(
           err,
           Invocation.method(

diff --git a/lib/src/accounts/controllers/folder_controller.dart b/lib/src/accounts/controllers/folder_controller.dart
@@ -228,7 +228,7 @@ class Folder extends _$Folder {
 
   TaskEither<AppError, ()> delete(FolderModel model, Option<String> path) {
     final oldAuthModel = ref
-        .read(authProvider)
+        .watch(authProvider)
         .where(
           (element) =>
               element.email == model.email &&

diff --git a/lib/src/accounts/services/drive/onedrive.dart b/lib/src/accounts/services/drive/onedrive.dart
@@ -159,11 +159,13 @@ class OneDrive implements DriveService {
       'Authorization': 'Bearer ${authModel.accessToken}',
       'Content-Type': 'application/json'
     });
+    print(authModel.accessToken);
+    print(folderModel.folderId);
 
     return TaskEither.tryCatch(
       () async {
         final subPath = await path.match(
-          () => Future.value('items/${folderModel.folderId}'),
+          () => Future.value(folderModel.folderId),
           (t) async {
             final path =
                 Uri.file(t.replaceFirst(folderModel.folderPath, '')).path;

diff --git a/lib/src/home/views/home_view.dart b/lib/src/home/views/home_view.dart
@@ -88,6 +88,7 @@ class _HomeViewState extends ConsumerState<HomeView> {
     }, [ref.watch(folderProvider)]);
 
     final folderInfo = ref.watch(folderProvider);
+    final folderNotifier = ref.read(folderProvider.notifier);
     final uploadDeleteController = ref.watch(uploadDeleteControllerProvider);
     final progressVisibleList = useState(List.generate(
       folderInfo.length,
@@ -283,11 +284,12 @@ class _HomeViewState extends ConsumerState<HomeView> {
                                         child: TextButton(
                                           child: const Icon(Icons.delete),
                                           onPressed: () async {
-                                            final result = await ref
-                                                .read(folderProvider.notifier)
+                                            final result = await folderNotifier
                                                 .delete(e, none())
                                                 .run();
 
+                                            print(result);
+
                                             if (context.mounted) {
                                               result.match(
                                                 (l) =>