steven/gpx.studio
1
0
Fork 0
mirror of https://github.com/gpxstudio/gpx.studio.git synced 2025-12-02 10:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

load files from urls/ids once local ones are loaded

Browse Source
This commit is contained in:
vcoppe
2025-11-12 09:02:09 +01:00
parent 0f7f64fb2f
commit c4c64c8fe8
2 changed files with 65 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
website/src/lib/logic/file-state.ts
View File

@@ -56,8 +56,12 @@ export class GPXFileStateCollection {
this._files = writable(new Map()); this._files = writable(new Map());
} }
connectToDatabase(db: Database) { connectToDatabase(db: Database): Promise<void> {
if (this._subscription) return; return new Promise((resolve) => {
if (this._subscription) {
resolve();
return;
}
this._subscription = liveQuery(() => db.fileids.toArray()).subscribe((dbFileIds) => { this._subscription = liveQuery(() => db.fileids.toArray()).subscribe((dbFileIds) => {
const currentFiles = get(this._files); const currentFiles = get(this._files);
// Find new files to observe // Find new files to observe
@@ -85,7 +89,9 @@ export class GPXFileStateCollection {
}); });
// Update the file order // Update the file order
let fileOrder = get(settings.fileOrder).filter((id) => !deletedFiles.includes(id)); let fileOrder = get(settings.fileOrder).filter(
(id) => !deletedFiles.includes(id)
);
newFiles.forEach((id) => { newFiles.forEach((id) => {
if (!fileOrder.includes(id)) { if (!fileOrder.includes(id)) {
fileOrder.push(id); fileOrder.push(id);
@@ -93,6 +99,8 @@ export class GPXFileStateCollection {
}); });
settings.fileOrder.set(fileOrder); settings.fileOrder.set(fileOrder);
} }
resolve();
});
}); });
} }

8
website/src/routes/[[language]]/app/+page.svelte
View File

@@ -32,7 +32,9 @@
elevationFill, elevationFill,
} = settings; } = settings;
onMount(() => { onMount(async () => {
settings.connectToDatabase(db);
fileStateCollection.connectToDatabase(db).then(() => {
let files: string[] = JSON.parse(page.url.searchParams.get('files') || '[]'); let files: string[] = JSON.parse(page.url.searchParams.get('files') || '[]');
let ids: string[] = JSON.parse(page.url.searchParams.get('ids') || '[]'); let ids: string[] = JSON.parse(page.url.searchParams.get('ids') || '[]');
let urls: string[] = files.concat(ids.map(getURLForGoogleDriveFile)); let urls: string[] = files.concat(ids.map(getURLForGoogleDriveFile));
@@ -51,9 +53,7 @@
loadFiles(files.filter((file) => file !== null)); loadFiles(files.filter((file) => file !== null));
}); });
} }
});
settings.connectToDatabase(db);
fileStateCollection.connectToDatabase(db);
}); });
onDestroy(() => { onDestroy(() => {