Merge pull request #1771 from ardriveapp/PE-6360-continue-uploads-des…

…pite-thumbnail-generation-failures PE-6360: fix(thumbnails)
ardriveapp · Jun 27, 2024 · 733d615 · 733d615
2 parents 9de0338 + 6bab575
commit 733d615
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 34 deletions.
diff --git a/android/fastlane/metadata/android/en-US/changelogs/132.txt b/android/fastlane/metadata/android/en-US/changelogs/132.txt
@@ -0,0 +1 @@
+- Fixes an issue with creating thumbnails for non-supported image extensions
diff --git a/lib/utils/file_type_helper.dart b/lib/utils/file_type_helper.dart
diff --git a/packages/ardrive_uploader/lib/src/ardrive_uploader.dart b/packages/ardrive_uploader/lib/src/ardrive_uploader.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:ardrive_io/ardrive_io.dart';
 import 'package:ardrive_uploader/ardrive_uploader.dart';
+import 'package:ardrive_uploader/src/constants.dart';
 import 'package:ardrive_uploader/src/upload_dispatcher.dart';
 import 'package:ardrive_uploader/src/utils/logger.dart';
 import 'package:ardrive_utils/ardrive_utils.dart';
@@ -161,7 +162,8 @@ class _ArDriveUploader implements ArDriveUploader {
       encryptionKey: driveKey,
       type: type,
       uploadThumbnail:
-          FileTypeHelper.isImage(file.contentType) && uploadThumbnail,
+          supportedImageTypesForThumbnails.contains(file.contentType) &&
+              uploadThumbnail,
     );
 
     uploadController.addTask(uploadTask);
@@ -225,7 +227,8 @@ class _ArDriveUploader implements ArDriveUploader {
         encryptionKey: driveKey,
         type: type,
         uploadThumbnail:
-            FileTypeHelper.isImage(f.$2.contentType) && uploadThumbnail,
+            supportedImageTypesForThumbnails.contains(f.$2.contentType) &&
+                uploadThumbnail,
       );
 
       uploadController.addTask(fileTask);
@@ -316,7 +319,8 @@ class _ArDriveUploader implements ArDriveUploader {
         content: [f.$1],
         type: type,
         uploadThumbnail:
-            FileTypeHelper.isImage(f.$2.contentType) && uploadThumbnail,
+            supportedImageTypesForThumbnails.contains(f.$2.contentType) &&
+                uploadThumbnail,
       );
 
       uploadController.addTask(fileTask);

diff --git a/packages/ardrive_uploader/lib/src/constants.dart b/packages/ardrive_uploader/lib/src/constants.dart
@@ -4,3 +4,11 @@ final int maxSizeSupportedByGCMEncryption = MiB(100).size;
 
 final uContractId =
     TransactionID('KTzTXT_ANmF84fWEKHzWURD1LWd9QaFR9yfYUwH2Lxw');
+
+const List<String> supportedImageTypesForThumbnails = [
+  'image/jpeg',
+  'image/png',
+  'image/gif',
+  'image/webp',
+  'image/bmp',
+];
diff --git a/packages/ardrive_uploader/lib/src/data_bundler.dart b/packages/ardrive_uploader/lib/src/data_bundler.dart
@@ -677,40 +677,44 @@ Future<UploadFilePreparation> prepareDataItems({
 
   /// Thumbnail generation
   if (addThumbnail) {
-    final thumbnailGenerationResult = await generateThumbnail(
-      await file.readAsBytes(),
-      ThumbnailSize.small,
-    );
+    try {
+      final thumbnailGenerationResult = await generateThumbnail(
+        await file.readAsBytes(),
+        ThumbnailSize.small,
+      );
 
-    thumbnailFile = await IOFile.fromData(
-      thumbnailGenerationResult.thumbnail,
-      name: 'thumbnail',
-      lastModifiedDate: DateTime.now(),
-      contentType: 'image/jpeg',
-    );
+      thumbnailFile = await IOFile.fromData(
+        thumbnailGenerationResult.thumbnail,
+        name: 'thumbnail',
+        lastModifiedDate: DateTime.now(),
+        contentType: 'image/jpeg',
+      );
 
-    final thumbnailMetadata = ThumbnailUploadMetadata(
-      height: thumbnailGenerationResult.height,
-      width: thumbnailGenerationResult.width,
-      size: thumbnailGenerationResult.thumbnail.length,
-      name: thumbnailGenerationResult.name,
-      relatesTo: metadata.dataTxId!,
-      contentType: 'image/jpeg',
-      originalFileId: metadata.id,
-    );
+      final thumbnailMetadata = ThumbnailUploadMetadata(
+        height: thumbnailGenerationResult.height,
+        width: thumbnailGenerationResult.width,
+        size: thumbnailGenerationResult.thumbnail.length,
+        name: thumbnailGenerationResult.name,
+        relatesTo: metadata.dataTxId!,
+        contentType: 'image/jpeg',
+        originalFileId: metadata.id,
+      );
 
-    thumbnailDataItem = await createDataItemForThumbnail(
-      file: thumbnailFile,
-      metadata: thumbnailMetadata,
-      wallet: wallet,
-      encryptionKey: key,
-      fileId: metadata.id,
-    );
+      thumbnailDataItem = await createDataItemForThumbnail(
+        file: thumbnailFile,
+        metadata: thumbnailMetadata,
+        wallet: wallet,
+        encryptionKey: key,
+        fileId: metadata.id,
+      );
 
-    thumbnailMetadata.setTxId = thumbnailDataItem.id;
+      thumbnailMetadata.setTxId = thumbnailDataItem.id;
 
-    /// needs to be `variants`
-    metadata.updateThumbnailInfo([thumbnailMetadata]);
+      metadata.updateThumbnailInfo([thumbnailMetadata]);
+    } catch (e) {
+      logger.e(
+          'Error generating thumbnail. We will proceed with the upload.', e);
+    }
   }
 
   onStartMetadataCreation?.call();

diff --git a/packages/ardrive_uploader/lib/src/upload_dispatcher.dart b/packages/ardrive_uploader/lib/src/upload_dispatcher.dart
@@ -91,7 +91,10 @@ class UploadDispatcher {
               verifyCancel: verifyCancel,
             );
           } catch (e) {
-            logger.e('Error uploading thumbnail: $e');
+            logger.e(
+              'Error uploading thumbnail. The file upload wont be affected.',
+              e,
+            );
           }
         }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: Secure, permanent storage
 
 publish_to: 'none'
 
-version: 2.48.0
+version: 2.48.1
 
 environment:
   sdk: '>=3.2.0 <4.0.0'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fixes an issue with creating thumbnails for non-supported image extensions