Переглянути джерело

Merge branch 'dev/support-ios-file-type' of github.com:alextran1502/immich into dev/support-ios-file-type

Alex Tran 3 роки тому
батько
коміт
a27d03fb69

+ 0 - 1
mobile/lib/modules/home/ui/thumbnail_image.dart

@@ -49,7 +49,6 @@ class ThumbnailImage extends HookConsumerWidget {
         } else if (isMultiSelectEnable && !selectedAsset.contains(asset)) {
           ref.watch(homePageStateProvider.notifier).addSingleSelectedItem(asset);
         } else {
-          print(asset.id);
           if (asset.type == 'IMAGE') {
             AutoRouter.of(context).push(
               ImageViewerRoute(

+ 1 - 1
mobile/lib/modules/login/ui/login_form.dart

@@ -126,7 +126,7 @@ class LoginButton extends ConsumerWidget {
           } else {
             ImmichToast.show(
                 context: context,
-                msg: "Error logging you in, check server url, emald and password!",
+                msg: "Error logging you in, check server url, email and password!",
                 toastType: ToastType.error);
           }
         },

+ 2 - 10
mobile/lib/shared/services/backup.service.dart

@@ -37,20 +37,12 @@ class BackupService {
     for (var entity in assetList) {
       try {
         if (entity.type == AssetType.video) {
-          file = await entity.file;
+          file = await entity.originFile;
         } else {
-          file = await entity.file.timeout(const Duration(seconds: 5));
+          file = await entity.originFile.timeout(const Duration(seconds: 5));
         }
 
         if (file != null) {
-          // reading exif
-          // var exifData = await readExifFromFile(file);
-
-          // for (String key in exifData.keys) {
-          //   debugPrint("- $key (${exifData[key]?.tagType}): ${exifData[key]}");
-          // }
-
-          // debugPrint("------------------");
           String originalFileName = await entity.titleAsync;
           String fileNameWithoutPath = originalFileName.toString().split(".")[0];
           var fileExtension = p.extension(file.path);

+ 6 - 2
mobile/lib/utils/files_helper.dart

@@ -1,9 +1,7 @@
-import 'package:flutter/material.dart';
 import 'package:path/path.dart' as p;
 
 class FileHelper {
   static getMimeType(String filePath) {
-    debugPrint(filePath);
     var fileExtension = p.extension(filePath).split(".")[1];
 
     switch (fileExtension.toLowerCase()) {
@@ -28,6 +26,12 @@ class FileHelper {
       case 'avi':
         return {"type": "video", "subType": "x-msvideo"};
 
+      case 'heic':
+        return {"type": "image", "subType": "heic"};
+
+      case 'heif':
+        return {"type": "image", "subType": "heif"};
+
       default:
         return {"type": "unsupport", "subType": "unsupport"};
     }