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

Get it back to a mergable state

Browse source
This commit is contained in:
Manav Rathi 2024-04-22 10:23:25 +05:30
parent 31a19cb738
commit d0956642b7
No known key found for this signature in database
5 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/apps/photos/src/components/Upload/Uploader.tsx
View file

@ -672,7 +672,8 @@ export default function Uploader(props: Props) {
const uploaderName = uploadManager.getUploaderName();
await preUploadAction();
await uploadManager.queueFilesForUpload(
filesWithCollections.files,
/* TODO(MR): ElectronFile changes */
filesWithCollections.files as FileWithCollection[],
filesWithCollections.collections,
uploaderName,
);

5
web/apps/photos/src/services/ffmpeg.ts
View file

@ -167,8 +167,9 @@ const ffmpegExec = async (
timeoutMS: number = 0,
): Promise<File | ElectronFile> => {
const electron = globalThis.electron;
if (electron) {
return electron.runFFmpegCmd(cmd, inputFile, outputFilename, timeoutMS);
if (electron || false) {
/* TODO(MR): ElectronFile changes */
// return electron.runFFmpegCmd(cmd, inputFile, outputFilename, timeoutMS);
} else {
return workerFactory
.instance()

2
web/apps/photos/src/services/searchService.ts
View file

@ -294,7 +294,7 @@ async function getClipSuggestion(
}
const clipResults = await searchClip(searchPhrase);
if (!clipResults) return clipResults;
if (!clipResults) return undefined;
return {
type: SuggestionType.CLIP,
value: clipResults,

13
web/apps/photos/src/services/upload/metadataService.ts
View file

@ -26,6 +26,7 @@ import {
ParsedExtractedMetadata,
ParsedMetadataJSON,
ParsedMetadataJSONMap,
type FileWithCollection,
type FileWithCollection2,
type LivePhotoAssets2,
} from "types/upload";
@ -369,7 +370,11 @@ export async function extractLivePhotoMetadata(
imageFileTypeInfo,
livePhotoAssets.image,
);
const videoHash = await getFileHash(worker, livePhotoAssets.video);
const videoHash = await getFileHash(
worker,
/* TODO(MR): ElectronFile changes */
livePhotoAssets.video as File | ElectronFile,
);
return {
metadata: {
...imageMetadata,
@ -426,13 +431,15 @@ export async function clusterLivePhotoFiles(mediaFiles: FileWithCollection2[]) {
collectionID: firstMediaFile.collectionID,
fileType: firstFileType,
name: getFileName(firstMediaFile.file),
size: firstMediaFile.file.size,
/* TODO(MR): ElectronFile changes */
size: (firstMediaFile as FileWithCollection).file.size,
};
const secondFileIdentifier: LivePhotoIdentifier = {
collectionID: secondMediaFile.collectionID,
fileType: secondFileType,
name: getFileName(secondMediaFile.file),
size: secondMediaFile.file.size,
/* TODO(MR): ElectronFile changes */
size: (secondMediaFile as FileWithCollection).file.size,
};
if (
areFilesLivePhotoAssets(

7
web/apps/photos/src/services/upload/uploadService.ts
View file

@ -445,7 +445,8 @@ export async function extractFileMetadata(
const { metadata, publicMagicMetadata } = await extractMetadata(
worker,
rawFile,
/* TODO(MR): ElectronFile changes */
rawFile as File | ElectronFile,
fileTypeInfo,
);
@ -565,7 +566,9 @@ export async function uploader(
fileWithCollection: FileWithCollection2,
uploaderName: string,
): Promise<UploadResponse> {
const { collection, localID, ...uploadAsset } = fileWithCollection;
const { collection, localID, ...uploadAsset2 } = fileWithCollection;
/* TODO(MR): ElectronFile changes */
const uploadAsset = uploadAsset2 as UploadAsset;
const fileNameSize = `${uploadService.getAssetName(
fileWithCollection,
)}_${convertBytesToHumanReadable(uploadService.getAssetSize(uploadAsset))}`;