Merge branch 'master' into PE-7176-release-ar-drive-v-2-58-0

ardriveapp · Nov 21, 2024 · 988e4a8 · 988e4a8
2 parents d86e612 + 584265d
commit 988e4a8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/lib/blocs/drive_detail/drive_detail_cubit.dart b/lib/blocs/drive_detail/drive_detail_cubit.dart
@@ -138,12 +138,21 @@ class DriveDetailCubit extends Cubit<DriveDetailState> {
       _folderSubscription =
           Rx.combineLatest3<Drive?, FolderWithContents, ProfileState, void>(
         _driveRepository.watchDrive(driveId: driveId),
-        _driveDao.watchFolderContents(
+        _driveDao
+            .watchFolderContents(
           driveId,
           orderBy: contentOrderBy,
           orderingMode: contentOrderingMode,
           folderId: folderId,
-        ),
+        )
+            .handleError((error, stack) {
+          logger.e('Error watching folder contents', error, stack);
+          if (error is DriveNotFoundException) {
+            emit(DriveDetailLoadNotFound());
+          }
+
+          return null;
+        }),
         _profileCubit.stream.startWith(ProfileCheckingAvailability()),
         (drive, folderContents, _) async {
           if (isClosed) {

diff --git a/lib/blocs/upload/upload_cubit.dart b/lib/blocs/upload/upload_cubit.dart
@@ -496,9 +496,11 @@ class UploadCubit extends Cubit<UploadState> {
           emit(readyState.copyWith(
               loadingArNSNames: false, showArnsCheckbox: showArnsCheckbox));
         } catch (e) {
-          final readyState = state as UploadReady;
-          emit(readyState.copyWith(
-              loadingArNSNamesError: true, loadingArNSNames: false));
+          if (state is UploadReady) {
+            final readyState = state as UploadReady;
+            emit(readyState.copyWith(
+                loadingArNSNamesError: true, loadingArNSNames: false));
+          }
         }
       } else {
         emit(

diff --git a/lib/pages/drive_detail/drive_detail_page.dart b/lib/pages/drive_detail/drive_detail_page.dart
@@ -132,7 +132,8 @@ class _DriveDetailPageState extends State<DriveDetailPage> {
         child: BlocListener<DrivesCubit, DrivesState>(
           listener: (context, state) {
             if (state is DrivesLoadSuccess) {
-              if (state.userDrives.isNotEmpty) {
+              if (state.userDrives.isNotEmpty ||
+                  state.sharedDrives.isNotEmpty) {
                 final driveDetailState = context.read<DriveDetailCubit>().state;
 
                 if (driveDetailState is DriveDetailLoadSuccess &&

diff --git a/packages/ardrive_uploader/lib/src/upload_dispatcher.dart b/packages/ardrive_uploader/lib/src/upload_dispatcher.dart
@@ -29,6 +29,14 @@ class UploadDispatcher {
   }) async {
     try {
       if (task is FileUploadTask) {
+        logger.d('Preparing data items for file ${task.file.name}...');
+
+        controller.updateProgress(
+          task: task.copyWith(
+            status: UploadStatus.creatingMetadata,
+          ),
+        );
+
         final uploadPreparation = await prepareDataItems(
           file: task.file,
           metadata: task.metadata,