Merge pull request #44 from stride-tasks/feature/multi-repository

Feature multi-repository

Author: HalidOdat

app/lib/blocs/settings_bloc.dart

@@ -5,6 +5,12 @@ import 'package:flutter/material.dart';
 import 'package:stride/blocs/log_bloc.dart';
 import 'package:stride/bridge/api/logging.dart';
 import 'package:stride/bridge/api/settings.dart';
+import 'package:uuid/uuid.dart';
+
+extension CurrentRepositoryUuidOrFirstExt on Settings {
+  UuidValue? currentRepositoryUuidOrFirst() =>
+      currentRepository ?? repositories.firstOrNull?.uuid;
+}
 
 @immutable
 abstract class SettingsEvent {}

app/lib/blocs/tasks_bloc.dart

@@ -11,6 +11,7 @@ import 'package:stride/bridge/api/repository/git.dart';
 import 'package:stride/bridge/git/known_hosts.dart';
 import 'package:stride/bridge/task.dart';
 import 'package:stride/routes/encryption_key_route.dart';
+import 'package:uuid/uuid.dart';
 
 @immutable
 abstract class TaskEvent {}
@@ -28,7 +29,8 @@ final class TaskRemoveEvent extends TaskEvent {
 }
 
 final class TaskRemoveAllEvent extends TaskEvent {
-  TaskRemoveAllEvent();
+  final bool all;
+  TaskRemoveAllEvent({this.all = false});
 }
 
 final class TaskForcePushEvent extends TaskEvent {
@@ -76,7 +78,8 @@ class TaskBloc extends Bloc<TaskEvent, TaskState> {
   final LogBloc logBloc;
   StreamSubscription<SettingsState>? settingsSubscription;
 
-  final TaskStorage repository;
+  UuidValue? repositoryUuid;
+  TaskStorage? storage;
   Filter? filter;
 
   Timer? syncTimer;
@@ -89,6 +92,8 @@ class TaskBloc extends Bloc<TaskEvent, TaskState> {
       );
     }
 
+    repositoryUuid ??= settingsBloc.settings.currentRepositoryUuidOrFirst();
+
     settingsSubscription = settingsBloc.stream.listen((event) {
       if (event.settings.periodicSync) {
         syncTimer ??= Timer.periodic(
@@ -99,14 +104,32 @@ class TaskBloc extends Bloc<TaskEvent, TaskState> {
         syncTimer?.cancel();
         syncTimer = null;
       }
+
+      final nextRepositoryUuid = event.settings.currentRepositoryUuidOrFirst();
+      if (repositoryUuid != nextRepositoryUuid) {
+        storage?.unload();
+        storage = null;
+        repositoryUuid = nextRepositoryUuid;
+        add(TaskFetchEvent());
+      }
     });
   }
 
+  TaskStorage? repository() {
+    if (storage != null) {
+      return storage;
+    }
+    if (repositoryUuid == null) {
+      return null;
+    }
+    return storage = TaskStorage.load(uuid: repositoryUuid!);
+  }
+
   TaskBloc({
-    required this.repository,
     required this.settingsBloc,
     required this.logBloc,
     required this.dialogBloc,
+    this.storage,
   }) : super(const TaskState(tasks: [])) {
     _initializeSettingsStream();
 
@@ -115,15 +138,15 @@ class TaskBloc extends Bloc<TaskEvent, TaskState> {
     });
 
     on<TaskAddEvent>((event, emit) async {
-      await repository.add(task: event.task);
+      await repository()?.add(task: event.task);
       emit(TaskState(tasks: await _tasks()));
     });
 
     on<TaskRemoveEvent>((event, emit) async {
       if (event.task.status == TaskStatus.deleted) {
-        await repository.removeByTask(task: event.task);
+        await repository()?.removeByTask(task: event.task);
       } else {
-        await repository.changeCategory(
+        await repository()?.changeCategory(
           task: event.task,
           status: TaskStatus.deleted,
         );
@@ -133,25 +156,29 @@ class TaskBloc extends Bloc<TaskEvent, TaskState> {
     });
 
     on<TaskRemoveAllEvent>((event, emit) async {
-      await repository.clear();
+      if (event.all) {
+        await repository()?.deleteAll();
+      } else {
+        await repository()?.clear();
+      }
       emit(TaskState(tasks: await _tasks()));
     });
 
     on<TaskForcePushEvent>((event, emit) async {
-      await repository.push(force: true);
+      await repository()?.push(force: true);
       emit(TaskState(tasks: await _tasks()));
     });
 
     on<TaskChangeStatusEvent>((event, emit) async {
-      await repository.changeCategory(
+      await repository()?.changeCategory(
         task: event.task,
         status: event.status,
       );
       emit(TaskState(tasks: await _tasks()));
     });
 
     on<TaskUpdateEvent>((event, emit) async {
-      await repository.update(task: event.task);
+      await repository()?.update(task: event.task);
       emit(TaskState(tasks: await _tasks()));
     });
 
@@ -160,7 +187,7 @@ class TaskBloc extends Bloc<TaskEvent, TaskState> {
       emit(TaskState(tasks: tasks, syncing: true));
 
       try {
-        await repository.sync_();
+        await repository()?.sync_();
       } catch (error) {
         emit(TaskState(tasks: tasks, syncingError: error));
         rethrow;
@@ -174,20 +201,20 @@ class TaskBloc extends Bloc<TaskEvent, TaskState> {
     });
 
     on<TaskCheckoutBranchEvent>((event, emit) async {
-      await repository.checkout();
+      await repository()?.checkout();
       emit(TaskState(tasks: await _tasks()));
     });
   }
 
   Future<List<Task>> _tasks() async {
     if (filter == null) {
-      final tasks = await repository.tasksWithFilter(
+      final tasks = await repository()?.tasksWithFilter(
         filter: await Filter.default_(),
       );
-      return tasks;
+      return tasks ?? [];
     } else {
-      final tasks = await repository.tasksWithFilter(filter: filter!);
-      return tasks;
+      final tasks = await repository()?.tasksWithFilter(filter: filter!);
+      return tasks ?? [];
     }
   }
 
@@ -228,7 +255,7 @@ class TaskBloc extends Bloc<TaskEvent, TaskState> {
               await Navigator.of(context).push<void>(
                 MaterialPageRoute(
                   builder: (context) => EncryptionKeyRoute(
-                    encryption: settingsBloc.settings.repository.encryption,
+                    repository: settingsBloc.settings.repositories.first,
                   ),
                 ),
               );

app/lib/bridge/api/repository/git.dart

@@ -20,7 +20,7 @@ import 'package:stride/bridge/task.dart';
 import 'package:stride/bridge/task/annotation.dart';
 import 'package:uuid/uuid.dart';
 
-// These functions are ignored because they are not marked as `pub`: `append`, `clear`, `do_merge`, `fast_forward`, `filter`, `generate_iv`, `get_by_id`, `get_index`, `load`, `new`, `rebase`, `remove_task2`, `remove`, `resolve_conflicts`, `save`, `ssh_key`, `storage_mut`, `unload`, `update2`, `update`, `with_authentication`
+// These functions are ignored because they are not marked as `pub`: `append`, `clear`, `do_merge`, `fast_forward`, `filter`, `generate_iv`, `get_by_id`, `get_index`, `init_repotitory`, `load`, `new`, `rebase`, `remove_task2`, `remove`, `resolve_conflicts`, `save`, `ssh_key`, `storage_mut`, `unload`, `update2`, `update`, `with_authentication`
 // These types are ignored because they are not used by any `pub` functions: `DecryptedTask`, `LogIter`, `Storage`, `TaskDiff`
 // These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `clone`, `fmt`
 // These functions are ignored (category: IgnoreBecauseExplicitAttribute): `pull`
@@ -52,6 +52,8 @@ abstract class TaskStorage implements RustOpaqueInterface, StrideRepository {
   @override
   Future<void> commit();
 
+  Future<void> deleteAll();
+
   @override
   Future<String> export_();
 
@@ -60,13 +62,17 @@ abstract class TaskStorage implements RustOpaqueInterface, StrideRepository {
   @override
   Future<void> import_({required String content});
 
-  Future<void> initRepotitory();
+  static TaskStorage load({required UuidValue uuid}) =>
+      RustLib.instance.api.crateApiRepositoryGitTaskStorageLoad(uuid: uuid);
 
   Future<List<CommitItem>?> log({Oid? oid, int? n});
 
-  factory TaskStorage({required String path, required Settings settings}) =>
-      RustLib.instance.api
-          .crateApiRepositoryGitTaskStorageNew(path: path, settings: settings);
+  factory TaskStorage(
+          {required UuidValue repositoryUuid,
+          required String path,
+          required Settings settings}) =>
+      RustLib.instance.api.crateApiRepositoryGitTaskStorageNew(
+          repositoryUuid: repositoryUuid, path: path, settings: settings);
 
   Future<void> push({required bool force});
 

app/lib/bridge/api/settings.dart

@@ -20,7 +20,7 @@ import 'package:uuid/uuid.dart';
 
 part 'settings.freezed.dart';
 
-// These functions are ignored because they are not marked as `pub`: `application_cache_path`, `application_document_path`, `application_log_path`, `application_support_path`, `default_author`, `default_branch_name`, `default_email`, `default_theme_mode`, `ssh_key_path`, `ssh_key`
+// These functions are ignored because they are not marked as `pub`: `application_cache_path`, `application_document_path`, `application_log_path`, `application_support_path`, `default_author`, `default_branch_name`, `default_email`, `default_repository_name`, `default_theme_mode`, `repository_mut`, `repository`, `ssh_key_path`, `ssh_key`
 // These types are ignored because they are not used by any `pub` functions: `State`
 // These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `clone`, `clone`, `clone`, `clone`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`
 // These functions are ignored (category: IgnoreBecauseOwnerTyShouldIgnore): `default`
@@ -97,11 +97,17 @@ class EncryptionKey {
   static Future<EncryptionKey> generate() =>
       RustLib.instance.api.crateApiSettingsEncryptionKeyGenerate();
 
-  static Future<bool> removeKey() =>
-      RustLib.instance.api.crateApiSettingsEncryptionKeyRemoveKey();
+  static Future<bool> removeKey({required UuidValue repositoryUuid}) => RustLib
+      .instance.api
+      .crateApiSettingsEncryptionKeyRemoveKey(repositoryUuid: repositoryUuid);
 
-  static Future<EncryptionKey> save({required String key}) =>
-      RustLib.instance.api.crateApiSettingsEncryptionKeySave(key: key);
+  static Future<EncryptionKey> save(
+          {required UuidValue repositoryUuid, required String key}) =>
+      RustLib.instance.api.crateApiSettingsEncryptionKeySave(
+          repositoryUuid: repositoryUuid, key: key);
+
+  static String? validate({required String key}) =>
+      RustLib.instance.api.crateApiSettingsEncryptionKeyValidate(key: key);
 
   @override
   int get hashCode => key.hashCode;
@@ -118,6 +124,7 @@ class EncryptionKey {
 class Repository with _$Repository {
   const factory Repository({
     required UuidValue uuid,
+    required String name,
     required String origin,
     required String author,
     required String email,
@@ -136,10 +143,11 @@ class Settings with _$Settings {
   const Settings._();
   const factory Settings.raw({
     required bool darkMode,
-    required Repository repository,
     required bool periodicSync,
     required List<Filter> filters,
     FilterSelection? selectedFilter,
+    UuidValue? currentRepository,
+    required List<Repository> repositories,
   }) = _Settings;
   static Stream<Settings> createStream() =>
       RustLib.instance.api.crateApiSettingsSettingsCreateStream();