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

move updateFile creation time exif logic in else block and wrap the function in try catch block

Browse source
This commit is contained in:
Abhinav 2023-02-10 16:48:38 +05:30
parent 5856fbd06c
commit a19ff7d216
1 changed files with 68 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,70 +48,79 @@ export async function downloadFile(
token?: string, token?: string,
passwordToken?: string passwordToken?: string
) { ) {
let fileBlob: Blob; try {
const fileReader = new FileReader(); let fileBlob: Blob;
if (accessedThroughSharedURL) { const fileReader = new FileReader();
const fileURL = if (accessedThroughSharedURL) {
await PublicCollectionDownloadManager.getCachedOriginalFile( const fileURL =
await PublicCollectionDownloadManager.getCachedOriginalFile(
file
)[0];
if (!fileURL) {
fileBlob = await new Response(
await PublicCollectionDownloadManager.downloadFile(
token,
passwordToken,
file
)
).blob();
} else {
fileBlob = await (await fetch(fileURL)).blob();
}
} else {
const fileURL = await DownloadManager.getCachedOriginalFile(
file file
)[0]; )[0];
if (!fileURL) { if (!fileURL) {
fileBlob = await new Response( fileBlob = await new Response(
await PublicCollectionDownloadManager.downloadFile( await DownloadManager.downloadFile(file)
token, ).blob();
passwordToken, } else {
file fileBlob = await (await fetch(fileURL)).blob();
) }
).blob();
} else {
fileBlob = await (await fetch(fileURL)).blob();
} }
} else {
const fileURL = await DownloadManager.getCachedOriginalFile(file)[0]; if (file.metadata.fileType === FILE_TYPE.LIVE_PHOTO) {
if (!fileURL) { const motionPhoto = await decodeMotionPhoto(file, fileBlob);
fileBlob = await new Response( const image = new File(
await DownloadManager.downloadFile(file) [motionPhoto.image],
).blob(); motionPhoto.imageNameTitle
);
const imageType = await getFileType(image);
const tempImageURL = URL.createObjectURL(
new Blob([motionPhoto.image], { type: imageType.mimeType })
);
const video = new File(
[motionPhoto.video],
motionPhoto.videoNameTitle
);
const videoType = await getFileType(video);
const tempVideoURL = URL.createObjectURL(
new Blob([motionPhoto.video], { type: videoType.mimeType })
);
downloadUsingAnchor(tempImageURL, motionPhoto.imageNameTitle);
downloadUsingAnchor(tempVideoURL, motionPhoto.videoNameTitle);
} else { } else {
fileBlob = await (await fetch(fileURL)).blob(); const fileType = await getFileType(
new File([fileBlob], file.metadata.title)
);
if (
file.pubMagicMetadata?.data.editedTime &&
(fileType.exactType === TYPE_JPEG ||
fileType.exactType === TYPE_JPG)
) {
fileBlob = await updateFileCreationDateInEXIF(
fileReader,
fileBlob,
new Date(file.pubMagicMetadata.data.editedTime / 1000)
);
}
fileBlob = new Blob([fileBlob], { type: fileType.mimeType });
const tempURL = URL.createObjectURL(fileBlob);
downloadUsingAnchor(tempURL, file.metadata.title);
} }
} } catch (e) {
logError(e, 'failed to download file');
const fileType = await getFileType(
new File([fileBlob], file.metadata.title)
);
if (
file.pubMagicMetadata?.data.editedTime &&
(fileType.exactType === TYPE_JPEG || fileType.exactType === TYPE_JPG)
) {
fileBlob = await updateFileCreationDateInEXIF(
fileReader,
fileBlob,
new Date(file.pubMagicMetadata.data.editedTime / 1000)
);
}
let tempImageURL: string;
let tempVideoURL: string;
let tempURL: string;
if (file.metadata.fileType === FILE_TYPE.LIVE_PHOTO) {
const motionPhoto = await decodeMotionPhoto(file, fileBlob);
const image = new File([motionPhoto.image], motionPhoto.imageNameTitle);
const imageType = await getFileType(image);
tempImageURL = URL.createObjectURL(
new Blob([motionPhoto.image], { type: imageType.mimeType })
);
const video = new File([motionPhoto.video], motionPhoto.videoNameTitle);
const videoType = await getFileType(video);
tempVideoURL = URL.createObjectURL(
new Blob([motionPhoto.video], { type: videoType.mimeType })
);
downloadUsingAnchor(tempImageURL, motionPhoto.imageNameTitle);
downloadUsingAnchor(tempVideoURL, motionPhoto.videoNameTitle);
} else {
fileBlob = new Blob([fileBlob], { type: fileType.mimeType });
tempURL = URL.createObjectURL(fileBlob);
downloadUsingAnchor(tempURL, file.metadata.title);
} }
} }