incyclist-services 1.8.5 → 1.8.6

package/lib/cjs/routes/library/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toRouteImportError = exports.mapErrorToImportCode = exports.RouteImportError = void 0;
+exports.toRouteImportError = exports.mapErrorToImportCode = exports.DuplicateRouteError = exports.RouteImportError = void 0;
 class RouteImportError extends Error {
     code;
     missingExt;
@@ -18,6 +18,15 @@ class RouteImportError extends Error {
     }
 }
 exports.RouteImportError = RouteImportError;
+class DuplicateRouteError extends Error {
+    duplicateOf;
+    constructor(duplicateOf) {
+        super(`Duplicate of ${duplicateOf}`);
+        this.name = 'DuplicateRouteError';
+        this.duplicateOf = duplicateOf;
+    }
+}
+exports.DuplicateRouteError = DuplicateRouteError;
 const mapErrorToImportCode = (err, scope) => {
     if (err instanceof RouteImportError)
         return err.code;

package/lib/cjs/routes/library/service.js

@@ -95,7 +95,6 @@ let RouteLibraryScannerService = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         isCancelled = (__runInitializers(this, _instanceExtraInitializers), false);
-        scanResult = [];
         importProps;
         currentScope;
         constructor() {
@@ -110,7 +109,6 @@ let RouteLibraryScannerService = (() => {
         }
         done() {
             this.importProps = undefined;
-            this.scanResult = [];
         }
         getDisplayProps() {
             const importProps = this.importProps ?? { phase: 'landing', routes: [], hasICloudDownloadFailures: false };
@@ -156,7 +154,8 @@ let RouteLibraryScannerService = (() => {
             this.isCancelled = false;
             if (!this.importProps)
                 this.prepare();
-            this.importProps.phase = 'ingesting';
+            const session = this.importProps;
+            session.phase = 'ingesting';
             const list = this.getRouteList();
             list.pauseListUpdates();
             this._importFiles(files ?? [], observer)
@@ -169,15 +168,16 @@ let RouteLibraryScannerService = (() => {
                 list.emitLists('updated', { source: 'system' });
             });
             observer.on('ingest-progress', (progress) => {
-                if (this.importProps)
-                    this.importProps.ingestProgress = progress;
+                if (this.importProps !== session)
+                    return;
+                session.ingestProgress = progress;
             });
             observer.on('ingest-complete', (status) => {
-                if (!this.importProps)
+                if (this.importProps !== session)
                     return;
                 const { imported, skipped, errors, failedRoutes } = status;
-                this.importProps.phase = 'complete';
-                this.importProps.completionSummary = { imported, skipped, errors, failedRoutes };
+                session.phase = 'complete';
+                session.completionSummary = { imported, skipped, errors, failedRoutes };
             });
             return observer;
         }
@@ -203,9 +203,9 @@ let RouteLibraryScannerService = (() => {
                 this.prepare();
             this.logEvent({ message: 'import route library', folder: folderInfo.displayName });
             this.isCancelled = false;
-            this.scanResult = [];
-            this.importProps.phase = 'scanning';
-            this.importProps.scanProgress = { scannedFolders: 0, failedFolders: 0 };
+            const session = this.importProps;
+            session.phase = 'scanning';
+            session.scanProgress = { scannedFolders: 0, failedFolders: 0 };
             const observer = new types_1.Observer();
             this._scan(folderInfo, observer).catch(err => {
                 this.logError(err, 'scan', { folder: folderInfo.displayName });
@@ -213,12 +213,16 @@ let RouteLibraryScannerService = (() => {
             });
             observer
                 .on('scan-progress', (progress) => {
-                this.importProps.scanProgress = progress;
+                if (this.importProps !== session)
+                    return;
+                session.scanProgress = progress;
             })
                 .on('scan-complete', () => {
-                const { scannedFolders: cntScanned, failedFolders: cntFailed } = this.importProps.scanProgress;
+                if (this.importProps !== session)
+                    return;
+                const { scannedFolders: cntScanned, failedFolders: cntFailed } = session.scanProgress;
                 this.logEvent({ message: 'import route library: scan success', folder: folderInfo.displayName, cntScanned, cntFailed });
-                this.importProps.phase = 'parsing';
+                session.phase = 'parsing';
             });
             return observer;
         }
@@ -226,35 +230,42 @@ let RouteLibraryScannerService = (() => {
             const observer = new types_1.Observer();
             if (!this.importProps)
                 this.prepare();
-            this.logEvent({ message: 'import route library: parse start', folder: scannedRoutes?.[0].folderName });
-            this._parse(scannedRoutes, observer).catch(err => {
-                this.logError(err, 'parse');
-                observer.emit('error', err.message);
-            });
+            const session = this.importProps;
+            this.logEvent({ message: 'import route library: parse start', folder: scannedRoutes?.[0]?.folderName });
             observer.on('parse-progress', (progress) => {
+                if (this.importProps !== session)
+                    return;
                 const { parsed, total } = progress;
-                this.importProps.parseProgress = { parsed, total };
+                session.parseProgress = { parsed, total };
             });
             observer.on('parse-result', (route) => {
-                const idx = this.importProps.routes.findIndex(r => r.id === route.controlFileUri);
+                if (this.importProps !== session)
+                    return;
+                const idx = session.routes.findIndex(r => r.fileUri === route.controlFileUri);
                 if (idx !== -1) {
-                    const observer = this.importProps.routes[idx].observer;
-                    const displayProps = this.buildRouteDisplayItem(route, observer);
-                    this.importProps.routes[idx] = displayProps;
+                    const observer = session.routes[idx].observer;
+                    const displayProps = this.buildRouteDisplayItem(route, session, observer);
+                    session.routes[idx] = displayProps;
                     if (observer) {
                         observer.emit('updated', displayProps);
                     }
                 }
             });
             observer.on('parse-complete', () => {
+                if (this.importProps !== session)
+                    return;
                 const parseSumamry = {
-                    cntTotal: this.importProps.routes.length,
-                    cntSuccess: this.importProps.routes.filter(r => !r.errorReason).length,
-                    cntError: this.importProps.routes.filter(r => r.errorReason != null).length,
-                    cntExisting: this.importProps.routes.filter(r => r.alreadyImported).length,
+                    cntTotal: session.routes.length,
+                    cntSuccess: session.routes.filter(r => !r.errorReason).length,
+                    cntError: session.routes.filter(r => r.errorReason != null).length,
+                    cntExisting: session.routes.filter(r => r.alreadyImported).length,
                 };
-                this.logEvent({ message: 'import route library: parse completed', folder: scannedRoutes?.[0].folderName, parseSumamry });
-                this.importProps.phase = 'selecting';
+                this.logEvent({ message: 'import route library: parse completed', folder: scannedRoutes?.[0]?.folderName, parseSumamry });
+                session.phase = 'selecting';
+            });
+            this._parse(scannedRoutes, observer, session).catch(err => {
+                this.logError(err, 'parse');
+                observer.emit('error', err.message);
             });
             return observer;
         }
@@ -262,9 +273,10 @@ let RouteLibraryScannerService = (() => {
             const observer = new types_1.Observer();
             if (!this.importProps)
                 this.prepare();
+            const session = this.importProps;
             const list = this.getRouteList();
             list.pauseListUpdates();
-            this.importProps.phase = 'ingesting';
+            session.phase = 'ingesting';
             this._ingest(routes, observer)
                 .catch(err => {
                 this.logError(err, 'ingest');
@@ -275,13 +287,17 @@ let RouteLibraryScannerService = (() => {
                 list.emitLists('updated', { source: 'system' });
             });
             observer.on('ingest-progress', (progress) => {
+                if (this.importProps !== session)
+                    return;
                 const { current, total, currentName } = progress;
-                this.importProps.ingestProgress = { current, total, currentName };
+                session.ingestProgress = { current, total, currentName };
             });
             observer.on('ingest-complete', (status) => {
-                this.importProps.phase = 'complete';
+                if (this.importProps !== session)
+                    return;
+                session.phase = 'complete';
                 const { imported, skipped, errors, failedRoutes } = status;
-                this.importProps.completionSummary = { imported, skipped, errors, failedRoutes };
+                session.completionSummary = { imported, skipped, errors, failedRoutes };
             });
             return observer;
         }
@@ -403,8 +419,8 @@ let RouteLibraryScannerService = (() => {
             await this.scanFolder(folderInfo.uri, folderInfo.displayName, ctx);
             await this.upsertImportHistory(folderInfo, ctx.discoveredCount.value);
             const { scannedFolders, failedFolders } = ctx.progress;
-            this.logEvent({ message: 'video scan result', scannedFolders, failedFolders, files: this.scanResult.length });
-            observer.emit('scan-complete', this.scanResult);
+            this.logEvent({ message: 'video scan result', scannedFolders, failedFolders, files: ctx.results.length });
+            observer.emit('scan-complete', ctx.results);
         }
         createScanContext(observer, parsers, recursive) {
             return {
@@ -412,7 +428,8 @@ let RouteLibraryScannerService = (() => {
                 parsers,
                 recursive,
                 progress: { scannedFolders: 0, failedFolders: 0 },
-                discoveredCount: { value: 0 }
+                discoveredCount: { value: 0 },
+                results: []
             };
         }
         async scanFolder(uri, folderName, ctx) {
@@ -449,7 +466,7 @@ let RouteLibraryScannerService = (() => {
                     const routeAnnouncement = await this.buildDiscoveredRoute(file, files, uri, folderName, ctx.parsers);
                     ctx.discoveredCount.value++;
                     ctx.observer.emit('scan-result', routeAnnouncement);
-                    this.scanResult.push(routeAnnouncement);
+                    ctx.results.push(routeAnnouncement);
                 }
             }
         }
@@ -600,29 +617,30 @@ let RouteLibraryScannerService = (() => {
                 scanError: skipReason
             };
         }
-        async _parse(scannedRoutes, observer) {
+        async _parse(scannedRoutes, observer, session) {
             const service = this.getRouteList();
             const targets = scannedRoutes.filter(r => !r.scanError);
             const total = targets.length;
             targets.forEach(target => {
                 const file = this.buildFileInfo(target.controlFileUri, target.format);
-                this.importProps.routes.push({
+                session.routes.push({
                     format: target.format,
                     parseState: 'waiting',
                     importable: false,
                     label: file.base,
                     folder: target.folderName,
                     id: target.controlFileUri,
+                    fileUri: target.controlFileUri,
                     alreadyImported: false,
                     observer: new types_1.Observer()
                 });
             });
             observer.emit('parse-start');
-            for (let i = 0; i < targets.length; i++) {
-                if (this.isCancelled)
-                    continue;
+            await targets.reduce(async (previous, target, i) => {
+                await previous;
+                if (this.isCancelled || this.importProps !== session)
+                    return;
                 const parsed = i + 1;
-                const target = targets[i];
                 observer.emit('parse-progress', { current: parsed, parsed, total, currentFolder: target.folderName });
                 let fileName = target.controlFileUri;
                 try {
@@ -631,15 +649,15 @@ let RouteLibraryScannerService = (() => {
                     fileName = info.base;
                 }
                 catch { }
-                await this._parseTarget(target, service, observer);
+                await this._parseTarget(target, service, observer, session);
                 this.logEvent({ message: 'parsing route done', fileName });
-            }
+            }, Promise.resolve());
             observer.emit('parse-complete');
         }
-        async _parseTarget(target, service, observer) {
+        async _parseTarget(target, service, observer, session) {
             let result;
             const file = this.buildFileInfo(target.controlFileUri, target.format);
-            const importProps = this.importProps.routes.find(r => r.id === target.controlFileUri) ?? {};
+            const importProps = session.routes.find(r => r.fileUri === target.controlFileUri) ?? {};
             const scope = (0, externalFiles_1.useExternalFileService)().beginScope({ isCancelled: () => this.isCancelled });
             this.currentScope = scope;
             try {
@@ -658,10 +676,10 @@ let RouteLibraryScannerService = (() => {
                 }
                 importProps.parseState = 'parsed';
                 const route = new route_1.Route(result.data, result.details);
-                const existing = this.importProps.routes.find(ri => ri.id === route.description.id);
+                const existing = session.routes.find(ri => ri.id === route.description.id);
                 if (existing) {
                     result = undefined;
-                    throw new Error(`Duplicate of ${existing.label}`);
+                    throw new errors_1.DuplicateRouteError(existing.label);
                 }
                 if (result.data.hasVideo) {
                     this.validateVideoUrl(route, target.folderUri, target.files);
@@ -681,20 +699,31 @@ let RouteLibraryScannerService = (() => {
             }
             catch (err) {
                 importProps.parseState = 'parsed';
-                const parsed = {
-                    alreadyImported: false,
-                    route: result ? new route_1.Route(result.data, result.details) : undefined,
-                    folderUri: target.folderUri,
-                    folderName: target.folderName,
-                    controlFileUri: target.controlFileUri,
-                    format: target.format,
-                    parseError: scope.lastFailure ? this.getReadFailureMessage(scope) : (err?.message ?? String(err)),
-                    parseErrorCode: (0, errors_1.mapErrorToImportCode)(err, scope)
-                };
-                this.logEvent({ message: 'could not parse route file', file: file.base, reason: err.message, stack: err.stack });
+                const parsed = this.buildParseFailure(target, err, scope, result);
+                this.logParseFailure(file.base, err);
                 observer.emit('parse-result', parsed);
             }
         }
+        buildParseFailure(target, err, scope, result) {
+            const duplicateOf = err instanceof errors_1.DuplicateRouteError ? err.duplicateOf : undefined;
+            return {
+                alreadyImported: false,
+                route: result ? new route_1.Route(result.data, result.details) : undefined,
+                folderUri: target.folderUri,
+                folderName: target.folderName,
+                controlFileUri: target.controlFileUri,
+                format: target.format,
+                parseError: scope.lastFailure ? this.getReadFailureMessage(scope) : (err?.message ?? String(err)),
+                parseErrorCode: duplicateOf ? undefined : (0, errors_1.mapErrorToImportCode)(err, scope),
+                duplicateOf
+            };
+        }
+        logParseFailure(fileName, err) {
+            if (err instanceof errors_1.DuplicateRouteError)
+                this.logEvent({ message: 'route is a duplicate in this import', file: fileName, duplicateOf: err.duplicateOf });
+            else
+                this.logEvent({ message: 'could not parse route file', file: fileName, reason: err?.message, stack: err?.stack });
+        }
         getReadFailureMessage(scope) {
             const name = this.getFileName(scope.failedFile);
             switch (scope.lastFailure?.reason) {
@@ -910,10 +939,10 @@ let RouteLibraryScannerService = (() => {
                 delimiter: uri?.startsWith('content://') ? '%2F' : '/'
             };
         }
-        getImportProps(parsed) {
-            return this.importProps.routes.find(r => r.id === parsed.controlFileUri);
+        getImportProps(parsed, session) {
+            return session.routes.find(r => r.fileUri === parsed.controlFileUri);
         }
-        buildRouteDisplayItem(parsed, observer) {
+        buildRouteDisplayItem(parsed, session, observer) {
             const { route, alreadyImported, parseError, format, controlFileUri, folderName } = parsed;
             const descr = route?.description ?? {};
             const [C, U] = this.getUnitConversionShortcuts();
@@ -923,9 +952,11 @@ let RouteLibraryScannerService = (() => {
             };
             const path = this.getBindings().path;
             const info = path.parse(controlFileUri);
-            const importProps = this.getImportProps(parsed);
+            const importProps = this.getImportProps(parsed, session);
             return {
                 id: route?.description?.id ?? info?.base,
+                fileUri: controlFileUri,
+                duplicateOf: parsed.duplicateOf,
                 distance,
                 label: route?.title ?? info?.base,
                 folder: folderName,

package/lib/cjs/routes/list/service.js

@@ -215,7 +215,7 @@ let RouteListService = (() => {
                 }
                 if (this.initialized && !hasLists)
                     emitLoadedEvent();
-                this.observer.on('stats-update', this.onRouteStatsUpdate.bind(this));
+                this.subscribeStats();
                 this.emit('opened', this.observer, this.stats === undefined);
                 const unitsObserver = this.getUserSettings().requestNotifyOnChange('routeList', 'preferences.units');
                 unitsObserver.on('changed', this.redrawCards.bind(this));
@@ -336,7 +336,7 @@ let RouteListService = (() => {
                 this.setListTop('tiles', 0);
             }
             const res = this.searchRepo(filters);
-            this.observer.on('stats-update', this.onRouteStatsUpdate.bind(this));
+            this.subscribeStats();
             this.emit('opened', this.observer, this.stats === undefined);
             this.getAppState().setPersistedState('page', 'search');
             return res;
@@ -1132,8 +1132,10 @@ let RouteListService = (() => {
         async performSync(service) {
             return new Promise(done => {
                 const observer = this.getRouteSyncFactory().sync(service);
-                if (!observer)
+                if (!observer) {
                     done();
+                    return;
+                }
                 this.observer.emit('sync-start');
                 this.syncInfo.observer = observer;
                 const onAdded = this.onSyncRouteAdded.bind(this);
@@ -1620,6 +1622,11 @@ let RouteListService = (() => {
                     this.emitLists('updated');
             });
         }
+        onStatsUpdateHandler = (stats) => this.onRouteStatsUpdate(stats);
+        subscribeStats() {
+            this.observer.off('stats-update', this.onStatsUpdateHandler);
+            this.observer.on('stats-update', this.onStatsUpdateHandler);
+        }
         onRouteStatsUpdate(stats) {
             this.stats = stats;
             for (const stat of stats) {

package/lib/esm/routes/library/errors.js

@@ -14,6 +14,14 @@ export class RouteImportError extends Error {
         return failure;
     }
 }
+export class DuplicateRouteError extends Error {
+    duplicateOf;
+    constructor(duplicateOf) {
+        super(`Duplicate of ${duplicateOf}`);
+        this.name = 'DuplicateRouteError';
+        this.duplicateOf = duplicateOf;
+    }
+}
 export const mapErrorToImportCode = (err, scope) => {
     if (err instanceof RouteImportError)
         return err.code;

package/lib/esm/routes/library/service.js

@@ -41,7 +41,7 @@ import { Observer } from '../../base/types';
 import { RouteParser, useParsers } from '../base/parsers';
 import { useRouteList } from '../list/service';
 import { waitNextTick } from '../../utils';
-import { RouteImportError, mapErrorToImportCode, toRouteImportError } from './errors';
+import { DuplicateRouteError, RouteImportError, mapErrorToImportCode, toRouteImportError } from './errors';
 import { useRoutesDbLoader } from '../list/loaders/db';
 import { Route } from '../base/model/route';
 import { sleep } from '../../utils/sleep';
@@ -92,7 +92,6 @@ let RouteLibraryScannerService = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         isCancelled = (__runInitializers(this, _instanceExtraInitializers), false);
-        scanResult = [];
         importProps;
         currentScope;
         constructor() {
@@ -107,7 +106,6 @@ let RouteLibraryScannerService = (() => {
         }
         done() {
             this.importProps = undefined;
-            this.scanResult = [];
         }
         getDisplayProps() {
             const importProps = this.importProps ?? { phase: 'landing', routes: [], hasICloudDownloadFailures: false };
@@ -153,7 +151,8 @@ let RouteLibraryScannerService = (() => {
             this.isCancelled = false;
             if (!this.importProps)
                 this.prepare();
-            this.importProps.phase = 'ingesting';
+            const session = this.importProps;
+            session.phase = 'ingesting';
             const list = this.getRouteList();
             list.pauseListUpdates();
             this._importFiles(files ?? [], observer)
@@ -166,15 +165,16 @@ let RouteLibraryScannerService = (() => {
                 list.emitLists('updated', { source: 'system' });
             });
             observer.on('ingest-progress', (progress) => {
-                if (this.importProps)
-                    this.importProps.ingestProgress = progress;
+                if (this.importProps !== session)
+                    return;
+                session.ingestProgress = progress;
             });
             observer.on('ingest-complete', (status) => {
-                if (!this.importProps)
+                if (this.importProps !== session)
                     return;
                 const { imported, skipped, errors, failedRoutes } = status;
-                this.importProps.phase = 'complete';
-                this.importProps.completionSummary = { imported, skipped, errors, failedRoutes };
+                session.phase = 'complete';
+                session.completionSummary = { imported, skipped, errors, failedRoutes };
             });
             return observer;
         }
@@ -200,9 +200,9 @@ let RouteLibraryScannerService = (() => {
                 this.prepare();
             this.logEvent({ message: 'import route library', folder: folderInfo.displayName });
             this.isCancelled = false;
-            this.scanResult = [];
-            this.importProps.phase = 'scanning';
-            this.importProps.scanProgress = { scannedFolders: 0, failedFolders: 0 };
+            const session = this.importProps;
+            session.phase = 'scanning';
+            session.scanProgress = { scannedFolders: 0, failedFolders: 0 };
             const observer = new Observer();
             this._scan(folderInfo, observer).catch(err => {
                 this.logError(err, 'scan', { folder: folderInfo.displayName });
@@ -210,12 +210,16 @@ let RouteLibraryScannerService = (() => {
             });
             observer
                 .on('scan-progress', (progress) => {
-                this.importProps.scanProgress = progress;
+                if (this.importProps !== session)
+                    return;
+                session.scanProgress = progress;
             })
                 .on('scan-complete', () => {
-                const { scannedFolders: cntScanned, failedFolders: cntFailed } = this.importProps.scanProgress;
+                if (this.importProps !== session)
+                    return;
+                const { scannedFolders: cntScanned, failedFolders: cntFailed } = session.scanProgress;
                 this.logEvent({ message: 'import route library: scan success', folder: folderInfo.displayName, cntScanned, cntFailed });
-                this.importProps.phase = 'parsing';
+                session.phase = 'parsing';
             });
             return observer;
         }
@@ -223,35 +227,42 @@ let RouteLibraryScannerService = (() => {
             const observer = new Observer();
             if (!this.importProps)
                 this.prepare();
-            this.logEvent({ message: 'import route library: parse start', folder: scannedRoutes?.[0].folderName });
-            this._parse(scannedRoutes, observer).catch(err => {
-                this.logError(err, 'parse');
-                observer.emit('error', err.message);
-            });
+            const session = this.importProps;
+            this.logEvent({ message: 'import route library: parse start', folder: scannedRoutes?.[0]?.folderName });
             observer.on('parse-progress', (progress) => {
+                if (this.importProps !== session)
+                    return;
                 const { parsed, total } = progress;
-                this.importProps.parseProgress = { parsed, total };
+                session.parseProgress = { parsed, total };
             });
             observer.on('parse-result', (route) => {
-                const idx = this.importProps.routes.findIndex(r => r.id === route.controlFileUri);
+                if (this.importProps !== session)
+                    return;
+                const idx = session.routes.findIndex(r => r.fileUri === route.controlFileUri);
                 if (idx !== -1) {
-                    const observer = this.importProps.routes[idx].observer;
-                    const displayProps = this.buildRouteDisplayItem(route, observer);
-                    this.importProps.routes[idx] = displayProps;
+                    const observer = session.routes[idx].observer;
+                    const displayProps = this.buildRouteDisplayItem(route, session, observer);
+                    session.routes[idx] = displayProps;
                     if (observer) {
                         observer.emit('updated', displayProps);
                     }
                 }
             });
             observer.on('parse-complete', () => {
+                if (this.importProps !== session)
+                    return;
                 const parseSumamry = {
-                    cntTotal: this.importProps.routes.length,
-                    cntSuccess: this.importProps.routes.filter(r => !r.errorReason).length,
-                    cntError: this.importProps.routes.filter(r => r.errorReason != null).length,
-                    cntExisting: this.importProps.routes.filter(r => r.alreadyImported).length,
+                    cntTotal: session.routes.length,
+                    cntSuccess: session.routes.filter(r => !r.errorReason).length,
+                    cntError: session.routes.filter(r => r.errorReason != null).length,
+                    cntExisting: session.routes.filter(r => r.alreadyImported).length,
                 };
-                this.logEvent({ message: 'import route library: parse completed', folder: scannedRoutes?.[0].folderName, parseSumamry });
-                this.importProps.phase = 'selecting';
+                this.logEvent({ message: 'import route library: parse completed', folder: scannedRoutes?.[0]?.folderName, parseSumamry });
+                session.phase = 'selecting';
+            });
+            this._parse(scannedRoutes, observer, session).catch(err => {
+                this.logError(err, 'parse');
+                observer.emit('error', err.message);
             });
             return observer;
         }
@@ -259,9 +270,10 @@ let RouteLibraryScannerService = (() => {
             const observer = new Observer();
             if (!this.importProps)
                 this.prepare();
+            const session = this.importProps;
             const list = this.getRouteList();
             list.pauseListUpdates();
-            this.importProps.phase = 'ingesting';
+            session.phase = 'ingesting';
             this._ingest(routes, observer)
                 .catch(err => {
                 this.logError(err, 'ingest');
@@ -272,13 +284,17 @@ let RouteLibraryScannerService = (() => {
                 list.emitLists('updated', { source: 'system' });
             });
             observer.on('ingest-progress', (progress) => {
+                if (this.importProps !== session)
+                    return;
                 const { current, total, currentName } = progress;
-                this.importProps.ingestProgress = { current, total, currentName };
+                session.ingestProgress = { current, total, currentName };
             });
             observer.on('ingest-complete', (status) => {
-                this.importProps.phase = 'complete';
+                if (this.importProps !== session)
+                    return;
+                session.phase = 'complete';
                 const { imported, skipped, errors, failedRoutes } = status;
-                this.importProps.completionSummary = { imported, skipped, errors, failedRoutes };
+                session.completionSummary = { imported, skipped, errors, failedRoutes };
             });
             return observer;
         }
@@ -400,8 +416,8 @@ let RouteLibraryScannerService = (() => {
             await this.scanFolder(folderInfo.uri, folderInfo.displayName, ctx);
             await this.upsertImportHistory(folderInfo, ctx.discoveredCount.value);
             const { scannedFolders, failedFolders } = ctx.progress;
-            this.logEvent({ message: 'video scan result', scannedFolders, failedFolders, files: this.scanResult.length });
-            observer.emit('scan-complete', this.scanResult);
+            this.logEvent({ message: 'video scan result', scannedFolders, failedFolders, files: ctx.results.length });
+            observer.emit('scan-complete', ctx.results);
         }
         createScanContext(observer, parsers, recursive) {
             return {
@@ -409,7 +425,8 @@ let RouteLibraryScannerService = (() => {
                 parsers,
                 recursive,
                 progress: { scannedFolders: 0, failedFolders: 0 },
-                discoveredCount: { value: 0 }
+                discoveredCount: { value: 0 },
+                results: []
             };
         }
         async scanFolder(uri, folderName, ctx) {
@@ -446,7 +463,7 @@ let RouteLibraryScannerService = (() => {
                     const routeAnnouncement = await this.buildDiscoveredRoute(file, files, uri, folderName, ctx.parsers);
                     ctx.discoveredCount.value++;
                     ctx.observer.emit('scan-result', routeAnnouncement);
-                    this.scanResult.push(routeAnnouncement);
+                    ctx.results.push(routeAnnouncement);
                 }
             }
         }
@@ -597,29 +614,30 @@ let RouteLibraryScannerService = (() => {
                 scanError: skipReason
             };
         }
-        async _parse(scannedRoutes, observer) {
+        async _parse(scannedRoutes, observer, session) {
             const service = this.getRouteList();
             const targets = scannedRoutes.filter(r => !r.scanError);
             const total = targets.length;
             targets.forEach(target => {
                 const file = this.buildFileInfo(target.controlFileUri, target.format);
-                this.importProps.routes.push({
+                session.routes.push({
                     format: target.format,
                     parseState: 'waiting',
                     importable: false,
                     label: file.base,
                     folder: target.folderName,
                     id: target.controlFileUri,
+                    fileUri: target.controlFileUri,
                     alreadyImported: false,
                     observer: new Observer()
                 });
             });
             observer.emit('parse-start');
-            for (let i = 0; i < targets.length; i++) {
-                if (this.isCancelled)
-                    continue;
+            await targets.reduce(async (previous, target, i) => {
+                await previous;
+                if (this.isCancelled || this.importProps !== session)
+                    return;
                 const parsed = i + 1;
-                const target = targets[i];
                 observer.emit('parse-progress', { current: parsed, parsed, total, currentFolder: target.folderName });
                 let fileName = target.controlFileUri;
                 try {
@@ -628,15 +646,15 @@ let RouteLibraryScannerService = (() => {
                     fileName = info.base;
                 }
                 catch { }
-                await this._parseTarget(target, service, observer);
+                await this._parseTarget(target, service, observer, session);
                 this.logEvent({ message: 'parsing route done', fileName });
-            }
+            }, Promise.resolve());
             observer.emit('parse-complete');
         }
-        async _parseTarget(target, service, observer) {
+        async _parseTarget(target, service, observer, session) {
             let result;
             const file = this.buildFileInfo(target.controlFileUri, target.format);
-            const importProps = this.importProps.routes.find(r => r.id === target.controlFileUri) ?? {};
+            const importProps = session.routes.find(r => r.fileUri === target.controlFileUri) ?? {};
             const scope = useExternalFileService().beginScope({ isCancelled: () => this.isCancelled });
             this.currentScope = scope;
             try {
@@ -655,10 +673,10 @@ let RouteLibraryScannerService = (() => {
                 }
                 importProps.parseState = 'parsed';
                 const route = new Route(result.data, result.details);
-                const existing = this.importProps.routes.find(ri => ri.id === route.description.id);
+                const existing = session.routes.find(ri => ri.id === route.description.id);
                 if (existing) {
                     result = undefined;
-                    throw new Error(`Duplicate of ${existing.label}`);
+                    throw new DuplicateRouteError(existing.label);
                 }
                 if (result.data.hasVideo) {
                     this.validateVideoUrl(route, target.folderUri, target.files);
@@ -678,20 +696,31 @@ let RouteLibraryScannerService = (() => {
             }
             catch (err) {
                 importProps.parseState = 'parsed';
-                const parsed = {
-                    alreadyImported: false,
-                    route: result ? new Route(result.data, result.details) : undefined,
-                    folderUri: target.folderUri,
-                    folderName: target.folderName,
-                    controlFileUri: target.controlFileUri,
-                    format: target.format,
-                    parseError: scope.lastFailure ? this.getReadFailureMessage(scope) : (err?.message ?? String(err)),
-                    parseErrorCode: mapErrorToImportCode(err, scope)
-                };
-                this.logEvent({ message: 'could not parse route file', file: file.base, reason: err.message, stack: err.stack });
+                const parsed = this.buildParseFailure(target, err, scope, result);
+                this.logParseFailure(file.base, err);
                 observer.emit('parse-result', parsed);
             }
         }
+        buildParseFailure(target, err, scope, result) {
+            const duplicateOf = err instanceof DuplicateRouteError ? err.duplicateOf : undefined;
+            return {
+                alreadyImported: false,
+                route: result ? new Route(result.data, result.details) : undefined,
+                folderUri: target.folderUri,
+                folderName: target.folderName,
+                controlFileUri: target.controlFileUri,
+                format: target.format,
+                parseError: scope.lastFailure ? this.getReadFailureMessage(scope) : (err?.message ?? String(err)),
+                parseErrorCode: duplicateOf ? undefined : mapErrorToImportCode(err, scope),
+                duplicateOf
+            };
+        }
+        logParseFailure(fileName, err) {
+            if (err instanceof DuplicateRouteError)
+                this.logEvent({ message: 'route is a duplicate in this import', file: fileName, duplicateOf: err.duplicateOf });
+            else
+                this.logEvent({ message: 'could not parse route file', file: fileName, reason: err?.message, stack: err?.stack });
+        }
         getReadFailureMessage(scope) {
             const name = this.getFileName(scope.failedFile);
             switch (scope.lastFailure?.reason) {
@@ -907,10 +936,10 @@ let RouteLibraryScannerService = (() => {
                 delimiter: uri?.startsWith('content://') ? '%2F' : '/'
             };
         }
-        getImportProps(parsed) {
-            return this.importProps.routes.find(r => r.id === parsed.controlFileUri);
+        getImportProps(parsed, session) {
+            return session.routes.find(r => r.fileUri === parsed.controlFileUri);
         }
-        buildRouteDisplayItem(parsed, observer) {
+        buildRouteDisplayItem(parsed, session, observer) {
             const { route, alreadyImported, parseError, format, controlFileUri, folderName } = parsed;
             const descr = route?.description ?? {};
             const [C, U] = this.getUnitConversionShortcuts();
@@ -920,9 +949,11 @@ let RouteLibraryScannerService = (() => {
             };
             const path = this.getBindings().path;
             const info = path.parse(controlFileUri);
-            const importProps = this.getImportProps(parsed);
+            const importProps = this.getImportProps(parsed, session);
             return {
                 id: route?.description?.id ?? info?.base,
+                fileUri: controlFileUri,
+                duplicateOf: parsed.duplicateOf,
                 distance,
                 label: route?.title ?? info?.base,
                 folder: folderName,

package/lib/esm/routes/list/service.js

@@ -209,7 +209,7 @@ let RouteListService = (() => {
                 }
                 if (this.initialized && !hasLists)
                     emitLoadedEvent();
-                this.observer.on('stats-update', this.onRouteStatsUpdate.bind(this));
+                this.subscribeStats();
                 this.emit('opened', this.observer, this.stats === undefined);
                 const unitsObserver = this.getUserSettings().requestNotifyOnChange('routeList', 'preferences.units');
                 unitsObserver.on('changed', this.redrawCards.bind(this));
@@ -330,7 +330,7 @@ let RouteListService = (() => {
                 this.setListTop('tiles', 0);
             }
             const res = this.searchRepo(filters);
-            this.observer.on('stats-update', this.onRouteStatsUpdate.bind(this));
+            this.subscribeStats();
             this.emit('opened', this.observer, this.stats === undefined);
             this.getAppState().setPersistedState('page', 'search');
             return res;
@@ -1126,8 +1126,10 @@ let RouteListService = (() => {
         async performSync(service) {
             return new Promise(done => {
                 const observer = this.getRouteSyncFactory().sync(service);
-                if (!observer)
+                if (!observer) {
                     done();
+                    return;
+                }
                 this.observer.emit('sync-start');
                 this.syncInfo.observer = observer;
                 const onAdded = this.onSyncRouteAdded.bind(this);
@@ -1614,6 +1616,11 @@ let RouteListService = (() => {
                     this.emitLists('updated');
             });
         }
+        onStatsUpdateHandler = (stats) => this.onRouteStatsUpdate(stats);
+        subscribeStats() {
+            this.observer.off('stats-update', this.onStatsUpdateHandler);
+            this.observer.on('stats-update', this.onStatsUpdateHandler);
+        }
         onRouteStatsUpdate(stats) {
             this.stats = stats;
             for (const stat of stats) {

package/lib/types/routes/library/errors.d.ts

@@ -8,5 +8,9 @@ export declare class RouteImportError extends Error {
     });
     toFailure(): RouteImportFailure;
 }
+export declare class DuplicateRouteError extends Error {
+    readonly duplicateOf: string;
+    constructor(duplicateOf: string);
+}
 export declare const mapErrorToImportCode: (err: unknown, scope?: ExternalFileScope) => RouteImportErrorCode;
 export declare const toRouteImportError: (err: unknown, scope?: ExternalFileScope, message?: string) => RouteImportError;

package/lib/types/routes/library/service.d.ts

@@ -7,7 +7,6 @@ import { FolderInfo, ImportDisplayProps, ParsedRoute, ScannedRoute } from './typ
 import { Route } from '../base/model/route';
 export declare class RouteLibraryScannerService extends IncyclistService {
     private isCancelled;
-    private scanResult;
     private importProps;
     private currentScope;
     constructor();
@@ -51,6 +50,8 @@ export declare class RouteLibraryScannerService extends IncyclistService {
     private buildDiscoveredRoute;
     private _parse;
     private _parseTarget;
+    private buildParseFailure;
+    private logParseFailure;
     private getReadFailureMessage;
     private getFileName;
     private validateVideoUrl;

package/lib/types/routes/library/types.d.ts

@@ -32,12 +32,14 @@ export interface ParsedRoute {
     alreadyImported: boolean;
     parseError?: string;
     parseErrorCode?: RouteImportErrorCode;
+    duplicateOf?: string;
     format: RouteFormat;
     observer?: IObserver;
 }
 export type ParseState = 'waiting' | 'parsing' | 'parsed';
 export interface RouteDisplayItem {
     id: string;
+    fileUri?: string;
     label: string;
     folder?: string;
     distance?: FormattedNumber;
@@ -47,6 +49,7 @@ export interface RouteDisplayItem {
     importable: boolean;
     errorReason?: string;
     errorCode?: RouteImportErrorCode;
+    duplicateOf?: string;
     observer: IObserver;
 }
 export interface ImportDisplayProps {
@@ -102,6 +105,7 @@ export interface ScanContext {
     discoveredCount: {
         value: number;
     };
+    results: ScannedRoute[];
     recursive: boolean;
 }
 export interface ImportedLibrary {

package/lib/types/routes/list/service.d.ts

@@ -212,6 +212,8 @@ export declare class RouteListService extends IncyclistService implements IRoute
     private sortCardsBySuggestion;
     protected isSameCardSet(a: Array<RouteCard>, b: Array<RouteCard>): boolean;
     protected handleConfigChanges(): void;
+    protected onStatsUpdateHandler: (stats: ActiveRideCount[]) => void;
+    protected subscribeStats(): void;
     protected onRouteStatsUpdate(stats: ActiveRideCount[]): void;
     protected isMobile(): boolean;
     protected getUserSettings(): import("../../settings").UserSettingsService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },