RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dav: extend with stack with lp 

Signed-off-by: Varun Patil <radialapps@gmail.com>
pull/900/head
Varun Patil 2023-10-30 11:32:30 -07:00
parent f49b93c561
commit 2c81503484
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/services/dav/base.ts
View File

@ -162,12 +162,17 @@ export async function* runInParallel<T>(promises: (() => Promise<T>)[], n: numbe
} }
/** /**
* Extend given list of Ids with extra files for Live Photos. * Extend given list of Ids with extra files for
* *
* @param photos list of photos to search for Live Photos * 1. Live Photos.
* @returns list of file ids that contains extra file Ids for Live Photos if any * 2. Stacked RAW files.
*
* @param photos list of photos to search for
*
* @returns list of file ids that contains extra file Ids
*/ */
async function extendWithLivePhotos(photos: IPhoto[]) { async function extendWithStack(photos: IPhoto[]) {
// Add Live Photos files
const livePhotos = ( const livePhotos = (
await Promise.all( await Promise.all(
photos photos
@ -184,7 +189,11 @@ async function extendWithLivePhotos(photos: IPhoto[]) {
) )
).filter((p) => p !== null) as IPhoto[]; ).filter((p) => p !== null) as IPhoto[];
return photos.concat(livePhotos); // Add stacked RAW files
const stackRaw = photos.map((p) => p.stackraw ?? []).flat();
// Combine and return
return photos.concat(livePhotos, stackRaw);
} }
/** /**
@ -200,7 +209,7 @@ export async function* deletePhotos(photos: IPhoto[], confirm: boolean = true) {
// Extend with Live Photos unless this is an album // Extend with Live Photos unless this is an album
const routeIsAlbums = _m.route.name === _m.routes.Albums.name; const routeIsAlbums = _m.route.name === _m.routes.Albums.name;
if (!routeIsAlbums) { if (!routeIsAlbums) {
photos = await extendWithLivePhotos(photos); photos = await extendWithStack(photos);
} }
// Get set of unique file ids // Get set of unique file ids
@ -288,7 +297,7 @@ export async function* movePhotos(photos: IPhoto[], destination: string, overwri
} }
// Also move the Live Photo videos // Also move the Live Photo videos
photos = await extendWithLivePhotos(photos); photos = await extendWithStack(photos);
const fileIdsSet = new Set(photos.map((p) => p.fileid)); const fileIdsSet = new Set(photos.map((p) => p.fileid));
// Get files data // Get files data