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

LivePhotoCluster: Handle _HVEC suffix (#1397)

Browse source
This commit is contained in:
Neeraj Gupta 2023-10-18 09:43:48 +05:30 committed by GitHub
parent 66dec3c92a d6b7d260f0
commit 9b8e4371a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/photos/src/services/upload/livePhotoService.ts
View file

@ -30,7 +30,9 @@ interface LivePhotoIdentifier {
}
const UNDERSCORE_THREE = '_3';
// Note: The icloud-photos-downloader library appends _HVEC to the end of the filename in case of live photos
// https://github.com/icloud-photos-downloader/icloud_photos_downloader
const UNDERSCORE_HEVC = '_HVEC';
const UNDERSCORE = '_';
export async function getLivePhotoFileType(
@ -223,10 +225,10 @@ function areFilesLivePhotoAssets(
firstFileIdentifier.fileType !== secondFileIdentifier.fileType &&
isImageOrVideo(firstFileIdentifier.fileType) &&
isImageOrVideo(secondFileIdentifier.fileType) &&
removeUnderscoreThreeSuffix(
removePotentailLivePhotoSuffix(
splitFilenameAndExtension(firstFileIdentifier.name)[0]
) ===
removeUnderscoreThreeSuffix(
removePotentailLivePhotoSuffix(
splitFilenameAndExtension(secondFileIdentifier.name)[0]
)
) {
@ -254,10 +256,11 @@ function areFilesLivePhotoAssets(
return false;
}
function removeUnderscoreThreeSuffix(filename: string) {
function removePotentailLivePhotoSuffix(filename: string) {
if (filename.endsWith(UNDERSCORE_THREE)) {
return filename.slice(0, filename.lastIndexOf(UNDERSCORE));
} else {
return filename;
} else if (filename.toLowerCase().endsWith(UNDERSCORE_HEVC)) {
return filename.slice(0, filename.lastIndexOf(UNDERSCORE_HEVC));
}
return filename;
}