Merge pull request Suwayomi#110 from DattatreyaReddy:backup-cleanup

clean up
tachimanga · Feb 2, 2023 · f84c2f1 · f84c2f1
2 parents 66b66e5 + c7257aa
commit f84c2f1
Showing 1 changed file with 25 additions and 44 deletions.
diff --git a/lib/src/features/settings/data/backup/backup_repository.dart b/lib/src/features/settings/data/backup/backup_repository.dart
@@ -25,51 +25,32 @@ class BackupRepository {
   final DioClient dioClient;
 
   Future<BackupMissing?> restoreBackup(PlatformFile? file) async {
-    if (kIsWeb == false) {
-      if ((file?.path).isBlank) {
-        throw LocaleKeys.error_filePick.tr();
-      }
-      if (!(file!.name.endsWith('.proto.gz'))) {
-        throw LocaleKeys.error_filePickUnknownExtension
-            .tr(namedArgs: {"extensionName": ".proto.gz"});
-      }
-      return (file.path).isNotBlank
-          ? (await dioClient.post<BackupMissing, BackupMissing?>(
-              BackupUrl.import,
-              data: FormData.fromMap({
-                'backup.proto.gz': MultipartFile.fromFileSync(
-                  file.path!,
-                  filename: "backup.proto.gz",
-                )
-              }),
-              decoder: (e) =>
-                  e is Map<String, dynamic> ? BackupMissing.fromJson(e) : null,
-            ))
-              .data
-          : null;
-    } else {
-      if ((file?.bytes).isBlank) {
-        throw LocaleKeys.error_filePick.tr();
-      }
-      if (!(file!.name.endsWith('.proto.gz'))) {
-        throw LocaleKeys.error_filePickUnknownExtension
-            .tr(namedArgs: {"extensionName": ".proto.gz"});
-      }
-      return (file.bytes).isNotBlank
-          ? (await dioClient.post<BackupMissing, BackupMissing?>(
-              BackupUrl.import,
-              data: FormData.fromMap({
-                'backup.proto.gz': MultipartFile.fromBytes(
-                  file.bytes as List<int>,
-                  filename: "backup.proto.gz",
-                )
-              }),
-              decoder: (e) =>
-                  e is Map<String, dynamic> ? BackupMissing.fromJson(e) : null,
-            ))
-              .data
-          : null;
+    if ((file?.name).isBlank ||
+        (kIsWeb && (file?.bytes).isBlank ||
+            (!kIsWeb && (file?.path).isBlank))) {
+      throw LocaleKeys.error_filePick.tr();
     }
+    if (!(file!.name.endsWith('.proto.gz'))) {
+      throw LocaleKeys.error_filePickUnknownExtension
+          .tr(namedArgs: {"extensionName": ".proto.gz"});
+    }
+    return (await dioClient.post<BackupMissing, BackupMissing?>(
+      BackupUrl.import,
+      data: FormData.fromMap({
+        'backup.proto.gz': kIsWeb
+            ? MultipartFile.fromBytes(
+                file.bytes!,
+                filename: "backup.proto.gz",
+              )
+            : MultipartFile.fromFileSync(
+                file.path!,
+                filename: "backup.proto.gz",
+              )
+      }),
+      decoder: (e) =>
+          e is Map<String, dynamic> ? BackupMissing.fromJson(e) : null,
+    ))
+        .data;
   }
 }