Clean up error generation using extensions

dhzdhd · Jun 27, 2023 · a057df8 · a057df8
1 parent c8f7d01
commit a057df8
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 87 deletions.
diff --git a/lib/errors.dart b/lib/errors.dart
@@ -0,0 +1,42 @@
+import 'package:dio/dio.dart';
+
+extension ErrorSegregation on Exception {
+  AppError segregate() {
+    if (this is AppError) {
+      return this as AppError;
+    } else if (this is DioError) {
+      final error = this as DioError;
+      return HttpError(
+        message: error.response.toString(),
+        stackTrace: error.stackTrace.toString(),
+      );
+    } else {
+      return GeneralError(message: toString(), stackTrace: 'No stacktrace');
+    }
+  }
+}
+
+sealed class AppError implements Exception {
+  String get message;
+  String get stackTrace;
+}
+
+class HttpError implements AppError {
+  @override
+  final String message;
+
+  @override
+  final String stackTrace;
+
+  HttpError({required this.message, required this.stackTrace});
+}
+
+class GeneralError implements AppError {
+  @override
+  final String message;
+
+  @override
+  final String stackTrace;
+
+  GeneralError({required this.message, required this.stackTrace});
+}
diff --git a/lib/src/accounts/controllers/auth_controller.dart b/lib/src/accounts/controllers/auth_controller.dart
@@ -6,7 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:syncvault/src/accounts/models/auth_provider_model.dart';
 import 'package:syncvault/src/accounts/models/folder_info_model.dart';
 import 'package:syncvault/src/accounts/services/auth_service.dart';
-import 'package:syncvault/src/home/models/error_model.dart';
+import 'package:syncvault/errors.dart';
 
 enum AuthProviderType {
   oneDrive,

diff --git a/lib/src/accounts/controllers/folder_controller.dart b/lib/src/accounts/controllers/folder_controller.dart
@@ -7,6 +7,7 @@ import 'package:syncvault/src/accounts/controllers/auth_controller.dart';
 import 'package:syncvault/src/accounts/models/auth_provider_model.dart';
 import 'package:syncvault/src/accounts/models/folder_model.dart';
 import 'package:syncvault/src/accounts/services/drive_service.dart';
+import 'package:syncvault/errors.dart';
 
 final folderProvider =
     StateNotifierProvider<FolderNotifier, List<FolderModel>>((ref) {
@@ -61,7 +62,7 @@ class FolderNotifier extends StateNotifier<List<FolderModel>> {
     );
   }
 
-  Future<Either<String, String>> create(
+  Future<Either<AppError, String>> create(
     AuthProviderModel authModel,
     String folderPath,
     String folderName,
@@ -100,7 +101,7 @@ class FolderNotifier extends StateNotifier<List<FolderModel>> {
     });
   }
 
-  Future<Either<String, String>> upload(
+  Future<Either<AppError, String>> upload(
     FolderModel folderModel,
     Option<String> filePath,
   ) async {

diff --git a/lib/src/accounts/services/auth_service.dart b/lib/src/accounts/services/auth_service.dart
@@ -8,7 +8,7 @@ import 'package:syncvault/src/accounts/controllers/auth_controller.dart';
 import 'package:syncvault/src/accounts/models/auth_provider_model.dart';
 import 'package:syncvault/src/accounts/models/folder_info_model.dart';
 import 'package:syncvault/src/accounts/services/drive_service.dart';
-import 'package:syncvault/src/home/models/error_model.dart';
+import 'package:syncvault/errors.dart';
 
 final dio = Dio();
 
@@ -105,11 +105,7 @@ final class DropBoxAuth implements AuthService {
         ),
       );
     }, (error, stackTrace) {
-      if (error is AppError) {
-        return error;
-      } else {
-        return GeneralError(message: error.toString(), stackTrace: '');
-      }
+      return (error as Exception).segregate();
     });
   }
 
@@ -145,13 +141,7 @@ final class DropBoxAuth implements AuthService {
         return model;
       }
     }, (error, stackTrace) {
-      if (error is DioError) {
-        return HttpError(
-          message: error.response.toString(),
-          stackTrace: error.stackTrace.toString(),
-        );
-      }
-      return GeneralError(message: '', stackTrace: error.toString());
+      return (error as Exception).segregate();
     });
   }
 
@@ -170,14 +160,7 @@ final class DropBoxAuth implements AuthService {
 
       return response.data!;
     }, (error, stackTrace) {
-      if (error is DioError) {
-        return HttpError(
-          message: error.response.toString(),
-          stackTrace: error.stackTrace.toString(),
-        );
-      } else {
-        return GeneralError(message: error.toString(), stackTrace: '');
-      }
+      return (error as Exception).segregate();
     });
   }
 
@@ -293,11 +276,7 @@ final class OneDriveAuth implements AuthService {
         ),
       );
     }, (error, stackTrace) {
-      if (error is AppError) {
-        return error;
-      } else {
-        return GeneralError(message: error.toString(), stackTrace: '');
-      }
+      return (error as Exception).segregate();
     });
   }
 
