incyclist-services 1.7.138 → 1.7.139

package/lib/cjs/routes/base/model/route.js

@@ -66,6 +66,10 @@ let Route = (() => {
             const points = this._details?.points ?? this._description?.points;
             return points;
         }
+        replace(update) {
+            this._description = { ...update._description };
+            this._details = { ...update._details };
+        }
         addDetails(details) {
             this._details = details;
         }

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

@@ -123,6 +123,7 @@ let RouteLibraryScannerService = (() => {
         scan(folderInfo) {
             if (!this.importProps)
                 this.prepare();
+            this.logEvent({ message: 'import route library', folder: folderInfo.displayName, uri: folderInfo.uri });
             this.isCancelled = false;
             this.scanResult = [];
             this.importProps.phase = 'scanning';
@@ -137,6 +138,8 @@ let RouteLibraryScannerService = (() => {
                 this.importProps.scanProgress = progress;
             })
                 .on('scan-complete', () => {
+                const cntScanned = this.importProps.scanProgress.scannedFolders;
+                this.logEvent({ message: 'import route library: scan success', folder: folderInfo.displayName, cntScanned });
                 this.importProps.phase = 'parsing';
             });
             return observer;
@@ -145,6 +148,7 @@ 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);
@@ -165,6 +169,13 @@ let RouteLibraryScannerService = (() => {
                 }
             });
             observer.on('parse-complete', () => {
+                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,
+                };
+                this.logEvent({ message: 'import route library: parse completed', folder: scannedRoutes?.[0].folderName, parseSumamry });
                 this.importProps.phase = 'selecting';
             });
             return observer;
@@ -215,23 +226,36 @@ let RouteLibraryScannerService = (() => {
             }
         }
         async importSingleGpxRoute(fileInfo, observer) {
-            this.logEvent({ message: 'import single GPX route' });
-            const list = this.getRouteList();
+            const name = fileInfo.url ?? fileInfo.filename ?? fileInfo.name;
+            this.logEvent({ message: 'import single route file', file: name, type: fileInfo.ext });
+            const service = this.getRouteList();
             const db = this.getRoutesDBLoader();
             try {
                 const { data, details } = await parsers_1.RouteParser.parse(fileInfo);
                 const route = new route_1.Route(data, details);
+                this.logEvent({ message: 'import single route file success', file: name });
+                const existing = service.findCard(route);
+                if (existing) {
+                    this.logEvent({ message: 'route updated (import)', route: route.title });
+                }
                 route.description.tsImported = Date.now();
                 await db.save(route, true);
-                list.addRoute(route, 'user');
+                service.addRoute(route, existing ? 'import' : 'user');
+                const cardInfo = service.findCard(route);
+                cardInfo?.card?.verify();
+                if (existing) {
+                    existing.card.emitUpdate();
+                }
                 observer.emit('success', route);
             }
             catch (err) {
+                this.logEvent({ message: 'import single route file failed', file: name, reason: err.message, stack: err.stack });
                 observer.emit('error', err.message);
             }
         }
         async importSingleVideoRoute(fileInfo, observer) {
-            this.logEvent({ message: 'import single video route', fileInfo });
+            const name = fileInfo.url ?? fileInfo.filename ?? fileInfo.name;
+            this.logEvent({ message: 'import single route file', file: name, type: fileInfo.ext });
             const parsers = this.getParsers();
             const { dir, delimiter } = fileInfo;
             let { ext } = fileInfo;
@@ -240,6 +264,7 @@ let RouteLibraryScannerService = (() => {
             const folderUri = dir.endsWith(delimiter ?? '/') ? dir.slice(0, -delimiter.length) : dir;
             try {
                 if (!parsers.isPrimaryExtension(ext)) {
+                    this.logEvent({ message: 'import single route file failed', file: name, reason: 'not a route control file' });
                     observer.emit('error', 'not a route control file', ext);
                     return;
                 }
@@ -249,9 +274,11 @@ let RouteLibraryScannerService = (() => {
                 this.scanResult = [];
                 scanObserver.stop();
                 if (!files.length) {
+                    this.logEvent({ message: 'import single route file failed', file: name, reason: 'no file found' });
                     observer.emit('error', 'no file found');
                 }
                 if (files[0].scanError) {
+                    this.logEvent({ message: 'import single route file failed', file: name, reason: files[0].scanError });
                     observer.emit('error', files[0].scanError);
                     return;
                 }
@@ -261,6 +288,7 @@ let RouteLibraryScannerService = (() => {
                     parseObserver.on('parse-result', (result) => {
                         parseObserver.stop();
                         if (result.parseError) {
+                            this.logEvent({ message: 'import single route file failed', file: name, reason: result.parseError });
                             observer.emit('error', result.parseError);
                             return;
                         }
@@ -268,15 +296,18 @@ let RouteLibraryScannerService = (() => {
                         let ingestError;
                         ingest.once('ingest-error', (_, reason) => {
                             ingest.stop();
+                            this.logEvent({ message: 'import single route file failed', file: name, reason });
                             observer.emit('error', reason);
                             ingestError = reason;
                         });
                         ingest.once('ingest-complete', (summary) => {
                             ingest.stop();
                             if (!ingestError && summary.imported > 0) {
+                                this.logEvent({ message: 'import single route file success', file: name });
                                 observer.emit('success', summary.importedRoutes?.[0]?.title);
                             }
                             else if (!ingestError && summary.imported === 0) {
+                                this.logEvent({ message: 'import single route file failed', file: name, reason: 'not imported' });
                                 observer.emit('error', 'not imported');
                             }
                         });
@@ -284,6 +315,7 @@ let RouteLibraryScannerService = (() => {
                 }
             }
             catch (err) {
+                this.logEvent({ message: 'import single route file failed', file: name, reason: err.message, stack: err.stack });
                 observer.emit('error', err.message);
             }
         }
@@ -299,7 +331,6 @@ let RouteLibraryScannerService = (() => {
         }
         async scanFolder(uri, folderName, observer, parsers, progress, discoveredCount, recursive = true) {
             const fs = this.getBindings().fs;
-            this.logEvent({ message: 'scanFolder', uri, folderName });
             let entries;
             try {
                 entries = await fs.readdir(uri, { recursive: false, extended: true });
@@ -393,7 +424,6 @@ let RouteLibraryScannerService = (() => {
                     fileName = info.base;
                 }
                 catch { }
-                this.logEvent({ message: 'parsing route', fileName });
                 await this._parseTarget(target, service, observer);
                 this.logEvent({ message: 'parsing route done', fileName });
             }
@@ -446,7 +476,6 @@ let RouteLibraryScannerService = (() => {
         validateVideoUrl(route, folderUri, folderFiles) {
             const { video } = route?.details ?? {};
             const { file, url, format } = video ?? {};
-            this.logEvent({ message: 'validateVideoUrl', route: { file, url, format }, folderUri, folderFiles });
             let videoFormat = format;
             try {
                 if (videoFormat === undefined) {
@@ -511,7 +540,7 @@ let RouteLibraryScannerService = (() => {
             await (0, utils_1.waitNextTick)();
             const service = this.getRouteList();
             const db = this.getRoutesDBLoader();
-            const target = routes.filter(r => !r.alreadyImported && !r.parseError);
+            const target = routes.filter(r => !r.parseError);
             const total = target.length;
             let errors = 0;
             const failedRoutes = [];
@@ -520,10 +549,25 @@ let RouteLibraryScannerService = (() => {
                 if (this.isCancelled)
                     continue;
                 const { route } = target[i] ?? {};
+                const isExisting = target[i].alreadyImported;
+                const existing = isExisting ? service.findCard(route) : null;
                 try {
                     observer.emit('ingest-progress', { current: i + 1, total, currentName: route.title });
+                    if (existing) {
+                        this.logEvent({ message: 'route updated (library import)', route: route.title });
+                    }
+                    route.description.tsImported = Date.now();
                     await db.save(route, true);
-                    service.addRoute(route, 'user');
+                    service.addRoute(route, existing ? 'import' : 'user');
+                    try {
+                        const cardInfo = service.findCard(route);
+                        cardInfo?.card?.verify();
+                    }
+                    catch {
+                    }
+                    if (existing) {
+                        existing.card.emitUpdate();
+                    }
                     importedRoutes.push(route);
                 }
                 catch (err) {

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

@@ -760,6 +760,7 @@ let RouteListService = (() => {
                         return;
                     const importCard = importId ? null : importCards[idx];
                     const name = file.url ?? file.filename ?? file.name;
+                    this.logEvent({ message: 'import single route file', file: name, type: file.ext });
                     try {
                         if (importId && observer)
                             observer?.emit('parsing', importId);
@@ -768,12 +769,15 @@ let RouteListService = (() => {
                             observer?.emit('success', importId);
                         const route = new route_1.Route(data, details);
                         route.description.tsImported = Date.now();
+                        this.logEvent({ message: 'import single route file success', file: name });
                         const existing = this.findCard(route);
                         if (existing) {
                             existing.list.remove(existing.card);
+                            this.logEvent({ message: 'route updated (import)', route: route.title });
                         }
                         else {
                             this.routes.push(route);
+                            this.logEvent({ message: 'route added', route: route.title });
                         }
                         const card = new RouteCard_1.RouteCard(route, { list: this.myRoutes });
                         card.verify();
@@ -789,7 +793,7 @@ let RouteListService = (() => {
                         this.verifyPoints(card, route);
                     }
                     catch (err) {
-                        this.logEvent({ message: 'import failed', name, reason: err.message, stack: err.stack });
+                        this.logEvent({ message: 'import single route file failed', file: name, reason: err.message, stack: err.stack });
                         if (importId && observer)
                             observer?.emit('error', importId, err.message);
                         if (importCard)
@@ -911,7 +915,10 @@ let RouteListService = (() => {
             }
         }
         addRoute(route, source = 'system') {
-            if (this.getRoute(route.description.id)) {
+            const existing = source === 'system' ? this.getRoute(route.description.id) :
+                this.routes.find(r => r.description?.id === route.description.id);
+            if (existing) {
+                existing.replace(route);
                 return;
             }
             this.routes.push(route);
@@ -929,6 +936,8 @@ let RouteListService = (() => {
                         if (updated) {
                             this.logEvent({ message: 'route updated (country)', route: route.title, country: route.description?.country });
                             this.db.save(route, false);
+                            const cardInfo = this.findCard(route);
+                            cardInfo?.card?.emitUpdate();
                         }
                     });
                 }
@@ -940,7 +949,7 @@ let RouteListService = (() => {
             list.add(card);
             if (list.getId() === 'myRoutes')
                 card.enableDelete(true);
-            this.emitLists('updated', { source });
+            this.emitLists('updated', { source: source === 'user' ? 'user' : 'system' });
         }
         async verifyPoints(card, route) {
             const updated = await route.updateCountryFromPoints();

package/lib/cjs/workouts/base/parsers/intervals/parser.js

@@ -88,7 +88,6 @@ let IntervalsJsonParser = (() => {
                     workout.addStep(step);
                 }
             });
-            this.logger.logEvent({ message: 'parse success', file: fileName });
             return workout;
         }
         supportsExtension(extension) {

package/lib/cjs/workouts/calendar/sync/intervals/provider.js

@@ -120,7 +120,11 @@ let IntervalsCalendarSyncProvider = (() => {
                 }
                 const oldest = (0, utils_1.getFirstDayOfCurrentWeek)();
                 const cw = await this.getIntervalsApi().getCalendarWorkouts({ oldest, days: 30, ext: 'zwo' }) ?? [];
-                const cycling = cw.filter(w => w.type === 'Ride');
+                const cycling = cw.filter(w => w.type === 'Ride' || w.type === 'VirtualRide');
+                this.logger.logEvent({ message: 'workout sync', externalApp: 'intervals',
+                    oldest: oldest.toLocaleDateString(), cntTotal: cw.length, cntCycling: cycling.length,
+                    workouts: cw.map(cw => `${cw.type}:${cw.name}`).join('|')
+                });
                 await this.parseWorkouts(cycling);
                 this.observer.emit(event, this.workouts, 'intervals');
                 this.lastSyncTS = Date.now();
@@ -166,9 +170,11 @@ let IntervalsCalendarSyncProvider = (() => {
                     if (this.lastSyncTS > 0) {
                         if (!isExisting) {
                             this.observer.emit('added', w, 'intervals');
+                            this.logEvent({ message: 'workout added', externalApp: 'intervals', workout: w.workout?.name });
                         }
                         else if (updated && updated.valueOf() > this.lastSyncTS) {
                             this.observer.emit('updated', w, 'intervals');
+                            this.logEvent({ message: 'workout updated', externalApp: 'intervals', workout: w.workout?.name });
                         }
                     }
                     if (isExisting) {
@@ -186,6 +192,7 @@ let IntervalsCalendarSyncProvider = (() => {
                 const deletedWorkouts = this.workouts.filter(w => !events.some(e => e.id.toString() === w.workoutId));
                 for (const w of deletedWorkouts) {
                     this.observer.emit('deleted', w, 'intervals');
+                    this.logEvent({ message: 'workout deleted', externalApp: 'intervals', workout: w.workout?.name });
                 }
                 this.workouts = this.workouts.filter(w => events.find(e => e.id.toString() === w.workoutId));
             }

package/lib/esm/routes/base/model/route.js

@@ -60,6 +60,10 @@ let Route = (() => {
             const points = this._details?.points ?? this._description?.points;
             return points;
         }
+        replace(update) {
+            this._description = { ...update._description };
+            this._details = { ...update._details };
+        }
         addDetails(details) {
             this._details = details;
         }

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

@@ -120,6 +120,7 @@ let RouteLibraryScannerService = (() => {
         scan(folderInfo) {
             if (!this.importProps)
                 this.prepare();
+            this.logEvent({ message: 'import route library', folder: folderInfo.displayName, uri: folderInfo.uri });
             this.isCancelled = false;
             this.scanResult = [];
             this.importProps.phase = 'scanning';
@@ -134,6 +135,8 @@ let RouteLibraryScannerService = (() => {
                 this.importProps.scanProgress = progress;
             })
                 .on('scan-complete', () => {
+                const cntScanned = this.importProps.scanProgress.scannedFolders;
+                this.logEvent({ message: 'import route library: scan success', folder: folderInfo.displayName, cntScanned });
                 this.importProps.phase = 'parsing';
             });
             return observer;
@@ -142,6 +145,7 @@ 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);
@@ -162,6 +166,13 @@ let RouteLibraryScannerService = (() => {
                 }
             });
             observer.on('parse-complete', () => {
+                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,
+                };
+                this.logEvent({ message: 'import route library: parse completed', folder: scannedRoutes?.[0].folderName, parseSumamry });
                 this.importProps.phase = 'selecting';
             });
             return observer;
@@ -212,23 +223,36 @@ let RouteLibraryScannerService = (() => {
             }
         }
         async importSingleGpxRoute(fileInfo, observer) {
-            this.logEvent({ message: 'import single GPX route' });
-            const list = this.getRouteList();
+            const name = fileInfo.url ?? fileInfo.filename ?? fileInfo.name;
+            this.logEvent({ message: 'import single route file', file: name, type: fileInfo.ext });
+            const service = this.getRouteList();
             const db = this.getRoutesDBLoader();
             try {
                 const { data, details } = await RouteParser.parse(fileInfo);
                 const route = new Route(data, details);
+                this.logEvent({ message: 'import single route file success', file: name });
+                const existing = service.findCard(route);
+                if (existing) {
+                    this.logEvent({ message: 'route updated (import)', route: route.title });
+                }
                 route.description.tsImported = Date.now();
                 await db.save(route, true);
-                list.addRoute(route, 'user');
+                service.addRoute(route, existing ? 'import' : 'user');
+                const cardInfo = service.findCard(route);
+                cardInfo?.card?.verify();
+                if (existing) {
+                    existing.card.emitUpdate();
+                }
                 observer.emit('success', route);
             }
             catch (err) {
+                this.logEvent({ message: 'import single route file failed', file: name, reason: err.message, stack: err.stack });
                 observer.emit('error', err.message);
             }
         }
         async importSingleVideoRoute(fileInfo, observer) {
-            this.logEvent({ message: 'import single video route', fileInfo });
+            const name = fileInfo.url ?? fileInfo.filename ?? fileInfo.name;
+            this.logEvent({ message: 'import single route file', file: name, type: fileInfo.ext });
             const parsers = this.getParsers();
             const { dir, delimiter } = fileInfo;
             let { ext } = fileInfo;
@@ -237,6 +261,7 @@ let RouteLibraryScannerService = (() => {
             const folderUri = dir.endsWith(delimiter ?? '/') ? dir.slice(0, -delimiter.length) : dir;
             try {
                 if (!parsers.isPrimaryExtension(ext)) {
+                    this.logEvent({ message: 'import single route file failed', file: name, reason: 'not a route control file' });
                     observer.emit('error', 'not a route control file', ext);
                     return;
                 }
@@ -246,9 +271,11 @@ let RouteLibraryScannerService = (() => {
                 this.scanResult = [];
                 scanObserver.stop();
                 if (!files.length) {
+                    this.logEvent({ message: 'import single route file failed', file: name, reason: 'no file found' });
                     observer.emit('error', 'no file found');
                 }
                 if (files[0].scanError) {
+                    this.logEvent({ message: 'import single route file failed', file: name, reason: files[0].scanError });
                     observer.emit('error', files[0].scanError);
                     return;
                 }
@@ -258,6 +285,7 @@ let RouteLibraryScannerService = (() => {
                     parseObserver.on('parse-result', (result) => {
                         parseObserver.stop();
                         if (result.parseError) {
+                            this.logEvent({ message: 'import single route file failed', file: name, reason: result.parseError });
                             observer.emit('error', result.parseError);
                             return;
                         }
@@ -265,15 +293,18 @@ let RouteLibraryScannerService = (() => {
                         let ingestError;
                         ingest.once('ingest-error', (_, reason) => {
                             ingest.stop();
+                            this.logEvent({ message: 'import single route file failed', file: name, reason });
                             observer.emit('error', reason);
                             ingestError = reason;
                         });
                         ingest.once('ingest-complete', (summary) => {
                             ingest.stop();
                             if (!ingestError && summary.imported > 0) {
+                                this.logEvent({ message: 'import single route file success', file: name });
                                 observer.emit('success', summary.importedRoutes?.[0]?.title);
                             }
                             else if (!ingestError && summary.imported === 0) {
+                                this.logEvent({ message: 'import single route file failed', file: name, reason: 'not imported' });
                                 observer.emit('error', 'not imported');
                             }
                         });
@@ -281,6 +312,7 @@ let RouteLibraryScannerService = (() => {
                 }
             }
             catch (err) {
+                this.logEvent({ message: 'import single route file failed', file: name, reason: err.message, stack: err.stack });
                 observer.emit('error', err.message);
             }
         }
@@ -296,7 +328,6 @@ let RouteLibraryScannerService = (() => {
         }
         async scanFolder(uri, folderName, observer, parsers, progress, discoveredCount, recursive = true) {
             const fs = this.getBindings().fs;
-            this.logEvent({ message: 'scanFolder', uri, folderName });
             let entries;
             try {
                 entries = await fs.readdir(uri, { recursive: false, extended: true });
@@ -390,7 +421,6 @@ let RouteLibraryScannerService = (() => {
                     fileName = info.base;
                 }
                 catch { }
-                this.logEvent({ message: 'parsing route', fileName });
                 await this._parseTarget(target, service, observer);
                 this.logEvent({ message: 'parsing route done', fileName });
             }
@@ -443,7 +473,6 @@ let RouteLibraryScannerService = (() => {
         validateVideoUrl(route, folderUri, folderFiles) {
             const { video } = route?.details ?? {};
             const { file, url, format } = video ?? {};
-            this.logEvent({ message: 'validateVideoUrl', route: { file, url, format }, folderUri, folderFiles });
             let videoFormat = format;
             try {
                 if (videoFormat === undefined) {
@@ -508,7 +537,7 @@ let RouteLibraryScannerService = (() => {
             await waitNextTick();
             const service = this.getRouteList();
             const db = this.getRoutesDBLoader();
-            const target = routes.filter(r => !r.alreadyImported && !r.parseError);
+            const target = routes.filter(r => !r.parseError);
             const total = target.length;
             let errors = 0;
             const failedRoutes = [];
@@ -517,10 +546,25 @@ let RouteLibraryScannerService = (() => {
                 if (this.isCancelled)
                     continue;
                 const { route } = target[i] ?? {};
+                const isExisting = target[i].alreadyImported;
+                const existing = isExisting ? service.findCard(route) : null;
                 try {
                     observer.emit('ingest-progress', { current: i + 1, total, currentName: route.title });
+                    if (existing) {
+                        this.logEvent({ message: 'route updated (library import)', route: route.title });
+                    }
+                    route.description.tsImported = Date.now();
                     await db.save(route, true);
-                    service.addRoute(route, 'user');
+                    service.addRoute(route, existing ? 'import' : 'user');
+                    try {
+                        const cardInfo = service.findCard(route);
+                        cardInfo?.card?.verify();
+                    }
+                    catch {
+                    }
+                    if (existing) {
+                        existing.card.emitUpdate();
+                    }
                     importedRoutes.push(route);
                 }
                 catch (err) {

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

@@ -754,6 +754,7 @@ let RouteListService = (() => {
                         return;
                     const importCard = importId ? null : importCards[idx];
                     const name = file.url ?? file.filename ?? file.name;
+                    this.logEvent({ message: 'import single route file', file: name, type: file.ext });
                     try {
                         if (importId && observer)
                             observer?.emit('parsing', importId);
@@ -762,12 +763,15 @@ let RouteListService = (() => {
                             observer?.emit('success', importId);
                         const route = new Route(data, details);
                         route.description.tsImported = Date.now();
+                        this.logEvent({ message: 'import single route file success', file: name });
                         const existing = this.findCard(route);
                         if (existing) {
                             existing.list.remove(existing.card);
+                            this.logEvent({ message: 'route updated (import)', route: route.title });
                         }
                         else {
                             this.routes.push(route);
+                            this.logEvent({ message: 'route added', route: route.title });
                         }
                         const card = new RouteCard(route, { list: this.myRoutes });
                         card.verify();
@@ -783,7 +787,7 @@ let RouteListService = (() => {
                         this.verifyPoints(card, route);
                     }
                     catch (err) {
-                        this.logEvent({ message: 'import failed', name, reason: err.message, stack: err.stack });
+                        this.logEvent({ message: 'import single route file failed', file: name, reason: err.message, stack: err.stack });
                         if (importId && observer)
                             observer?.emit('error', importId, err.message);
                         if (importCard)
@@ -905,7 +909,10 @@ let RouteListService = (() => {
             }
         }
         addRoute(route, source = 'system') {
-            if (this.getRoute(route.description.id)) {
+            const existing = source === 'system' ? this.getRoute(route.description.id) :
+                this.routes.find(r => r.description?.id === route.description.id);
+            if (existing) {
+                existing.replace(route);
                 return;
             }
             this.routes.push(route);
@@ -923,6 +930,8 @@ let RouteListService = (() => {
                         if (updated) {
                             this.logEvent({ message: 'route updated (country)', route: route.title, country: route.description?.country });
                             this.db.save(route, false);
+                            const cardInfo = this.findCard(route);
+                            cardInfo?.card?.emitUpdate();
                         }
                     });
                 }
@@ -934,7 +943,7 @@ let RouteListService = (() => {
             list.add(card);
             if (list.getId() === 'myRoutes')
                 card.enableDelete(true);
-            this.emitLists('updated', { source });
+            this.emitLists('updated', { source: source === 'user' ? 'user' : 'system' });
         }
         async verifyPoints(card, route) {
             const updated = await route.updateCountryFromPoints();

package/lib/esm/workouts/base/parsers/intervals/parser.js

@@ -85,7 +85,6 @@ let IntervalsJsonParser = (() => {
                     workout.addStep(step);
                 }
             });
-            this.logger.logEvent({ message: 'parse success', file: fileName });
             return workout;
         }
         supportsExtension(extension) {

package/lib/esm/workouts/calendar/sync/intervals/provider.js

@@ -117,7 +117,11 @@ let IntervalsCalendarSyncProvider = (() => {
                 }
                 const oldest = getFirstDayOfCurrentWeek();
                 const cw = await this.getIntervalsApi().getCalendarWorkouts({ oldest, days: 30, ext: 'zwo' }) ?? [];
-                const cycling = cw.filter(w => w.type === 'Ride');
+                const cycling = cw.filter(w => w.type === 'Ride' || w.type === 'VirtualRide');
+                this.logger.logEvent({ message: 'workout sync', externalApp: 'intervals',
+                    oldest: oldest.toLocaleDateString(), cntTotal: cw.length, cntCycling: cycling.length,
+                    workouts: cw.map(cw => `${cw.type}:${cw.name}`).join('|')
+                });
                 await this.parseWorkouts(cycling);
                 this.observer.emit(event, this.workouts, 'intervals');
                 this.lastSyncTS = Date.now();
@@ -163,9 +167,11 @@ let IntervalsCalendarSyncProvider = (() => {
                     if (this.lastSyncTS > 0) {
                         if (!isExisting) {
                             this.observer.emit('added', w, 'intervals');
+                            this.logEvent({ message: 'workout added', externalApp: 'intervals', workout: w.workout?.name });
                         }
                         else if (updated && updated.valueOf() > this.lastSyncTS) {
                             this.observer.emit('updated', w, 'intervals');
+                            this.logEvent({ message: 'workout updated', externalApp: 'intervals', workout: w.workout?.name });
                         }
                     }
                     if (isExisting) {
@@ -183,6 +189,7 @@ let IntervalsCalendarSyncProvider = (() => {
                 const deletedWorkouts = this.workouts.filter(w => !events.some(e => e.id.toString() === w.workoutId));
                 for (const w of deletedWorkouts) {
                     this.observer.emit('deleted', w, 'intervals');
+                    this.logEvent({ message: 'workout deleted', externalApp: 'intervals', workout: w.workout?.name });
                 }
                 this.workouts = this.workouts.filter(w => events.find(e => e.id.toString() === w.workoutId));
             }

package/lib/types/apps/base/api/intervals/types.d.ts

@@ -53,7 +53,7 @@ export type IntervalsCalendarEvent = {
     icu_training_load: number;
     start_date_local: string;
     end_date_local: string;
-    type: 'Ride' | 'Run' | 'Swim' | 'Walk' | 'Weight Training';
+    type: 'Ride' | 'Run' | 'Swim' | 'Walk' | 'Weight Training' | 'VirtualRide' | 'MountainBikeRide' | 'GravelRide';
     calendar_id: number;
     uid: string;
     athlete_id: string;

package/lib/types/routes/base/model/route.d.ts

@@ -2,11 +2,12 @@ import { Countries } from "../../../i18n/countries";
 import { RouteApiDetail } from "../api/types";
 import { RouteInfo, RoutePoint } from "../types";
 export declare class Route {
-    private readonly _description;
+    private _description;
     private _details;
     constructor(info: RouteInfo, raw?: RouteApiDetail);
     get description(): RouteInfo;
     get points(): Array<RoutePoint>;
+    replace(update: Route): void;
     addDetails(details: RouteApiDetail): void;
     get details(): RouteApiDetail;
     set details(details: RouteApiDetail);

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

@@ -138,7 +138,7 @@ export declare class RouteListService extends IncyclistService implements IRoute
     protected getFilterCountries(): Array<string>;
     existsBySourceUri(uri: string): boolean;
     getBySourceUri(uri: string): Route;
-    addRoute(route: Route, source?: 'user' | 'system'): void;
+    addRoute(route: Route, source?: 'user' | 'system' | 'import'): void;
     protected verifyPoints(card: RouteCard, route: Route): Promise<void>;
     protected addFromApi(route: Route): Promise<void>;
     protected update(route: Route, source?: 'user' | 'system'): Promise<void>;
@@ -168,7 +168,7 @@ export declare class RouteListService extends IncyclistService implements IRoute
     protected checkExistingPreviewFiles(descr: RouteInfo): Promise<string | undefined>;
     protected doCreatePreview(descr: RouteInfo): Promise<string>;
     protected processPreviewQueue(): PromiseObserver<void>;
-    protected findCard(target: Route | string): {
+    findCard(target: Route | string): {
         card: RouteCard;
         list: CardList<Route>;
     };

package/package.json

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