incyclist-services 1.7.54 → 1.7.55

package/lib/cjs/routes/base/parsers/incyclist.js

@@ -30,8 +30,8 @@ class IncyclistXMLParser extends xml_1.XMLParser {
     async loadPoints(context) {
         const { data, fileInfo, route } = context;
         const gpxFile = { ...fileInfo };
-        const xmlName = fileInfo.name;
-        const fileName = data['gpx-file-path'] ?? xmlName.replace('xml', 'gpx');
+        const xmlBase = fileInfo.base;
+        const fileName = data['gpx-file-path'] ?? xmlBase.replace('.xml', '.gpx');
         if (fileName.startsWith('file') || fileName.startsWith('/') || fileName.startsWith('\\') || fileName.startsWith('.')) {
             gpxFile.type = 'file';
             gpxFile.filename = fileName;
@@ -41,10 +41,10 @@ class IncyclistXMLParser extends xml_1.XMLParser {
             gpxFile.url = fileName;
         }
         else if (fileInfo.type === 'url') {
-            gpxFile.url = gpxFile.url.replace(xmlName, fileName);
+            gpxFile.url = gpxFile.url.replace(xmlBase, fileName);
         }
         else {
-            gpxFile.filename = gpxFile.filename.replace(xmlName, fileName);
+            gpxFile.filename = gpxFile.filename.replace(xmlBase, fileName);
         }
         try {
             let points;

package/lib/cjs/routes/base/parsers/utils.js

@@ -73,7 +73,7 @@ class BinaryReader {
 exports.BinaryReader = BinaryReader;
 const getReferencedFileInfo = (info, referenced, scheme = 'file') => {
     if (info.type !== 'url') {
-        return buildFromFile(info, referenced, scheme);
+        return buildFromFile(info, referenced);
     }
     if (referenced.url) {
         return referenced.url;
@@ -81,6 +81,9 @@ const getReferencedFileInfo = (info, referenced, scheme = 'file') => {
     if (!referenced.file) {
         return;
     }
+    if (referenced.file && info.filename?.startsWith('content://')) {
+        return `${info.dir}${info.delimiter}${referenced.file}`;
+    }
     const targetFileName = referenced.file;
     const regex = /([\\/])/g;
     if (targetFileName.startsWith('http://') || targetFileName.startsWith('https://')) {
@@ -97,9 +100,9 @@ const getReferencedFileInfo = (info, referenced, scheme = 'file') => {
     }
 };
 exports.getReferencedFileInfo = getReferencedFileInfo;
-const buildFromFile = (info, referenced, scheme = 'file') => {
+const buildFromFile = (info, referenced) => {
     if (referenced.file) {
-        const fileName = info.filename?.replace(info.name, referenced.file);
+        const fileName = info.filename?.replace(info.base, referenced.file);
         return `file:///${fileName}`;
     }
     return referenced.url;
@@ -107,9 +110,8 @@ const buildFromFile = (info, referenced, scheme = 'file') => {
 const buildAbsolutePathTarget = (fileName, info, scheme) => {
     const inputUrl = info.url;
     if (inputUrl.startsWith('incyclist:') || inputUrl.startsWith('file:')) {
-        const target = {};
         const parts = inputUrl.split('://');
-        const targetPath = parts[1].replace(info.name, fileName);
+        const targetPath = parts[1].replace(info.base, fileName);
         return `${scheme}://${targetPath}`;
     }
 };

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

@@ -95,7 +95,7 @@ let RouteLibraryScannerService = (() => {
             this.importProps = undefined;
         }
         getDisplayProps() {
-            return this.importProps;
+            return { ...this.importProps };
         }
         importSingle(fileInfo) {
             const observer = new types_1.Observer();
@@ -125,8 +125,13 @@ let RouteLibraryScannerService = (() => {
                 this.logError(err, 'scan', { uri: folderInfo.uri });
                 observer.emit('error', err.message);
             });
-            observer.on('scan-progress', (progress) => {
+            observer
+                .on('scan-progress', (progress) => {
                 this.importProps.scanProgress = progress;
+            })
+                .on('scan-complete', () => {
+                console.log('# scan-complete');
+                this.importProps.phase = 'parsing';
             });
             return observer;
         }
@@ -143,9 +148,18 @@ let RouteLibraryScannerService = (() => {
                 this.importProps.parseProgress = { parsed, total };
             });
             observer.on('parse-result', (route) => {
-                this.importProps.routes.push(this.buildRouteDisplayItem(route));
+                const idx = this.importProps.routes.findIndex(r => r.id === route.controlFileUri);
+                if (idx !== -1) {
+                    const observer = this.importProps.routes[idx].observer;
+                    const displayProps = this.buildRouteDisplayItem(route, observer);
+                    this.importProps.routes[idx] = displayProps;
+                    if (observer) {
+                        observer.emit('updated', displayProps);
+                    }
+                }
             });
             observer.on('parse-complete', () => {
+                console.log('# parse-complete');
                 this.importProps.phase = 'selecting';
             });
             return observer;
@@ -283,7 +297,7 @@ let RouteLibraryScannerService = (() => {
             const primaryFiles = files.filter((f) => {
                 const name = typeof (f) === 'string' ? f : f.name;
                 const ext = this.getExtension(name);
-                return ext && parsers.isPrimaryExtension(ext);
+                return ext && ext !== 'gpx' && parsers.isPrimaryExtension(ext);
             }).map((f) => {
                 if (typeof f === 'string') {
                     return {
@@ -299,6 +313,7 @@ let RouteLibraryScannerService = (() => {
                 if (!this.isCancelled) {
                     const routeAnnouncement = await this.buildDiscoveredRoute(file, files, uri, folderName, parsers);
                     discoveredCount.value++;
+                    console.log('added', routeAnnouncement, this.scanResult.length);
                     observer.emit('scan-result', routeAnnouncement);
                     this.scanResult.push(routeAnnouncement);
                 }
@@ -335,17 +350,29 @@ let RouteLibraryScannerService = (() => {
             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({
+                    format: target.format,
+                    importable: false,
+                    label: file.base,
+                    id: 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;
                 const parsed = i + 1;
                 const target = targets[i];
                 observer.emit('parse-progress', { current: parsed, parsed, total, currentFolder: target.folderName });
-                await this._parseTarget(target, service, observer);
+                await this._parseTarget(target, service, observer, i);
             }
             observer.emit('parse-complete');
         }
-        async _parseTarget(target, service, observer) {
+        async _parseTarget(target, service, observer, idx) {
             if (service.existsBySourceUri(target.controlFileUri)) {
                 observer.emit('parse-result', {
                     alreadyImported: true,
@@ -465,37 +492,37 @@ let RouteLibraryScannerService = (() => {
             }
         }
         buildFileInfo(uri, ext) {
-            const lastSlash = Math.max(uri.lastIndexOf('/'), uri.lastIndexOf('\\'));
-            const dir = uri.slice(0, lastSlash);
-            const base = uri.slice(lastSlash + 1);
-            const name = base.slice(0, base.length - ext.length - 1);
+            const { dir, base, name } = this.getBindings().path.parse(uri);
             return {
-                type: 'url',
+                type: 'file',
                 url: uri,
                 filename: uri,
                 base,
                 name,
                 dir,
                 ext,
-                delimiter: '/'
+                delimiter: uri.startsWith('content://') ? '%2F' : '/'
             };
         }
-        buildRouteDisplayItem(parsed) {
-            const { route, alreadyImported, parseError, format } = parsed;
+        buildRouteDisplayItem(parsed, observer) {
+            const { route, alreadyImported, parseError, format, controlFileUri } = parsed;
             const descr = route?.description ?? {};
             const [C, U] = this.getUnitConversionShortcuts();
             const distance = descr.distance === undefined ? undefined : {
                 value: C(descr.distance, 'distance', { digits: 1 }),
                 unit: U('distance')
             };
+            const path = this.getBindings().path;
+            const info = path.parse(controlFileUri);
             return {
-                id: route.description.id,
+                id: route?.description?.id ?? info?.base,
                 distance,
-                label: route.title,
+                label: route?.title ?? info?.base,
                 alreadyImported,
                 importable: parseError == null,
                 format,
-                errorReason: parseError
+                errorReason: parseError,
+                observer: observer ?? new types_1.Observer()
             };
         }
         getCompanionExts(parsers, primaryExt) {

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

@@ -206,6 +206,8 @@ let RoutesPageService = (() => {
             }
         }
         onImportClicked() {
+            if (this.showImportDialog)
+                return;
             try {
                 this.showImportDialog = true;
                 this.getRouteLibraryScanner().prepare();
@@ -217,7 +219,9 @@ let RoutesPageService = (() => {
         }
         importSingleRoute(fileInfo) {
             try {
-                return this.getRouteLibraryScanner().importSingle(fileInfo);
+                const observer = this.getRouteLibraryScanner().importSingle(fileInfo);
+                this.updatePageDisplay();
+                return observer;
             }
             catch (err) {
                 this.logError(err, 'importSingleRoute');
@@ -260,11 +264,11 @@ let RoutesPageService = (() => {
         }
         onImportClosed() {
             try {
+                this.showImportDialog = false;
                 if (this.importObserver)
                     this.importObserver.stop();
                 this.getRouteLibraryScanner().done();
                 this.importObserver = undefined;
-                this.showImportDialog = false;
                 this.getPageObserver().emit('import-closed');
                 this.serviceState = this.getRouteList().search();
                 this.updatePageDisplay();

package/lib/esm/routes/base/parsers/incyclist.js

@@ -27,8 +27,8 @@ export class IncyclistXMLParser extends XMLParser {
     async loadPoints(context) {
         const { data, fileInfo, route } = context;
         const gpxFile = { ...fileInfo };
-        const xmlName = fileInfo.name;
-        const fileName = data['gpx-file-path'] ?? xmlName.replace('xml', 'gpx');
+        const xmlBase = fileInfo.base;
+        const fileName = data['gpx-file-path'] ?? xmlBase.replace('.xml', '.gpx');
         if (fileName.startsWith('file') || fileName.startsWith('/') || fileName.startsWith('\\') || fileName.startsWith('.')) {
             gpxFile.type = 'file';
             gpxFile.filename = fileName;
@@ -38,10 +38,10 @@ export class IncyclistXMLParser extends XMLParser {
             gpxFile.url = fileName;
         }
         else if (fileInfo.type === 'url') {
-            gpxFile.url = gpxFile.url.replace(xmlName, fileName);
+            gpxFile.url = gpxFile.url.replace(xmlBase, fileName);
         }
         else {
-            gpxFile.filename = gpxFile.filename.replace(xmlName, fileName);
+            gpxFile.filename = gpxFile.filename.replace(xmlBase, fileName);
         }
         try {
             let points;

package/lib/esm/routes/base/parsers/utils.js

@@ -69,7 +69,7 @@ export class BinaryReader {
 }
 export const getReferencedFileInfo = (info, referenced, scheme = 'file') => {
     if (info.type !== 'url') {
-        return buildFromFile(info, referenced, scheme);
+        return buildFromFile(info, referenced);
     }
     if (referenced.url) {
         return referenced.url;
@@ -77,6 +77,9 @@ export const getReferencedFileInfo = (info, referenced, scheme = 'file') => {
     if (!referenced.file) {
         return;
     }
+    if (referenced.file && info.filename?.startsWith('content://')) {
+        return `${info.dir}${info.delimiter}${referenced.file}`;
+    }
     const targetFileName = referenced.file;
     const regex = /([\\/])/g;
     if (targetFileName.startsWith('http://') || targetFileName.startsWith('https://')) {
@@ -92,9 +95,9 @@ export const getReferencedFileInfo = (info, referenced, scheme = 'file') => {
         return `${scheme}:///${targetFileName}`;
     }
 };
-const buildFromFile = (info, referenced, scheme = 'file') => {
+const buildFromFile = (info, referenced) => {
     if (referenced.file) {
-        const fileName = info.filename?.replace(info.name, referenced.file);
+        const fileName = info.filename?.replace(info.base, referenced.file);
         return `file:///${fileName}`;
     }
     return referenced.url;
@@ -102,9 +105,8 @@ const buildFromFile = (info, referenced, scheme = 'file') => {
 const buildAbsolutePathTarget = (fileName, info, scheme) => {
     const inputUrl = info.url;
     if (inputUrl.startsWith('incyclist:') || inputUrl.startsWith('file:')) {
-        const target = {};
         const parts = inputUrl.split('://');
-        const targetPath = parts[1].replace(info.name, fileName);
+        const targetPath = parts[1].replace(info.base, fileName);
         return `${scheme}://${targetPath}`;
     }
 };

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

@@ -92,7 +92,7 @@ let RouteLibraryScannerService = (() => {
             this.importProps = undefined;
         }
         getDisplayProps() {
-            return this.importProps;
+            return { ...this.importProps };
         }
         importSingle(fileInfo) {
             const observer = new Observer();
@@ -122,8 +122,13 @@ let RouteLibraryScannerService = (() => {
                 this.logError(err, 'scan', { uri: folderInfo.uri });
                 observer.emit('error', err.message);
             });
-            observer.on('scan-progress', (progress) => {
+            observer
+                .on('scan-progress', (progress) => {
                 this.importProps.scanProgress = progress;
+            })
+                .on('scan-complete', () => {
+                console.log('# scan-complete');
+                this.importProps.phase = 'parsing';
             });
             return observer;
         }
@@ -140,9 +145,18 @@ let RouteLibraryScannerService = (() => {
                 this.importProps.parseProgress = { parsed, total };
             });
             observer.on('parse-result', (route) => {
-                this.importProps.routes.push(this.buildRouteDisplayItem(route));
+                const idx = this.importProps.routes.findIndex(r => r.id === route.controlFileUri);
+                if (idx !== -1) {
+                    const observer = this.importProps.routes[idx].observer;
+                    const displayProps = this.buildRouteDisplayItem(route, observer);
+                    this.importProps.routes[idx] = displayProps;
+                    if (observer) {
+                        observer.emit('updated', displayProps);
+                    }
+                }
             });
             observer.on('parse-complete', () => {
+                console.log('# parse-complete');
                 this.importProps.phase = 'selecting';
             });
             return observer;
@@ -280,7 +294,7 @@ let RouteLibraryScannerService = (() => {
             const primaryFiles = files.filter((f) => {
                 const name = typeof (f) === 'string' ? f : f.name;
                 const ext = this.getExtension(name);
-                return ext && parsers.isPrimaryExtension(ext);
+                return ext && ext !== 'gpx' && parsers.isPrimaryExtension(ext);
             }).map((f) => {
                 if (typeof f === 'string') {
                     return {
@@ -296,6 +310,7 @@ let RouteLibraryScannerService = (() => {
                 if (!this.isCancelled) {
                     const routeAnnouncement = await this.buildDiscoveredRoute(file, files, uri, folderName, parsers);
                     discoveredCount.value++;
+                    console.log('added', routeAnnouncement, this.scanResult.length);
                     observer.emit('scan-result', routeAnnouncement);
                     this.scanResult.push(routeAnnouncement);
                 }
@@ -332,17 +347,29 @@ let RouteLibraryScannerService = (() => {
             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({
+                    format: target.format,
+                    importable: false,
+                    label: file.base,
+                    id: target.controlFileUri,
+                    alreadyImported: false,
+                    observer: new Observer()
+                });
+            });
+            observer.emit('parse-start');
             for (let i = 0; i < targets.length; i++) {
                 if (this.isCancelled)
                     continue;
                 const parsed = i + 1;
                 const target = targets[i];
                 observer.emit('parse-progress', { current: parsed, parsed, total, currentFolder: target.folderName });
-                await this._parseTarget(target, service, observer);
+                await this._parseTarget(target, service, observer, i);
             }
             observer.emit('parse-complete');
         }
-        async _parseTarget(target, service, observer) {
+        async _parseTarget(target, service, observer, idx) {
             if (service.existsBySourceUri(target.controlFileUri)) {
                 observer.emit('parse-result', {
                     alreadyImported: true,
@@ -462,37 +489,37 @@ let RouteLibraryScannerService = (() => {
             }
         }
         buildFileInfo(uri, ext) {
-            const lastSlash = Math.max(uri.lastIndexOf('/'), uri.lastIndexOf('\\'));
-            const dir = uri.slice(0, lastSlash);
-            const base = uri.slice(lastSlash + 1);
-            const name = base.slice(0, base.length - ext.length - 1);
+            const { dir, base, name } = this.getBindings().path.parse(uri);
             return {
-                type: 'url',
+                type: 'file',
                 url: uri,
                 filename: uri,
                 base,
                 name,
                 dir,
                 ext,
-                delimiter: '/'
+                delimiter: uri.startsWith('content://') ? '%2F' : '/'
             };
         }
-        buildRouteDisplayItem(parsed) {
-            const { route, alreadyImported, parseError, format } = parsed;
+        buildRouteDisplayItem(parsed, observer) {
+            const { route, alreadyImported, parseError, format, controlFileUri } = parsed;
             const descr = route?.description ?? {};
             const [C, U] = this.getUnitConversionShortcuts();
             const distance = descr.distance === undefined ? undefined : {
                 value: C(descr.distance, 'distance', { digits: 1 }),
                 unit: U('distance')
             };
+            const path = this.getBindings().path;
+            const info = path.parse(controlFileUri);
             return {
-                id: route.description.id,
+                id: route?.description?.id ?? info?.base,
                 distance,
-                label: route.title,
+                label: route?.title ?? info?.base,
                 alreadyImported,
                 importable: parseError == null,
                 format,
-                errorReason: parseError
+                errorReason: parseError,
+                observer: observer ?? new Observer()
             };
         }
         getCompanionExts(parsers, primaryExt) {

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

@@ -203,6 +203,8 @@ let RoutesPageService = (() => {
             }
         }
         onImportClicked() {
+            if (this.showImportDialog)
+                return;
             try {
                 this.showImportDialog = true;
                 this.getRouteLibraryScanner().prepare();
@@ -214,7 +216,9 @@ let RoutesPageService = (() => {
         }
         importSingleRoute(fileInfo) {
             try {
-                return this.getRouteLibraryScanner().importSingle(fileInfo);
+                const observer = this.getRouteLibraryScanner().importSingle(fileInfo);
+                this.updatePageDisplay();
+                return observer;
             }
             catch (err) {
                 this.logError(err, 'importSingleRoute');
@@ -257,11 +261,11 @@ let RoutesPageService = (() => {
         }
         onImportClosed() {
             try {
+                this.showImportDialog = false;
                 if (this.importObserver)
                     this.importObserver.stop();
                 this.getRouteLibraryScanner().done();
                 this.importObserver = undefined;
-                this.showImportDialog = false;
                 this.getPageObserver().emit('import-closed');
                 this.serviceState = this.getRouteList().search();
                 this.updatePageDisplay();

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

@@ -1,5 +1,6 @@
 import { ReadDirResult } from "../../api";
 import { FormattedNumber } from "../../i18n";
+import { IObserver } from "../../types";
 import { Route } from "../base/model/route";
 export interface FolderInfo {
     uri: string;
@@ -21,6 +22,7 @@ export interface ParsedRoute {
     alreadyImported: boolean;
     parseError?: string;
     format: RouteFormat;
+    observer: IObserver;
 }
 export interface RouteDisplayItem {
     id: string;
@@ -30,6 +32,7 @@ export interface RouteDisplayItem {
     alreadyImported: boolean;
     importable: boolean;
     errorReason?: string;
+    observer: IObserver;
 }
 export interface ImportDisplayProps {
     phase: 'landing' | 'scanning' | 'parsing' | 'selecting' | 'ingesting' | 'complete' | 'result' | 'error';

package/package.json

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