kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-07 15:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restructure

Browse Source
This commit is contained in:
Manav Rathi 2025-02-18 16:52:39 +05:30
parent 764add95c8
commit fd7c25029e
No known key found for this signature in database
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
web/packages/gallery/components/viewer/data-source.ts
View File

@ -35,15 +35,27 @@ interface SlideData {
type ItemData = SlideData & {
/**
* If the file is a video, then this will be set to a renderable URL of the
* original when it becomes available.
* The {@link EnteFile} type of the file whose data we are.
*/
fileType?: FileType;
/**
* The renderable object URL of the image associated with the file.
*
* - For images, this will be the object URL of a renderable image.
* - For videos, this will not be defined.
* - For live photos, this will be a renderable object URL of the image
* portion of the live photo.
*/
imageURL?: string;
/**
* The renderable object URL of the video associated with the file.
*
* - For images, this will not be defined.
* - For videos, this will be the object URL of a renderable video.
* - For live photos, this will be a renderable object URL of the video
* portion of the live photo.
*/
videoURL?: string;
/**
* If the file is a live photo, then this will be set to a renderable URL of
* the original when it becomes available.
*/
livePhotoVideoURL?: string;
/**
* `true` if we should indicate to the user that we're still fetching data
* for this file.
@ -194,8 +206,10 @@ const forgetFailedItemDataForFileID = (fileID: number) => {
};
const enqueueUpdates = async (file: EnteFile) => {
const fileType = file.metadata.fileType;
const update = (itemData: ItemData) => {
_state.itemDataByFileID.set(file.id, itemData);
_state.itemDataByFileID.set(file.id, { ...itemData, fileType });
_state.needsRefreshByFileID.get(file.id)?.();
};
@ -233,14 +247,13 @@ const enqueueUpdates = async (file: EnteFile) => {
}
try {
switch (file.metadata.fileType) {
switch (fileType) {
case FileType.image: {
const sourceURLs =
await downloadManager.renderableSourceURLs(file);
const itemData = await withDimensions(
ensureString(sourceURLs.url),
);
update(itemData);
const imageURL = ensureString(sourceURLs.url);
const itemData = await withDimensions(imageURL);
update({ ...itemData, imageURL });
break;
}
@ -260,8 +273,8 @@ const enqueueUpdates = async (file: EnteFile) => {
const imageURL = await livePhotoSourceURLs.image();
const imageData = await withDimensions(ensureString(imageURL));
update(imageData);
const livePhotoVideoURL = await livePhotoSourceURLs.video();
update({ ...imageData, livePhotoVideoURL });
const videoURL = await livePhotoSourceURLs.video();
update({ ...imageData, videoURL });
break;
}
}
@ -323,16 +336,16 @@ export const exifForItemData = async (itemData: ItemData) => {
// - For videos, this will not be defined.
// - For live photos, this will be the object URL of the image portion of
// the live photo.
const { src: associatedImageURL } = itemData;
const { imageURL } = itemData;
if (!associatedImageURL) {
// This is a video. Use a placeholder.
if (!imageURL) {
// TODO(PS): This is a video. Use a placeholder.
return { tags: undefined, parsed: undefined };
}
try {
console.time("exif");
const blob = await (await fetch(associatedImageURL)).blob();
const blob = await (await fetch(imageURL)).blob();
const file = new File([blob], "");
const tags = await extractRawExif(file);
const parsed = parseExif(tags);

8
web/packages/gallery/components/viewer/photoswipe.ts
View File

@ -3,6 +3,7 @@
import log from "@/base/log";
import type { EnteFile } from "@/media/file";
import { FileType } from "@/media/file-type";
import { t } from "i18next";
import {
exifForItemData,
@ -210,7 +211,8 @@ export class FileViewerPhotoSwipe {
});
pswp.on("contentAppend", (e) => {
const videoURL = e.content.data.livePhotoVideoURL;
const { fileType, videoURL } = e.content.data;
if (fileType !== FileType.livePhoto) return;
if (!videoURL) return;
// This slide is displaying a live photo. Append a video element to
@ -234,7 +236,7 @@ export class FileViewerPhotoSwipe {
});
pswp.on("imageSizeChange", ({ content, width, height }) => {
if (!content.data.livePhotoVideoURL) return;
if (content.data.fileType !== FileType.livePhoto) return;
// This slide is displaying a live photo. Resize the size of the
// video element to match that of the image.
@ -271,7 +273,7 @@ export class FileViewerPhotoSwipe {
pswp.on("contentActivate", (e) => {
// Undo the effect of a previous "contentDeactivate" if it was
// displaying a live photo.
if (e.content?.slide.data?.livePhotoVideoURL) {
if (e.content?.slide.data?.fileType === FileType.livePhoto) {
e.content?.slide?.container
?.getElementsByTagName("video")[0]
?.play();