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

ncx: use serverid API 

Signed-off-by: Varun Patil <radialapps@gmail.com>
pull/807/merge
Varun Patil 2023-10-02 18:43:11 -07:00
parent 3435ab35c9
commit ae6a2adbc4
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/native/api.ts
View File

@ -178,6 +178,11 @@ export type NativeX = {
* @returns number of file synced or -1 * @returns number of file synced or -1
*/ */
getSyncStatus: () => number; getSyncStatus: () => number;
/**
* Set the server ID for a given AUID.
*/
setServerId: (auid: number, serverId: number) => void;
}; };
/** The native interface is a global object that is injected by the native app. */ /** The native interface is a global object that is injected by the native app. */

20
src/native/days.ts
View File

@ -1,4 +1,4 @@
import { NAPI } from './api'; import { NAPI, nativex } from './api';
import { API } from '../services/API'; import { API } from '../services/API';
import { has } from './basic'; import { has } from './basic';
import type { IDay, IPhoto } from '../types'; import type { IDay, IPhoto } from '../types';
@ -11,7 +11,6 @@ import type { IDay, IPhoto } from '../types';
*/ */
export function mergeDays(current: IDay[], incoming: IDay[]) { export function mergeDays(current: IDay[], incoming: IDay[]) {
const currentMap = new Map(current.map((d) => [d.dayid, d])); const currentMap = new Map(current.map((d) => [d.dayid, d]));
const touched: IDay[] = [];
for (const day of incoming) { for (const day of incoming) {
const curr = currentMap.get(day.dayid); const curr = currentMap.get(day.dayid);
@ -38,11 +37,22 @@ export function mergeDays(current: IDay[], incoming: IDay[]) {
*/ */
export function mergeDay(current: IPhoto[], incoming: IPhoto[]): IPhoto[] { export function mergeDay(current: IPhoto[], incoming: IPhoto[]): IPhoto[] {
// Merge local photos into remote photos // Merge local photos into remote photos
const currentAUIDs = new Set(current.map((p) => p.auid)); const currentAUIDs = new Map<number, IPhoto>();
for (const photo of current) {
currentAUIDs.set(photo.auid!, photo);
}
// Filter out files that are only available locally // Filter out files that are only available locally
const added = incoming.filter((p) => !currentAUIDs.has(p.auid)); const added: IPhoto[] = [];
current.push(...added); for (const photo of incoming) {
const serverPhoto = currentAUIDs.get(photo.auid!);
if (serverPhoto) {
nativex.setServerId(photo.auid!, serverPhoto.fileid);
}
current.push(photo);
added.push(photo);
}
// Sort by epoch value // Sort by epoch value
current.sort((a, b) => (b.epoch ?? 0) - (a.epoch ?? 0)); current.sort((a, b) => (b.epoch ?? 0) - (a.epoch ?? 0));