@@ -334,13 +313,7 @@ final class OneDriveAuth implements AuthService {
         return model;
       }
     }, (error, stackTrace) {
-      if (error is DioError) {
-        return HttpError(
-          message: error.response.toString(),
-          stackTrace: error.stackTrace.toString(),
-        );
-      }
-      return GeneralError(message: '', stackTrace: error.toString());
+      return (error as Exception).segregate();
     });
   }
 
@@ -359,14 +332,7 @@ final class OneDriveAuth implements AuthService {
 
       return response.data!;
     }, (error, stackTrace) {
-      if (error is DioError) {
-        return HttpError(
-          message: error.response.toString(),
-          stackTrace: error.stackTrace.toString(),
-        );
-      } else {
-        return GeneralError(message: error.toString(), stackTrace: '');
-      }
+      return (error as Exception).segregate();
     });
   }
 

diff --git a/lib/src/accounts/services/drive_service.dart b/lib/src/accounts/services/drive_service.dart
@@ -5,21 +5,22 @@ import 'package:flutter/material.dart';
 import 'package:fpdart/fpdart.dart';
 import 'package:syncvault/src/accounts/models/auth_provider_model.dart';
 import 'package:syncvault/src/accounts/models/folder_model.dart';
+import 'package:syncvault/errors.dart';
 
 final dio = Dio();
 
 abstract interface class DriveService {
-  TaskEither<String, String> createFolder({
+  TaskEither<AppError, String> createFolder({
     required Option<String> folderName,
     required String accessToken,
     required Option<String> folderId,
   });
-  TaskEither<String, String> upload(
+  TaskEither<AppError, String> upload(
     FolderModel folderModel,
     AuthProviderModel authModel,
     Option<String> filePath,
   );
-  TaskEither<String, String> delete({
+  TaskEither<AppError, String> delete({
     required FolderModel folderModel,
     required AuthProviderModel authModel,
     required String folderId,
@@ -31,7 +32,7 @@ class DropBox implements DriveService {
   static const basePath = '/2/files';
 
   @override
-  TaskEither<String, String> createFolder({
+  TaskEither<AppError, String> createFolder({
     required Option<String> folderName,
     required String accessToken,
     required Option<String> folderId,
@@ -57,18 +58,20 @@ class DropBox implements DriveService {
         );
         return response.data!['metadata']['id'];
       },
-      (error, stackTrace) => error.toString(),
+      (error, stackTrace) {
+        return (error as Exception).segregate();
+      },
     );
   }
 
   @override
-  TaskEither<String, String> upload(FolderModel folderModel,
+  TaskEither<AppError, String> upload(FolderModel folderModel,
       AuthProviderModel authModel, Option<String> filePath) {
     throw UnimplementedError();
   }
 
   @override
-  TaskEither<String, String> delete(
+  TaskEither<AppError, String> delete(
       {required FolderModel folderModel,
       required AuthProviderModel authModel,
       required String folderId}) {
@@ -81,7 +84,7 @@ class OneDrive implements DriveService {
   static const basePath = '/beta/me/drive';
 
   @override
-  TaskEither<String, String> createFolder({
+  TaskEither<AppError, String> createFolder({
     required Option<String> folderName,
     required String accessToken,
     required Option<String> folderId,
@@ -105,12 +108,14 @@ class OneDrive implements DriveService {
         );
         return response.data!['id'];
       },
-      (error, stackTrace) => error.toString(),
+      (error, stackTrace) {
+        return (error as Exception).segregate();
+      },
     );
   }
 
   @override
-  TaskEither<String, String> upload(
+  TaskEither<AppError, String> upload(
     FolderModel folderModel,
     AuthProviderModel authModel,
     Option<String> filePath,
@@ -155,7 +160,7 @@ class OneDrive implements DriveService {
                 ).run();
 
                 result.match(
-                  (l) => throw StateError(l),
+                  (l) => throw l,
                   (r) => idMap[i.path] = r,
                 );
               }
@@ -194,12 +199,14 @@ class OneDrive implements DriveService {
 
         return 'Success';
       },
-      (error, stackTrace) => error.toString(),
+      (error, stackTrace) {
+        return (error as Exception).segregate();
+      },
     );
   }
 
   @override
-  TaskEither<String, String> delete({
+  TaskEither<AppError, String> delete({
     required FolderModel folderModel,
     required AuthProviderModel authModel,
     required String folderId,
@@ -217,10 +224,7 @@ class OneDrive implements DriveService {
         return 'Success';
       },
       (error, stackTrace) {
-        if (error is DioError) {
-          debugPrint(error.response.toString());
-        }
-        return 'Failure';
+        return (error as Exception).segregate();
       },
     );
   }

diff --git a/lib/src/home/models/error_model.dart b/lib/src/home/models/error_model.dart
diff --git a/lib/src/home/views/home_view.dart b/lib/src/home/views/home_view.dart
@@ -206,8 +206,9 @@ class _HomeViewState extends ConsumerState<HomeView> {
 
                                             if (context.mounted) {
                                               result.match(
-                                                (l) => context
-                                                    .showErrorSnackBar(l),
+                                                (l) =>
+                                                    context.showErrorSnackBar(
+                                                        l.message),
                                                 (r) =>
                                                     context.showSuccessSnackBar(
                                                   content: r,