Comments out the heic support, and removes heic2any as a dependency. …

…See: alexcorvi/heic2any#53
KenEucker · Nov 15, 2023 · f237689 · f237689
1 parent bf0e657
commit f237689
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
     "crypto-js": "^4.1.1",
     "dom-to-image": "^2.6.0",
     "exifr": "^7.1.3",
-    "heic2any": "^0.0.4",
     "jose": "^4.6.0",
     "liquidjs": "^9.34.0",
     "loglevel": "^1.8.0",

diff --git a/src/components/QueueFound.vue b/src/components/QueueFound.vue
@@ -55,7 +55,7 @@
         ref="file"
         type="file"
         class="d-none"
-        accept="image/*,.heic,.heif"
+        accept="image/*"
         required
         @change="setImage"
       />
@@ -135,7 +135,7 @@ import { debug, isPointInPolygon, isAuthenticationEnabled } from '@/common/utils
 import { useI18n } from 'vue-i18n'
 import exifr from 'exifr'
 import Pin from '@/assets/images/pin.svg'
-import heic2any from 'heic2any';
+// import heic2any from 'heic2any';
 
 // components
 import Loading from 'vue-loading-overlay'
@@ -354,27 +354,29 @@ const setImage = async (event) => {
           position: 'top',
         })
       } else {
-        const imageFile = input.files[0];
+        // const imageFile = input.files[0];
+        image.value = input.files[0];
 
         // Check if the file type is HEIC
-        if (imageFile.type === 'image/heic' || imageFile.name.toLowerCase().endsWith('.heic')) {
-          try {
-            const pngBlob = await heic2any({ blob: imageFile });
-            const pngFile = new File([pngBlob], 'converted.png', { type: 'image/png' });
-            image.value = pngFile;
-          } catch (conversionError) {
-            console.error('Error converting HEIC to PNG:', conversionError);
-            toast.open({
-              message: 'Error converting HEIC to PNG',
-              type: 'error',
-              position: 'top',
-            });
-            return;
-          }
-        } else {
-          // For non-HEIC files, proceed with the original image
-          image.value = imageFile;
-        }
+        // TODO: this needs resolved: https://github.com/alexcorvi/heic2any/issues/53
+        // if (imageFile.type === 'image/heic' || imageFile.name.toLowerCase().endsWith('.heic')) {
+        //   try {
+        //     const pngBlob = await heic2any({ blob: imageFile });
+        //     const pngFile = new File([pngBlob], 'converted.png', { type: 'image/png' });
+        //     image.value = pngFile;
+        //   } catch (conversionError) {
+        //     console.error('Error converting HEIC to PNG:', conversionError);
+        //     toast.open({
+        //       message: 'Error converting HEIC to PNG',
+        //       type: 'error',
+        //       position: 'top',
+        //     });
+        //     return;
+        //   }
+        // } else {
+        //   // For non-HEIC files, proceed with the original image
+        //   image.value = imageFile;
+        // }
         const results = await exifr.parse(await input.files[0].arrayBuffer());
         const createDate = results?.CreateDate ?? results?.DateTimeOriginal ?? Date.now();
 

diff --git a/src/components/QueueMystery.vue b/src/components/QueueMystery.vue
@@ -101,7 +101,7 @@ import { useStore } from '@/store/index'
 import { ordinalSuffixOf } from '@/common/utils'
 import exifr from 'exifr'
 import { useI18n } from 'vue-i18n'
-import heic2any from 'heic2any';
+// import heic2any from 'heic2any';
 
 // components
 import BikeTagButton from '@/components/BikeTagButton.vue'
@@ -203,27 +203,28 @@ const setImage = async (event) => {
           position: 'top',
         })
       } else {
-        const imageFile = input.files[0];
+        // const imageFile = input.files[0];
+        image.value = input.files[0];
 
-        // Check if the file type is HEIC
-        if (imageFile.type === 'image/heic' || imageFile.name.toLowerCase().endsWith('.heic')) {
-          try {
-            const pngBlob = await heic2any({ blob: imageFile });
-            const pngFile = new File([pngBlob], 'converted.png', { type: 'image/png' });
-            image.value = pngFile;
-          } catch (conversionError) {
-            console.error('Error converting HEIC to PNG:', conversionError);
-            toast.open({
-              message: 'Error converting HEIC to PNG',
-              type: 'error',
-              position: 'top',
-            });
-            return;
-          }
-        } else {
-          // For non-HEIC files, proceed with the original image
-          image.value = imageFile;
-        }
+        // // Check if the file type is HEIC
+        // if (imageFile.type === 'image/heic' || imageFile.name.toLowerCase().endsWith('.heic')) {
+        //   try {
+        //     const pngBlob = await heic2any({ blob: imageFile });
+        //     const pngFile = new File([pngBlob], 'converted.png', { type: 'image/png' });
+        //     image.value = pngFile;
+        //   } catch (conversionError) {
+        //     console.error('Error converting HEIC to PNG:', conversionError);
+        //     toast.open({
+        //       message: 'Error converting HEIC to PNG',
+        //       type: 'error',
+        //       position: 'top',
+        //     });
+        //     return;
+        //   }
+        // } else {
+        //   // For non-HEIC files, proceed with the original image
+        //   image.value = imageFile;
+        // }
         const results = await exifr.parse(await input.files[0].arrayBuffer());
         const createDate = results?.CreateDate ?? results?.DateTimeOriginal ?? Date.now();