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

Export caption in the sidecar file

Browse source
This commit is contained in:
Neeraj Gupta 2022-11-19 12:17:49 +05:30
parent 1b45b8447b
commit 14b8fe8288
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/services/exportService.ts
View file

@ -39,7 +39,6 @@ import {
} from 'utils/file'; } from 'utils/file';
import { updateFileCreationDateInEXIF } from './upload/exifService'; import { updateFileCreationDateInEXIF } from './upload/exifService';
import { Metadata } from 'types/upload';
import QueueProcessor from './queueProcessor'; import QueueProcessor from './queueProcessor';
import { Collection } from 'types/collection'; import { Collection } from 'types/collection';
import { import {
@ -460,11 +459,7 @@ class ExportService {
await this.exportMotionPhoto(fileStream, file, collectionPath); await this.exportMotionPhoto(fileStream, file, collectionPath);
} else { } else {
this.saveMediaFile(collectionPath, fileSaveName, fileStream); this.saveMediaFile(collectionPath, fileSaveName, fileStream);
await this.saveMetadataFile( await this.saveMetadataFile(collectionPath, fileSaveName, file);
collectionPath,
fileSaveName,
file.metadata
);
} }
} }
@ -483,11 +478,7 @@ class ExportService {
file.id file.id
); );
this.saveMediaFile(collectionPath, imageSaveName, imageStream); this.saveMediaFile(collectionPath, imageSaveName, imageStream);
await this.saveMetadataFile( await this.saveMetadataFile(collectionPath, imageSaveName, file);
collectionPath,
imageSaveName,
file.metadata
);
const videoStream = generateStreamFromArrayBuffer(motionPhoto.video); const videoStream = generateStreamFromArrayBuffer(motionPhoto.video);
const videoSaveName = getUniqueFileSaveName( const videoSaveName = getUniqueFileSaveName(
@ -496,11 +487,7 @@ class ExportService {
file.id file.id
); );
this.saveMediaFile(collectionPath, videoSaveName, videoStream); this.saveMediaFile(collectionPath, videoSaveName, videoStream);
await this.saveMetadataFile( await this.saveMetadataFile(collectionPath, videoSaveName, file);
collectionPath,
videoSaveName,
file.metadata
);
} }
private saveMediaFile( private saveMediaFile(
@ -516,11 +503,11 @@ class ExportService {
private async saveMetadataFile( private async saveMetadataFile(
collectionFolderPath: string, collectionFolderPath: string,
fileSaveName: string, fileSaveName: string,
metadata: Metadata file: EnteFile
) { ) {
await this.electronAPIs.saveFileToDisk( await this.electronAPIs.saveFileToDisk(
getFileMetadataSavePath(collectionFolderPath, fileSaveName), getFileMetadataSavePath(collectionFolderPath, fileSaveName),
getGoogleLikeMetadataFile(fileSaveName, metadata) getGoogleLikeMetadataFile(fileSaveName, file)
); );
} }

5
src/utils/export/index.ts
View file

@ -128,15 +128,18 @@ export const dedupe = (files: any[]) => {
export const getGoogleLikeMetadataFile = ( export const getGoogleLikeMetadataFile = (
fileSaveName: string, fileSaveName: string,
metadata: Metadata file: EnteFile
) => { ) => {
const metadata: Metadata = file.metadata;
const creationTime = Math.floor(metadata.creationTime / 1000000); const creationTime = Math.floor(metadata.creationTime / 1000000);
const modificationTime = Math.floor( const modificationTime = Math.floor(
(metadata.modificationTime ?? metadata.creationTime) / 1000000 (metadata.modificationTime ?? metadata.creationTime) / 1000000
); );
const captionValue: string = file?.pubMagicMetadata?.data?.caption ?? '';
return JSON.stringify( return JSON.stringify(
{ {
title: fileSaveName, title: fileSaveName,
caption: captionValue,
creationTime: { creationTime: {
timestamp: creationTime, timestamp: creationTime,
formatted: formatDate(creationTime * 1000), formatted: formatDate(creationTime * 1000),