beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix getExifData breaking for some files

Browse source
This commit is contained in:
Abhinav 2021-11-10 14:53:23 +05:30
parent c47d24eb8c
commit 88f643192c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/services/updateCreationTimeWithExif.ts
View file

@ -1,6 +1,7 @@
import { SetProgressTracker } from 'components/FixLargeThumbnail';
import {
changeFileCreationTime,
getFileFromURL,
updateExistingFilePubMetadata,
} from 'utils/file';
import { logError } from 'utils/sentry';
@ -8,7 +9,7 @@ import localForage from 'utils/storage/localForage';
import downloadManager from './downloadManager';
import { getLocalFiles, File, updatePublicMagicMetadata } from './fileService';
import { getLocalTrash, getTrashedFiles } from './trashService';
import { getExifDataFromURL } from './upload/exifService';
import { getExifData } from './upload/exifService';
const CREATION_TIME_UPDATED_FILES_TABLE = 'creation-time-updated-file-table';
@ -52,7 +53,8 @@ export async function updateCreationTimeWithExif(
for (const [index, file] of filesToBeUpdated.entries()) {
try {
const fileURL = await downloadManager.getFile(file);
const exifData = await getExifDataFromURL(fileURL);
const fileObject = await getFileFromURL(fileURL);
const exifData = await getExifData(fileObject);
if (
exifData?.creationTime &&
exifData?.creationTime !== file.metadata.creationTime

6
src/utils/file/index.ts
View file

@ -438,3 +438,9 @@ export function updateExistingFilePubMetadata(
existingFile.pubMagicMetadata = updatedFile.pubMagicMetadata;
existingFile.metadata = mergeMetadata([existingFile])[0].metadata;
}
export async function getFileFromURL(fileURL: string) {
const fileBlob = await (await fetch(fileURL)).blob();
const fileFile = new globalThis.File([fileBlob], 'temp');
return fileFile;
}