Improve mime type handling using magic byes
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
67
package-lock.json
generated
67
package-lock.json
generated
@@ -18,6 +18,7 @@
|
|||||||
"@realm/react": "^0.5.1",
|
"@realm/react": "^0.5.1",
|
||||||
"@reduxjs/toolkit": "^1.9.5",
|
"@reduxjs/toolkit": "^1.9.5",
|
||||||
"@shopify/flash-list": "^1.4.3",
|
"@shopify/flash-list": "^1.4.3",
|
||||||
|
"magic-bytes.js": "^1.0.15",
|
||||||
"react": "18.2.0",
|
"react": "18.2.0",
|
||||||
"react-native": "0.72.2",
|
"react-native": "0.72.2",
|
||||||
"react-native-document-picker": "^9.0.1",
|
"react-native-document-picker": "^9.0.1",
|
||||||
@@ -5617,6 +5618,29 @@
|
|||||||
"readable-stream": "^3.4.0"
|
"readable-stream": "^3.4.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/bl/node_modules/buffer": {
|
||||||
|
"version": "5.7.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
|
||||||
|
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "github",
|
||||||
|
"url": "https://github.com/sponsors/feross"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "patreon",
|
||||||
|
"url": "https://www.patreon.com/feross"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "consulting",
|
||||||
|
"url": "https://feross.org/support"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"dependencies": {
|
||||||
|
"base64-js": "^1.3.1",
|
||||||
|
"ieee754": "^1.1.13"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/brace-expansion": {
|
"node_modules/brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.11",
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||||
@@ -5687,7 +5711,7 @@
|
|||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/buffer": {
|
"node_modules/bson/node_modules/buffer": {
|
||||||
"version": "5.7.1",
|
"version": "5.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
|
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
|
||||||
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
|
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
|
||||||
@@ -11095,6 +11119,11 @@
|
|||||||
"yallist": "^3.0.2"
|
"yallist": "^3.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/magic-bytes.js": {
|
||||||
|
"version": "1.0.15",
|
||||||
|
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.0.15.tgz",
|
||||||
|
"integrity": "sha512-bpRmwbRHqongRhA+mXzbLWjVy7ylqmfMBYaQkSs6pac0z6hBTvsgrH0r4FBYd/UYVJBmS6Rp/O+oCCQVLzKV1g=="
|
||||||
|
},
|
||||||
"node_modules/magic-string": {
|
"node_modules/magic-string": {
|
||||||
"version": "0.30.1",
|
"version": "0.30.1",
|
||||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
|
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
|
||||||
@@ -19947,6 +19976,17 @@
|
|||||||
"buffer": "^5.5.0",
|
"buffer": "^5.5.0",
|
||||||
"inherits": "^2.0.4",
|
"inherits": "^2.0.4",
|
||||||
"readable-stream": "^3.4.0"
|
"readable-stream": "^3.4.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"buffer": {
|
||||||
|
"version": "5.7.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
|
||||||
|
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
|
||||||
|
"requires": {
|
||||||
|
"base64-js": "^1.3.1",
|
||||||
|
"ieee754": "^1.1.13"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"brace-expansion": {
|
"brace-expansion": {
|
||||||
@@ -19991,15 +20031,17 @@
|
|||||||
"integrity": "sha512-Uu4OCZa0jouQJCKOk1EmmyqtdWAP5HVLru4lQxTwzJzxT+sJ13lVpEZU/MATDxtHiekWMAL84oQY3Xn1LpJVSg==",
|
"integrity": "sha512-Uu4OCZa0jouQJCKOk1EmmyqtdWAP5HVLru4lQxTwzJzxT+sJ13lVpEZU/MATDxtHiekWMAL84oQY3Xn1LpJVSg==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"buffer": "^5.6.0"
|
"buffer": "^5.6.0"
|
||||||
}
|
},
|
||||||
},
|
"dependencies": {
|
||||||
"buffer": {
|
"buffer": {
|
||||||
"version": "5.7.1",
|
"version": "5.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
|
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
|
||||||
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
|
"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"base64-js": "^1.3.1",
|
"base64-js": "^1.3.1",
|
||||||
"ieee754": "^1.1.13"
|
"ieee754": "^1.1.13"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"buffer-from": {
|
"buffer-from": {
|
||||||
@@ -23979,6 +24021,11 @@
|
|||||||
"yallist": "^3.0.2"
|
"yallist": "^3.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"magic-bytes.js": {
|
||||||
|
"version": "1.0.15",
|
||||||
|
"resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.0.15.tgz",
|
||||||
|
"integrity": "sha512-bpRmwbRHqongRhA+mXzbLWjVy7ylqmfMBYaQkSs6pac0z6hBTvsgrH0r4FBYd/UYVJBmS6Rp/O+oCCQVLzKV1g=="
|
||||||
|
},
|
||||||
"magic-string": {
|
"magic-string": {
|
||||||
"version": "0.30.1",
|
"version": "0.30.1",
|
||||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
|
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
|
||||||
|
@@ -23,6 +23,7 @@
|
|||||||
"@realm/react": "^0.5.1",
|
"@realm/react": "^0.5.1",
|
||||||
"@reduxjs/toolkit": "^1.9.5",
|
"@reduxjs/toolkit": "^1.9.5",
|
||||||
"@shopify/flash-list": "^1.4.3",
|
"@shopify/flash-list": "^1.4.3",
|
||||||
|
"magic-bytes.js": "^1.0.15",
|
||||||
"react": "18.2.0",
|
"react": "18.2.0",
|
||||||
"react-native": "0.72.2",
|
"react-native": "0.72.2",
|
||||||
"react-native-document-picker": "^9.0.1",
|
"react-native-document-picker": "^9.0.1",
|
||||||
|
169
patches/react-native-file-access+3.0.4.patch
Normal file
169
patches/react-native-file-access+3.0.4.patch
Normal file
@@ -0,0 +1,169 @@
|
|||||||
|
diff --git a/node_modules/react-native-file-access/README.md b/node_modules/react-native-file-access/README.md
|
||||||
|
index e0540e0..9eb3295 100644
|
||||||
|
--- a/node_modules/react-native-file-access/README.md
|
||||||
|
+++ b/node_modules/react-native-file-access/README.md
|
||||||
|
@@ -155,6 +155,12 @@ type ManagedFetchResult = {
|
||||||
|
- Read the content of a file.
|
||||||
|
- Default encoding of returned string is utf8.
|
||||||
|
|
||||||
|
+`FileSystem.read(path: string, length?: number, position?: number): Promise<number[]>`
|
||||||
|
+
|
||||||
|
+- Read a file as a byte array.
|
||||||
|
+ - `length` - Optional number of bytes to read.
|
||||||
|
+ - `position` - Optional position to start reading from.
|
||||||
|
+
|
||||||
|
```
|
||||||
|
FileSystem.stat(path: string): Promise<FileStat>
|
||||||
|
|
||||||
|
diff --git a/node_modules/react-native-file-access/android/src/main/java/com/alpha0010/fs/FileAccessModule.kt b/node_modules/react-native-file-access/android/src/main/java/com/alpha0010/fs/FileAccessModule.kt
|
||||||
|
index 248a938..cbd4fe7 100644
|
||||||
|
--- a/node_modules/react-native-file-access/android/src/main/java/com/alpha0010/fs/FileAccessModule.kt
|
||||||
|
+++ b/node_modules/react-native-file-access/android/src/main/java/com/alpha0010/fs/FileAccessModule.kt
|
||||||
|
@@ -13,6 +13,8 @@ import com.facebook.react.bridge.Promise
|
||||||
|
import com.facebook.react.bridge.ReactApplicationContext
|
||||||
|
import com.facebook.react.bridge.ReactMethod
|
||||||
|
import com.facebook.react.bridge.ReadableMap
|
||||||
|
+import com.facebook.react.bridge.WritableArray
|
||||||
|
+import com.facebook.react.bridge.WritableNativeArray
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
@@ -400,6 +402,27 @@ class FileAccessModule internal constructor(context: ReactApplicationContext) :
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ @ReactMethod
|
||||||
|
+ override fun read(path: String, length: Double, position: Double, promise: Promise) {
|
||||||
|
+ ioScope.launch {
|
||||||
|
+ try {
|
||||||
|
+ val data = openForReading(path).use {
|
||||||
|
+ it.skip(position.toLong())
|
||||||
|
+ val byteArray = ByteArray(length.toInt())
|
||||||
|
+ it.read(byteArray)
|
||||||
|
+ byteArray
|
||||||
|
+ }
|
||||||
|
+ val writableArray: WritableArray = WritableNativeArray()
|
||||||
|
+ for (byte in data) {
|
||||||
|
+ writableArray.pushInt(byte.toInt() and 0xFF)
|
||||||
|
+ }
|
||||||
|
+ promise.resolve(writableArray)
|
||||||
|
+ } catch (e: Throwable) {
|
||||||
|
+ promise.reject(e)
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
@ReactMethod
|
||||||
|
override fun stat(path: String, promise: Promise) {
|
||||||
|
ioScope.launch {
|
||||||
|
diff --git a/node_modules/react-native-file-access/android/src/oldarch/FileAccessSpec.kt b/node_modules/react-native-file-access/android/src/oldarch/FileAccessSpec.kt
|
||||||
|
index 736324b..c223276 100644
|
||||||
|
--- a/node_modules/react-native-file-access/android/src/oldarch/FileAccessSpec.kt
|
||||||
|
+++ b/node_modules/react-native-file-access/android/src/oldarch/FileAccessSpec.kt
|
||||||
|
@@ -30,6 +30,7 @@ abstract class FileAccessSpec internal constructor(context: ReactApplicationCont
|
||||||
|
abstract fun mkdir(path: String, promise: Promise)
|
||||||
|
abstract fun mv(source: String, target: String, promise: Promise)
|
||||||
|
abstract fun readFile(path: String, encoding: String, promise: Promise)
|
||||||
|
+ abstract fun read(path: String, length: Double, position: Double, promise: Promise)
|
||||||
|
abstract fun stat(path: String, promise: Promise)
|
||||||
|
abstract fun statDir(path: String, promise: Promise)
|
||||||
|
abstract fun unlink(path: String, promise: Promise)
|
||||||
|
diff --git a/node_modules/react-native-file-access/lib/commonjs/index.js b/node_modules/react-native-file-access/lib/commonjs/index.js
|
||||||
|
index 88f1c2c..20eb70b 100644
|
||||||
|
--- a/node_modules/react-native-file-access/lib/commonjs/index.js
|
||||||
|
+++ b/node_modules/react-native-file-access/lib/commonjs/index.js
|
||||||
|
@@ -209,6 +209,12 @@ const FileSystem = {
|
||||||
|
let encoding = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'utf8';
|
||||||
|
return FileAccessNative.readFile(path, encoding);
|
||||||
|
},
|
||||||
|
+ /**
|
||||||
|
+ * Read the content of a file as a byte array.
|
||||||
|
+ */
|
||||||
|
+ read(path, length, position) {
|
||||||
|
+ return FileAccessNative.read(path, length, position);
|
||||||
|
+ },
|
||||||
|
/**
|
||||||
|
* Read file metadata.
|
||||||
|
*/
|
||||||
|
diff --git a/node_modules/react-native-file-access/lib/module/index.js b/node_modules/react-native-file-access/lib/module/index.js
|
||||||
|
index 0581920..22c37d3 100644
|
||||||
|
--- a/node_modules/react-native-file-access/lib/module/index.js
|
||||||
|
+++ b/node_modules/react-native-file-access/lib/module/index.js
|
||||||
|
@@ -198,6 +198,12 @@ export const FileSystem = {
|
||||||
|
let encoding = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'utf8';
|
||||||
|
return FileAccessNative.readFile(path, encoding);
|
||||||
|
},
|
||||||
|
+ /**
|
||||||
|
+ * Read the content of a file as a byte array.
|
||||||
|
+ */
|
||||||
|
+ read(path, length, position) {
|
||||||
|
+ return FileAccessNative.read(path, length, position);
|
||||||
|
+ },
|
||||||
|
/**
|
||||||
|
* Read file metadata.
|
||||||
|
*/
|
||||||
|
diff --git a/node_modules/react-native-file-access/lib/typescript/NativeFileAccess.d.ts b/node_modules/react-native-file-access/lib/typescript/NativeFileAccess.d.ts
|
||||||
|
index 0c58874..ed84081 100644
|
||||||
|
--- a/node_modules/react-native-file-access/lib/typescript/NativeFileAccess.d.ts
|
||||||
|
+++ b/node_modules/react-native-file-access/lib/typescript/NativeFileAccess.d.ts
|
||||||
|
@@ -63,6 +63,7 @@ export interface Spec extends TurboModule {
|
||||||
|
mkdir(path: string): Promise<string>;
|
||||||
|
mv(source: string, target: string): Promise<void>;
|
||||||
|
readFile(path: string, encoding: string): Promise<string>;
|
||||||
|
+ read(path: string, length: number, position: number): Promise<number[]>;
|
||||||
|
stat(path: string): Promise<FileStat>;
|
||||||
|
statDir(path: string): Promise<FileStat[]>;
|
||||||
|
unlink(path: string): Promise<void>;
|
||||||
|
diff --git a/node_modules/react-native-file-access/lib/typescript/index.d.ts b/node_modules/react-native-file-access/lib/typescript/index.d.ts
|
||||||
|
index 5433d53..12854ca 100644
|
||||||
|
--- a/node_modules/react-native-file-access/lib/typescript/index.d.ts
|
||||||
|
+++ b/node_modules/react-native-file-access/lib/typescript/index.d.ts
|
||||||
|
@@ -84,6 +84,10 @@ export declare const FileSystem: {
|
||||||
|
* Read the content of a file.
|
||||||
|
*/
|
||||||
|
readFile(path: string, encoding?: Encoding): Promise<string>;
|
||||||
|
+ /**
|
||||||
|
+ * Read the content of a file as a byte array.
|
||||||
|
+ */
|
||||||
|
+ read(path: string, length?: number, position?: number): Promise<number[]>;
|
||||||
|
/**
|
||||||
|
* Read file metadata.
|
||||||
|
*/
|
||||||
|
diff --git a/node_modules/react-native-file-access/src/NativeFileAccess.ts b/node_modules/react-native-file-access/src/NativeFileAccess.ts
|
||||||
|
index b3a7baa..affd76c 100644
|
||||||
|
--- a/node_modules/react-native-file-access/src/NativeFileAccess.ts
|
||||||
|
+++ b/node_modules/react-native-file-access/src/NativeFileAccess.ts
|
||||||
|
@@ -71,6 +71,7 @@ export interface Spec extends TurboModule {
|
||||||
|
mkdir(path: string): Promise<string>;
|
||||||
|
mv(source: string, target: string): Promise<void>;
|
||||||
|
readFile(path: string, encoding: string): Promise<string>;
|
||||||
|
+ read(path: string, length: number, position: number): Promise<number[]>;
|
||||||
|
stat(path: string): Promise<FileStat>;
|
||||||
|
statDir(path: string): Promise<FileStat[]>;
|
||||||
|
unlink(path: string): Promise<void>;
|
||||||
|
diff --git a/node_modules/react-native-file-access/src/index.ts b/node_modules/react-native-file-access/src/index.ts
|
||||||
|
index 1b38d45..5c9fd5e 100644
|
||||||
|
--- a/node_modules/react-native-file-access/src/index.ts
|
||||||
|
+++ b/node_modules/react-native-file-access/src/index.ts
|
||||||
|
@@ -31,7 +31,6 @@ const LINKING_ERROR =
|
||||||
|
'- You rebuilt the app after installing the package\n' +
|
||||||
|
'- You are not using Expo Go\n';
|
||||||
|
|
||||||
|
-// @ts-expect-error
|
||||||
|
const isTurboModuleEnabled = global.__turboModuleProxy != null;
|
||||||
|
|
||||||
|
const FileAccessModule = isTurboModuleEnabled
|
||||||
|
@@ -275,6 +274,13 @@ export const FileSystem = {
|
||||||
|
return FileAccessNative.readFile(path, encoding);
|
||||||
|
},
|
||||||
|
|
||||||
|
+ /**
|
||||||
|
+ * Read the content of a file as a byte array.
|
||||||
|
+ */
|
||||||
|
+ read(path: string, length: number = 1000, position: number = 0) {
|
||||||
|
+ return FileAccessNative.read(path, length, position);
|
||||||
|
+ },
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* Read file metadata.
|
||||||
|
*/
|
@@ -9,14 +9,9 @@ import {
|
|||||||
useKeyboard,
|
useKeyboard,
|
||||||
} from '@react-native-community/hooks';
|
} from '@react-native-community/hooks';
|
||||||
import Clipboard from '@react-native-clipboard/clipboard';
|
import Clipboard from '@react-native-clipboard/clipboard';
|
||||||
import { documentPickerResponseToAddMemeFile, ROUTE } from '../types';
|
|
||||||
import {
|
|
||||||
allowedMimeTypes,
|
|
||||||
getFilenameFromUri,
|
|
||||||
guessMimeType,
|
|
||||||
noOp,
|
|
||||||
} from '../utilities';
|
|
||||||
import { useDispatch } from 'react-redux';
|
import { useDispatch } from 'react-redux';
|
||||||
|
import { documentPickerResponseToAddMemeFile, ROUTE } from '../types';
|
||||||
|
import { allowedMimeTypes, getFilenameFromUri, noOp } from '../utilities';
|
||||||
import { setSnackbarMessage } from '../state';
|
import { setSnackbarMessage } from '../state';
|
||||||
|
|
||||||
const floatingActionButtonStyles = StyleSheet.create({
|
const floatingActionButtonStyles = StyleSheet.create({
|
||||||
@@ -59,17 +54,11 @@ const FloatingActionButton = ({ visible = true }: { visible?: boolean }) => {
|
|||||||
dispatch(setSnackbarMessage('Clipboard does not contain a URI.'));
|
dispatch(setSnackbarMessage('Clipboard does not contain a URI.'));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const mimeType = guessMimeType(uri);
|
|
||||||
if (!mimeType) {
|
|
||||||
dispatch(setSnackbarMessage('Unsupported MIME type.'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
navigate(ROUTE.ADD_MEME, {
|
navigate(ROUTE.ADD_MEME, {
|
||||||
files: [
|
files: [
|
||||||
{
|
{
|
||||||
uri: uri,
|
uri: uri,
|
||||||
filename: getFilenameFromUri(uri),
|
filename: getFilenameFromUri(uri),
|
||||||
type: mimeType,
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
@@ -1,11 +1,11 @@
|
|||||||
import React, { useEffect } from 'react';
|
import React, { useState } from 'react';
|
||||||
import { HelperText, Text, TextInput, useTheme } from 'react-native-paper';
|
import { HelperText, Text, TextInput, useTheme } from 'react-native-paper';
|
||||||
import { Image } from 'react-native';
|
import { Image } from 'react-native';
|
||||||
import { useSafeAreaFrame } from 'react-native-safe-area-context';
|
import { useSafeAreaFrame } from 'react-native-safe-area-context';
|
||||||
import { useImageDimensions } from '@react-native-community/hooks/lib/useImageDimensions';
|
import { MemeFail, MemeTagSelector } from '..';
|
||||||
import { MemeFail, MemeTagSelector, LoadingView } from '..';
|
|
||||||
import { Tag } from '../../database';
|
import { Tag } from '../../database';
|
||||||
import { StringValidationResult, validateMemeTitle } from '../../utilities';
|
import { StringValidationResult, validateMemeTitle } from '../../utilities';
|
||||||
|
import { Dimensions } from '../../types';
|
||||||
|
|
||||||
const memeEditorStyles = {
|
const memeEditorStyles = {
|
||||||
image: {
|
image: {
|
||||||
@@ -46,10 +46,7 @@ const MemeEditor = ({
|
|||||||
const { width } = useSafeAreaFrame();
|
const { width } = useSafeAreaFrame();
|
||||||
const { colors } = useTheme();
|
const { colors } = useTheme();
|
||||||
|
|
||||||
const { dimensions, loading, error } = useImageDimensions({ uri: memeUri });
|
const [dimensions, setDimensions] = useState<Dimensions>();
|
||||||
useEffect(() => setMemeError(error), [error, setMemeError]);
|
|
||||||
|
|
||||||
if (!memeError && (loading || !dimensions)) return <LoadingView />;
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -64,7 +61,7 @@ const MemeEditor = ({
|
|||||||
<HelperText type="error" visible={!memeTitle.valid}>
|
<HelperText type="error" visible={!memeTitle.valid}>
|
||||||
{memeTitle.error}
|
{memeTitle.error}
|
||||||
</HelperText>
|
</HelperText>
|
||||||
{memeError || !dimensions ? (
|
{memeError ? (
|
||||||
<MemeFail
|
<MemeFail
|
||||||
style={[
|
style={[
|
||||||
{
|
{
|
||||||
@@ -79,19 +76,31 @@ const MemeEditor = ({
|
|||||||
<Image
|
<Image
|
||||||
source={{ uri: memeUri }}
|
source={{ uri: memeUri }}
|
||||||
style={[
|
style={[
|
||||||
{
|
dimensions
|
||||||
width: width * 0.92,
|
? {
|
||||||
height: Math.max(
|
width: width * 0.92,
|
||||||
Math.min(
|
height: Math.max(
|
||||||
((width * 0.92) / dimensions.width) * dimensions.height,
|
Math.min(
|
||||||
500,
|
((width * 0.92) / dimensions.width) * dimensions.height,
|
||||||
),
|
500,
|
||||||
100,
|
),
|
||||||
),
|
100,
|
||||||
},
|
),
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
width: width * 0.92,
|
||||||
|
height: width * 0.92,
|
||||||
|
},
|
||||||
memeEditorStyles.image,
|
memeEditorStyles.image,
|
||||||
]}
|
]}
|
||||||
resizeMode="contain"
|
resizeMode="contain"
|
||||||
|
onLoad={event => {
|
||||||
|
setDimensions({
|
||||||
|
width: event.nativeEvent.source.width,
|
||||||
|
height: event.nativeEvent.source.height,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
onError={event => setMemeError(event.nativeEvent.error as Error)}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
<Text
|
<Text
|
||||||
|
@@ -20,7 +20,7 @@ const memeTypePlural = {
|
|||||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||||
class Meme extends Object<Meme> {
|
class Meme extends Object<Meme> {
|
||||||
id!: BSON.UUID;
|
id!: BSON.UUID;
|
||||||
type!: MEME_TYPE;
|
memeType!: MEME_TYPE;
|
||||||
filename!: string;
|
filename!: string;
|
||||||
mimeType!: string;
|
mimeType!: string;
|
||||||
size!: number;
|
size!: number;
|
||||||
@@ -38,7 +38,7 @@ class Meme extends Object<Meme> {
|
|||||||
primaryKey: 'id',
|
primaryKey: 'id',
|
||||||
properties: {
|
properties: {
|
||||||
id: { type: 'uuid', default: () => new BSON.UUID() },
|
id: { type: 'uuid', default: () => new BSON.UUID() },
|
||||||
type: { type: 'string', indexed: true },
|
memeType: { type: 'string', indexed: true },
|
||||||
filename: 'string',
|
filename: 'string',
|
||||||
mimeType: 'string',
|
mimeType: 'string',
|
||||||
size: 'int',
|
size: 'int',
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
import React, { useCallback, useRef, useState } from 'react';
|
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
||||||
import { Appbar, Banner, Button, useTheme } from 'react-native-paper';
|
import { Appbar, Banner, Button, useTheme } from 'react-native-paper';
|
||||||
import { useNavigation } from '@react-navigation/native';
|
import { useNavigation } from '@react-navigation/native';
|
||||||
import { ScrollView, View } from 'react-native';
|
import { ScrollView, View } from 'react-native';
|
||||||
@@ -19,7 +19,8 @@ import { Meme, Tag } from '../../database';
|
|||||||
import { RootState } from '../../state';
|
import { RootState } from '../../state';
|
||||||
import {
|
import {
|
||||||
allowedMimeTypes,
|
allowedMimeTypes,
|
||||||
getMemeType,
|
getMemeTypeFromMimeType,
|
||||||
|
guessMimeType,
|
||||||
validateMemeTitle,
|
validateMemeTitle,
|
||||||
} from '../../utilities';
|
} from '../../utilities';
|
||||||
import { MemeEditor } from '../../components';
|
import { MemeEditor } from '../../components';
|
||||||
@@ -42,25 +43,46 @@ const AddMeme = ({
|
|||||||
const file = useRef(files.current[index]);
|
const file = useRef(files.current[index]);
|
||||||
const isLastFile = index === files.current.length - 1;
|
const isLastFile = index === files.current.length - 1;
|
||||||
|
|
||||||
const [memeUri, setMemeUri] = useState(file.current.uri);
|
const [memeLoading, setMemeLoading] = useState(true);
|
||||||
const [memeFilename, setMemeFilename] = useState(file.current.filename);
|
|
||||||
const [memeError, setMemeError] = useState<Error>();
|
const [memeError, setMemeError] = useState<Error>();
|
||||||
const [memeTitle, setMemeTitle] = useState(validateMemeTitle('New Meme'));
|
|
||||||
const [memeIsFavorite, setMemeIsFavorite] = useState(false);
|
|
||||||
const [memeTags, setMemeTags] = useState(new Map<string, Tag>());
|
|
||||||
|
|
||||||
const [isSaving, setIsSaving] = useState(false);
|
const [isSaving, setIsSaving] = useState(false);
|
||||||
const [isSavingAndAddingMore, setIsSavingAndAddingMore] = useState(false);
|
const [isSavingAndAddingMore, setIsSavingAndAddingMore] = useState(false);
|
||||||
|
|
||||||
const saveMeme = useCallback(async () => {
|
const [memeUri, setMemeUri] = useState(file.current.uri);
|
||||||
const uuid = new BSON.UUID();
|
const [memeFilename, setMemeFilename] = useState(file.current.filename);
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
const [memeMimeType, setMemeMimeType] = useState<string>();
|
||||||
const mimeType = file.current.type!;
|
const [memeTitle, setMemeTitle] = useState(validateMemeTitle('New Meme'));
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
const [memeIsFavorite, setMemeIsFavorite] = useState(false);
|
||||||
const memeType = getMemeType(mimeType)!;
|
const [memeTags, setMemeTags] = useState(new Map<string, Tag>());
|
||||||
|
|
||||||
const fileExtension = extension(mimeType) as string;
|
useEffect(() => {
|
||||||
if (!fileExtension) goBack();
|
const loadMeme = async () => {
|
||||||
|
const mimeType = await guessMimeType(file.current.uri);
|
||||||
|
if (!mimeType) {
|
||||||
|
setMemeError(
|
||||||
|
new Error('Could not determine MIME type or file is not supported.'),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setMemeMimeType(mimeType);
|
||||||
|
};
|
||||||
|
|
||||||
|
setMemeLoading(true);
|
||||||
|
void loadMeme();
|
||||||
|
setMemeLoading(false);
|
||||||
|
}, [file]);
|
||||||
|
|
||||||
|
const saveMeme = useCallback(async () => {
|
||||||
|
if (!memeMimeType) return;
|
||||||
|
const uuid = new BSON.UUID();
|
||||||
|
|
||||||
|
const memeType = getMemeTypeFromMimeType(memeMimeType);
|
||||||
|
if (!memeType) return;
|
||||||
|
|
||||||
|
const fileExtension = extension(memeMimeType);
|
||||||
|
if (!fileExtension) return;
|
||||||
|
|
||||||
const filename = `${uuid.toHexString()}-${Math.round(
|
const filename = `${uuid.toHexString()}-${Math.round(
|
||||||
Date.now() / 1000,
|
Date.now() / 1000,
|
||||||
@@ -73,9 +95,9 @@ const AddMeme = ({
|
|||||||
realm.write(() => {
|
realm.write(() => {
|
||||||
const meme: Meme | undefined = realm.create<Meme>(Meme.schema.name, {
|
const meme: Meme | undefined = realm.create<Meme>(Meme.schema.name, {
|
||||||
id: uuid,
|
id: uuid,
|
||||||
type: memeType,
|
memeType,
|
||||||
filename,
|
filename,
|
||||||
mimeType,
|
mimeType: memeMimeType,
|
||||||
size,
|
size,
|
||||||
title: memeTitle.parsed,
|
title: memeTitle.parsed,
|
||||||
isFavorite: memeIsFavorite,
|
isFavorite: memeIsFavorite,
|
||||||
@@ -89,7 +111,14 @@ const AddMeme = ({
|
|||||||
tag.memesLength = tag.memes.length;
|
tag.memesLength = tag.memes.length;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}, [goBack, memeIsFavorite, memeTags, memeTitle.parsed, realm, storageUri]);
|
}, [
|
||||||
|
memeIsFavorite,
|
||||||
|
memeMimeType,
|
||||||
|
memeTags,
|
||||||
|
memeTitle.parsed,
|
||||||
|
realm,
|
||||||
|
storageUri,
|
||||||
|
]);
|
||||||
|
|
||||||
const handleSave = useCallback(async () => {
|
const handleSave = useCallback(async () => {
|
||||||
setIsSaving(true);
|
setIsSaving(true);
|
||||||
@@ -97,6 +126,14 @@ const AddMeme = ({
|
|||||||
goBack();
|
goBack();
|
||||||
}, [goBack, saveMeme]);
|
}, [goBack, saveMeme]);
|
||||||
|
|
||||||
|
const resetState = useCallback(() => {
|
||||||
|
setMemeUri(file.current.uri);
|
||||||
|
setMemeFilename(file.current.filename);
|
||||||
|
setMemeTitle(validateMemeTitle('New Meme'));
|
||||||
|
setMemeIsFavorite(false);
|
||||||
|
setMemeTags(new Map<string, Tag>());
|
||||||
|
}, []);
|
||||||
|
|
||||||
const handleSaveAndNext = useCallback(async () => {
|
const handleSaveAndNext = useCallback(async () => {
|
||||||
setIsSaving(true);
|
setIsSaving(true);
|
||||||
await saveMeme();
|
await saveMeme();
|
||||||
@@ -105,12 +142,8 @@ const AddMeme = ({
|
|||||||
setIndex(index + 1);
|
setIndex(index + 1);
|
||||||
file.current = files.current[index + 1];
|
file.current = files.current[index + 1];
|
||||||
|
|
||||||
setMemeUri(file.current.uri);
|
resetState();
|
||||||
setMemeFilename(file.current.filename);
|
}, [index, resetState, saveMeme]);
|
||||||
setMemeTitle(validateMemeTitle('New Meme'));
|
|
||||||
setMemeIsFavorite(false);
|
|
||||||
setMemeTags(new Map<string, Tag>());
|
|
||||||
}, [index, saveMeme]);
|
|
||||||
|
|
||||||
const handleSaveAndAddMore = useCallback(async () => {
|
const handleSaveAndAddMore = useCallback(async () => {
|
||||||
setIsSavingAndAddingMore(true);
|
setIsSavingAndAddingMore(true);
|
||||||
@@ -126,12 +159,8 @@ const AddMeme = ({
|
|||||||
files.current = documentPickerResponseToAddMemeFile(response);
|
files.current = documentPickerResponseToAddMemeFile(response);
|
||||||
file.current = files.current[0];
|
file.current = files.current[0];
|
||||||
|
|
||||||
setMemeUri(file.current.uri);
|
resetState();
|
||||||
setMemeFilename(file.current.filename);
|
}, [goBack, resetState, saveMeme]);
|
||||||
setMemeTitle(validateMemeTitle('New Meme'));
|
|
||||||
setMemeIsFavorite(false);
|
|
||||||
setMemeTags(new Map<string, Tag>());
|
|
||||||
}, [goBack, saveMeme]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -180,10 +209,11 @@ const AddMeme = ({
|
|||||||
icon="plus"
|
icon="plus"
|
||||||
onPress={handleSaveAndAddMore}
|
onPress={handleSaveAndAddMore}
|
||||||
disabled={
|
disabled={
|
||||||
!memeTitle.valid ||
|
memeLoading ||
|
||||||
|
!!memeError ||
|
||||||
isSaving ||
|
isSaving ||
|
||||||
isSavingAndAddingMore ||
|
isSavingAndAddingMore ||
|
||||||
!!memeError ||
|
!memeTitle.valid ||
|
||||||
!isLastFile
|
!isLastFile
|
||||||
}
|
}
|
||||||
loading={isSavingAndAddingMore}
|
loading={isSavingAndAddingMore}
|
||||||
@@ -195,10 +225,11 @@ const AddMeme = ({
|
|||||||
icon="floppy"
|
icon="floppy"
|
||||||
onPress={isLastFile ? handleSave : handleSaveAndNext}
|
onPress={isLastFile ? handleSave : handleSaveAndNext}
|
||||||
disabled={
|
disabled={
|
||||||
!memeTitle.valid ||
|
memeLoading ||
|
||||||
|
!!memeError ||
|
||||||
isSaving ||
|
isSaving ||
|
||||||
isSavingAndAddingMore ||
|
isSavingAndAddingMore ||
|
||||||
!!memeError
|
!memeTitle.valid
|
||||||
}
|
}
|
||||||
loading={isSaving}
|
loading={isSaving}
|
||||||
style={editorStyles.saveButton}>
|
style={editorStyles.saveButton}>
|
||||||
|
@@ -17,7 +17,8 @@ import {
|
|||||||
allowedMimeTypes,
|
allowedMimeTypes,
|
||||||
deleteMeme,
|
deleteMeme,
|
||||||
favoriteMeme,
|
favoriteMeme,
|
||||||
getMemeType,
|
getMemeTypeFromMimeType,
|
||||||
|
guessMimeType,
|
||||||
noOp,
|
noOp,
|
||||||
validateMemeTitle,
|
validateMemeTitle,
|
||||||
} from '../../utilities';
|
} from '../../utilities';
|
||||||
@@ -47,6 +48,7 @@ const EditMeme = ({
|
|||||||
const [hasChanges, setHasChanges] = useState(false);
|
const [hasChanges, setHasChanges] = useState(false);
|
||||||
|
|
||||||
const [memeError, setMemeError] = useState<Error>();
|
const [memeError, setMemeError] = useState<Error>();
|
||||||
|
|
||||||
const [memeTitle, setMemeTitle] = useState(validateMemeTitle(meme.title));
|
const [memeTitle, setMemeTitle] = useState(validateMemeTitle(meme.title));
|
||||||
const [memeTags, setMemeTags] = useState(
|
const [memeTags, setMemeTags] = useState(
|
||||||
new Map<string, Tag>(meme.tags.map(tag => [tag.id.toHexString(), tag])),
|
new Map<string, Tag>(meme.tags.map(tag => [tag.id.toHexString(), tag])),
|
||||||
@@ -104,10 +106,16 @@ const EditMeme = ({
|
|||||||
const file = await pickSingle({ type: allowedMimeTypes }).catch(noOp);
|
const file = await pickSingle({ type: allowedMimeTypes }).catch(noOp);
|
||||||
if (!file) return;
|
if (!file) return;
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
const mimeType = await guessMimeType(file.uri, file.type);
|
||||||
const mimeType = file.type!;
|
if (!mimeType) {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
setMemeError(
|
||||||
const memeType = getMemeType(mimeType)!;
|
new Error('Could not determine MIME type or file is not supported.'),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const memeType = getMemeTypeFromMimeType(mimeType);
|
||||||
|
if (!memeType) return;
|
||||||
|
|
||||||
const fileExtension = extension(mimeType) as string;
|
const fileExtension = extension(mimeType) as string;
|
||||||
if (!fileExtension) return;
|
if (!fileExtension) return;
|
||||||
@@ -122,7 +130,7 @@ const EditMeme = ({
|
|||||||
|
|
||||||
realm.write(() => {
|
realm.write(() => {
|
||||||
meme.filename = filename;
|
meme.filename = filename;
|
||||||
meme.type = memeType;
|
meme.memeType = memeType;
|
||||||
meme.mimeType = mimeType;
|
meme.mimeType = mimeType;
|
||||||
meme.size = size;
|
meme.size = size;
|
||||||
});
|
});
|
||||||
|
@@ -80,7 +80,7 @@ const Memes = () => {
|
|||||||
.join(' OR ');
|
.join(' OR ');
|
||||||
|
|
||||||
if (favoritesOnly) collection = collection.filtered('isFavorite == true');
|
if (favoritesOnly) collection = collection.filtered('isFavorite == true');
|
||||||
if (filter) collection = collection.filtered('type == $0', filter);
|
if (filter) collection = collection.filtered('memeType == $0', filter);
|
||||||
if (tags && tagsQuery) {
|
if (tags && tagsQuery) {
|
||||||
collection = collection.filtered(tagsQuery, ...tags);
|
collection = collection.filtered(tagsQuery, ...tags);
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
import { DocumentPickerResponse } from 'react-native-document-picker';
|
import { DocumentPickerResponse } from 'react-native-document-picker';
|
||||||
import { getFilenameFromUri, guessMimeType } from '../utilities';
|
import { getFilenameFromUri } from '../utilities';
|
||||||
import { SharedItem } from './share';
|
import { SharedItem } from './share';
|
||||||
|
|
||||||
enum ROUTE {
|
enum ROUTE {
|
||||||
@@ -34,7 +34,7 @@ const documentPickerResponseToAddMemeFile = (
|
|||||||
return {
|
return {
|
||||||
uri,
|
uri,
|
||||||
filename: name ?? getFilenameFromUri(uri),
|
filename: name ?? getFilenameFromUri(uri),
|
||||||
type: type ?? guessMimeType(uri),
|
type: type ?? undefined,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -55,7 +55,7 @@ const sharedItemToAddMemeFile = (item: SharedItem): AddMemeFile[] => {
|
|||||||
return data.map(uri => ({
|
return data.map(uri => ({
|
||||||
uri,
|
uri,
|
||||||
filename: getFilenameFromUri(uri),
|
filename: getFilenameFromUri(uri),
|
||||||
type: guessMimeType(uri),
|
type: mimeType,
|
||||||
}));
|
}));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -1,3 +1,5 @@
|
|||||||
|
import { FileSystem } from 'react-native-file-access';
|
||||||
|
import filetypemime from 'magic-bytes.js';
|
||||||
import { MEME_TYPE } from '../database';
|
import { MEME_TYPE } from '../database';
|
||||||
|
|
||||||
const allowedImageMimeTypes = [
|
const allowedImageMimeTypes = [
|
||||||
@@ -12,7 +14,7 @@ const allowedGifMimeTypes = ['image/gif'];
|
|||||||
|
|
||||||
const allowedMimeTypes = [...allowedImageMimeTypes, ...allowedGifMimeTypes];
|
const allowedMimeTypes = [...allowedImageMimeTypes, ...allowedGifMimeTypes];
|
||||||
|
|
||||||
const getMemeType = (mimeType: string): MEME_TYPE | undefined => {
|
const getMemeTypeFromMimeType = (mimeType: string): MEME_TYPE | undefined => {
|
||||||
switch (mimeType) {
|
switch (mimeType) {
|
||||||
case 'image/bmp':
|
case 'image/bmp':
|
||||||
case 'image/jpg':
|
case 'image/jpg':
|
||||||
@@ -27,7 +29,7 @@ const getMemeType = (mimeType: string): MEME_TYPE | undefined => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const guessMimeType = (filename: string): string | undefined => {
|
const guessMimeTypeFromExtension = (filename: string): string | undefined => {
|
||||||
const extension = filename.split('.').pop()?.toLowerCase();
|
const extension = filename.split('.').pop()?.toLowerCase();
|
||||||
switch (extension) {
|
switch (extension) {
|
||||||
case 'bmp': {
|
case 'bmp': {
|
||||||
@@ -49,10 +51,34 @@ const guessMimeType = (filename: string): string | undefined => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const guessMimeTypeFromMagicBytes = async (
|
||||||
|
uri: string,
|
||||||
|
): Promise<string | undefined> => {
|
||||||
|
const fileContent = await FileSystem.read(uri, 100);
|
||||||
|
const possibleMimeTypes = filetypemime(fileContent);
|
||||||
|
if (possibleMimeTypes.length === 0) return undefined;
|
||||||
|
return possibleMimeTypes[0].mime;
|
||||||
|
};
|
||||||
|
|
||||||
|
const guessMimeType = async (
|
||||||
|
uri: string,
|
||||||
|
hint?: string | null,
|
||||||
|
): Promise<string | undefined> => {
|
||||||
|
if (hint) {
|
||||||
|
if (allowedMimeTypes.includes(hint)) return hint;
|
||||||
|
if (!hint.startsWith('image/')) return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const guessedMimeType = guessMimeTypeFromExtension(uri);
|
||||||
|
if (guessedMimeType) return guessedMimeType;
|
||||||
|
|
||||||
|
return await guessMimeTypeFromMagicBytes(uri);
|
||||||
|
};
|
||||||
|
|
||||||
export {
|
export {
|
||||||
allowedImageMimeTypes,
|
allowedImageMimeTypes,
|
||||||
allowedGifMimeTypes,
|
allowedGifMimeTypes,
|
||||||
allowedMimeTypes,
|
allowedMimeTypes,
|
||||||
getMemeType,
|
getMemeTypeFromMimeType,
|
||||||
guessMimeType,
|
guessMimeType,
|
||||||
};
|
};
|
||||||
|
@@ -14,7 +14,7 @@ export {
|
|||||||
allowedImageMimeTypes,
|
allowedImageMimeTypes,
|
||||||
allowedGifMimeTypes,
|
allowedGifMimeTypes,
|
||||||
allowedMimeTypes,
|
allowedMimeTypes,
|
||||||
getMemeType,
|
getMemeTypeFromMimeType,
|
||||||
guessMimeType,
|
guessMimeType,
|
||||||
} from './filesystem';
|
} from './filesystem';
|
||||||
export { getSortIcon, getViewIcon } from './icon';
|
export { getSortIcon, getViewIcon } from './icon';
|
||||||
|
Reference in New Issue
Block a user