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

Prune

Browse source
This commit is contained in:
Manav Rathi 2024-04-24 11:29:54 +05:30
parent 3b0433c4ab
commit 58d2670171
No known key found for this signature in database
4 changed files with 67 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
web/apps/photos/src/services/upload/uploadManager.ts
View file

@ -1,3 +1,4 @@
import { potentialFileTypeFromExtension } from "@/media/live-photo";
import { ensureElectron } from "@/next/electron";
import { nameAndExtension } from "@/next/file";
import log from "@/next/log";
@ -57,7 +58,6 @@ import UploadService, {
getFileName,
uploader,
} from "./uploadService";
import { getFileTypeFromExtensionForLivePhotoClustering } from "utils/file/livePhoto";
const MAX_CONCURRENT_UPLOADS = 4;
@ -820,47 +820,32 @@ const clusterLivePhotos = (mediaFiles: FileWithCollection2[]) => {
while (index < mediaFiles.length - 1) {
const f = mediaFiles[index];
const g = mediaFiles[index + 1];
const fFileType = getFileTypeFromExtensionForLivePhotoClustering(
getFileName(f.file),
);
const gFileType = getFileTypeFromExtensionForLivePhotoClustering(
getFileName(g.file),
);
const fFileName = getFileName(f.file);
const gFileName = getFileName(g.file);
const fFileType = potentialFileTypeFromExtension(fFileName);
const gFileType = potentialFileTypeFromExtension(gFileName);
const fa: PotentialLivePhotoAsset = {
collectionID: f.collectionID,
fileName: fFileName,
fileType: fFileType,
fileName: getFileName(f.file),
collectionID: f.collectionID,
/* TODO(MR): ElectronFile changes */
size: (f as FileWithCollection).file.size,
};
const ga: PotentialLivePhotoAsset = {
collectionID: g.collectionID,
fileName: gFileName,
fileType: gFileType,
fileName: getFileName(g.file),
collectionID: g.collectionID,
/* TODO(MR): ElectronFile changes */
size: (g as FileWithCollection).file.size,
};
if (areLivePhotoAssets(fa, ga)) {
let imageFile: File | ElectronFile | string;
let videoFile: File | ElectronFile | string;
if (
fFileType === FILE_TYPE.IMAGE &&
gFileType === FILE_TYPE.VIDEO
) {
imageFile = f.file;
videoFile = g.file;
} else {
videoFile = f.file;
imageFile = g.file;
}
const livePhotoLocalID = f.localID;
result.push({
localID: livePhotoLocalID,
localID: f.localID,
collectionID: f.collectionID,
isLivePhoto: true,
livePhotoAssets: {
image: imageFile,
video: videoFile,
image: fFileType == FILE_TYPE.IMAGE ? f.file : g.file,
video: fFileType == FILE_TYPE.IMAGE ? g.file : f.file,
},
});
index += 2;
@ -882,9 +867,9 @@ const clusterLivePhotos = (mediaFiles: FileWithCollection2[]) => {
};
interface PotentialLivePhotoAsset {
collectionID: number;
fileType: FILE_TYPE;
fileName: string;
fileType: FILE_TYPE;
collectionID: number;
size: number;
}

42
web/apps/photos/src/utils/file/livePhoto.ts
View file

@ -1,42 +0,0 @@
import { FILE_TYPE } from "constants/file";
import { getFileExtension } from "utils/file";
const IMAGE_EXTENSIONS = [
"heic",
"heif",
"jpeg",
"jpg",
"png",
"gif",
"bmp",
"tiff",
"webp",
];
const VIDEO_EXTENSIONS = [
"mov",
"mp4",
"m4v",
"avi",
"wmv",
"flv",
"mkv",
"webm",
"3gp",
"3g2",
"avi",
"ogv",
"mpg",
"mp",
];
export function getFileTypeFromExtensionForLivePhotoClustering(
filename: string,
) {
const extension = getFileExtension(filename)?.toLowerCase();
if (IMAGE_EXTENSIONS.includes(extension)) {
return FILE_TYPE.IMAGE;
} else if (VIDEO_EXTENSIONS.includes(extension)) {
return FILE_TYPE.VIDEO;
}
}

6
web/packages/media/file.ts Normal file
View file

@ -0,0 +1,6 @@
export enum FILE_TYPE {
IMAGE,
VIDEO,
LIVE_PHOTO,
OTHERS,
}

47
web/packages/media/live-photo.ts
View file

@ -1,5 +1,52 @@
import { fileNameFromComponents, nameAndExtension } from "@/next/file";
import JSZip from "jszip";
import { FILE_TYPE } from "./file";
const potentialImageExtensions = [
"heic",
"heif",
"jpeg",
"jpg",
"png",
"gif",
"bmp",
"tiff",
"webp",
];
const potentialVideoExtensions = [
"mov",
"mp4",
"m4v",
"avi",
"wmv",
"flv",
"mkv",
"webm",
"3gp",
"3g2",
"avi",
"ogv",
"mpg",
"mp",
];
/**
* Use the file extension of the given {@link fileName} to deduce if is is
* potentially the image or the video part of a Live Photo.
*/
export const potentialFileTypeFromExtension = (
fileName: string,
): FILE_TYPE | undefined => {
let [, ext] = nameAndExtension(fileName);
if (!ext) return undefined;
ext = ext.toLowerCase();
if (potentialImageExtensions.includes(ext)) return FILE_TYPE.IMAGE;
else if (potentialVideoExtensions.includes(ext)) return FILE_TYPE.VIDEO;
else return undefined;
};
/**
* An in-memory representation of a live photo.