incyclist-services 1.7.87 → 1.7.88

package/lib/cjs/routes/base/parsers/tacx/TacxParser.js

@@ -142,10 +142,7 @@ let TacxParser = (() => {
             }
         }
         buildVideoUrl(filePath) {
-            if (filePath.startsWith('/') || /^[A-Za-z]:/.test(filePath)) {
-                return `video:///${filePath}`;
-            }
-            return `video://${filePath}`;
+            return (0, utils_2.buildVideoUrl)(filePath);
         }
         async buildResult(context) {
             if (!context.rlvData || !context.pgmfData) {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUtf8Data = exports.fixIncorrectFileInfo = exports.parseInformations = exports.safeEncode = exports.safeDecode = exports.getReferencedFileInfo = exports.BinaryReader = void 0;
+exports.getUtf8Data = exports.fixIncorrectFileInfo = exports.parseInformations = exports.buildFileUrl = exports.safeEncode = exports.safeDecode = exports.buildVideoUrl = exports.getReferencedFileInfo = exports.BinaryReader = void 0;
 const api_1 = require("../../../api");
 class BinaryReader {
     pos;
@@ -116,6 +116,16 @@ const isAbsolutePath = (path) => {
         return true;
     return false;
 };
+const buildVideoUrl = (filePath) => {
+    if (isAbsolutePath(filePath)) {
+        if (/^[A-Za-z]:/.test(filePath)) {
+            return `video:///${filePath}`;
+        }
+        return `video://${filePath}`;
+    }
+    return `video://${filePath}`;
+};
+exports.buildVideoUrl = buildVideoUrl;
 const safeDecode = (path) => {
     try {
         return decodeURIComponent(path);
@@ -144,6 +154,7 @@ const buildFileUrl = (normalizedPath) => {
     }
     return `file://${encodeURI(normalizedPath)}`;
 };
+exports.buildFileUrl = buildFileUrl;
 const buildUrlFromFile = (info, referenced) => {
     if (referenced.url) {
         return referenced.url;
@@ -159,7 +170,7 @@ const buildUrlFromFile = (info, referenced) => {
         return handleFileUrlPath(fileName);
     }
     const normalizedPath = (0, exports.safeDecode)(fileName);
-    return buildFileUrl(normalizedPath);
+    return (0, exports.buildFileUrl)(normalizedPath);
 };
 const buildAbsolutePathTarget = (fileName, info, scheme) => {
     const inputUrl = info.url;

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

@@ -40,6 +40,7 @@ const decorators_1 = require("../../base/decorators");
 const service_1 = require("../../base/service");
 const settings_1 = require("../../settings");
 const utils_1 = require("../../utils");
+const utils_2 = require("../base/parsers/utils");
 const api_2 = require("../list/loaders/api");
 const db_1 = require("../list/loaders/db");
 const types_1 = require("./types");
@@ -217,8 +218,9 @@ let RouteDownloadService = (() => {
                 session.on('progress', onProgress);
                 session.on('error', onError);
                 session.once('done', () => {
-                    this.logEvent({ message: 'download finished ', title, id, url });
-                    observer.emit('done', `video:///${file}`);
+                    const localUrl = (0, utils_2.buildVideoUrl)(file);
+                    this.logEvent({ message: 'download finished ', title, id, url, localUrl });
+                    observer.emit('done', localUrl);
                 });
                 session.start();
             }

package/lib/cjs/routes/list/cards/RouteCard.js

@@ -362,7 +362,7 @@ let RouteCard = (() => {
             }
             if (descr?.hasVideo && !descr.videoUrl) {
                 const details = this.getRouteData();
-                if (details.video.url) {
+                if (details.video?.url) {
                     canStart = false;
                     videoChecking = true;
                     videoMissing = this.isVideoMissing();

package/lib/cjs/routes/list/loaders/db.js

@@ -41,10 +41,12 @@ exports.useRoutesDbLoader = exports.RoutesDbLoader = void 0;
 const api_1 = require("../../../api");
 const types_1 = require("../../../base/types");
 const observer_1 = require("../../../base/types/observer");
+const route_1 = require("../../base/model/route");
 const LegacyDB_1 = require("./LegacyDB");
+const types_2 = require("./types");
 const DBLoader_1 = require("./DBLoader");
 const utils_1 = require("../../../utils");
-const route_1 = require("../../base/utils/route");
+const route_2 = require("../../base/utils/route");
 const clone_1 = __importDefault(require("../../../utils/clone"));
 let RoutesDbLoader = (() => {
     let _classDecorators = [types_1.Singleton];
@@ -126,8 +128,34 @@ let RoutesDbLoader = (() => {
             if (!descr)
                 return;
             const details = await this.loadDetailRecord(descr);
+            if (!details)
+                return details;
+            await this.correctPersistedVideoUrl(descr, details);
             return details;
         }
+        async correctPersistedVideoUrl(descr, details) {
+            const corrected = (0, types_2.correctVideoUrl)(details.video?.url, this.isMobile());
+            if (!corrected)
+                return false;
+            details.video.url = corrected;
+            if (descr.videoUrl !== corrected) {
+                descr.videoUrl = corrected;
+            }
+            await this.writeDetailsRecord(descr, details);
+            return true;
+        }
+        async writeDetailsRecord(descr, details) {
+            const repo = this.getDetailsRepo(new route_1.Route(descr));
+            if (!repo)
+                return;
+            const id = descr.legacyId || descr.id;
+            try {
+                await repo.write(id, details);
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'could not persist corrected video URL', id, error: err.message });
+            }
+        }
         async writeRepo() {
             if (this.saveObserver)
                 await this.saveObserver.wait();
@@ -260,20 +288,27 @@ let RoutesDbLoader = (() => {
             if (details.localizedTitle && typeof (details.localizedTitle) === 'string') {
                 details.localizedTitle = { en: details.localizedTitle };
             }
-            (0, route_1.validateDistance)(details.points);
-            (0, route_1.validateSlopes)(details.points);
+            (0, route_2.validateDistance)(details.points);
+            (0, route_2.validateSlopes)(details.points);
         }
         validateDescription(description, details) {
             if (!description.elevation) {
-                description.elevation = (0, route_1.getTotalElevation)(details);
+                description.elevation = (0, route_2.getTotalElevation)(details);
             }
         }
         async loadDetails(route, alreadyAdded) {
             const details = await this.loadDetailRecord(route);
             let updated = false;
-            (0, route_1.addDetails)(route, details);
+            const verifyVideoUrl = (route) => {
+                const res = this.verifyVideoUrl(route);
+                if (res) {
+                    this.logger.logEvent({ message: 'video URL updated', url: route?.details?.video?.url });
+                }
+                return res;
+            };
+            (0, route_2.addDetails)(route, details);
             updated ||= this.verifyRouteHash(route);
-            updated ||= this.verifyVideoUrl(route);
+            updated ||= verifyVideoUrl(route);
             if (alreadyAdded)
                 this.emitRouteUpdate(route);
             this.emitRouteAdded(route);

package/lib/cjs/routes/list/loaders/types.js

@@ -1,9 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Loader = void 0;
+exports.Loader = exports.correctVideoUrl = void 0;
+const api_1 = require("../../../api");
 const utils_1 = require("../../../utils");
 const valid_1 = require("../../../utils/valid");
+const utils_2 = require("../../base/parsers/utils");
 const route_1 = require("../../base/utils/route");
+const MALFORMED_VIDEO_URL = /^video:\/{4,}/;
+const correctVideoUrl = (url, isMobile = false) => {
+    if (!url || !url.startsWith('video:'))
+        return undefined;
+    const malformed = MALFORMED_VIDEO_URL.test(url);
+    if (!malformed && !isMobile)
+        return undefined;
+    const rawPath = malformed
+        ? url.replace(/^video:\/{3}/, '')
+        : url.replace(/^video:\/{2}/, '');
+    return isMobile ? (0, utils_2.buildFileUrl)(rawPath) : (0, utils_2.buildVideoUrl)(rawPath);
+};
+exports.correctVideoUrl = correctVideoUrl;
 class Loader {
     loadObserver;
     isCompleted(route) {
@@ -15,6 +30,9 @@ class Loader {
         }
         return true;
     }
+    isMobile() {
+        return (0, api_1.getBindings)()?.appInfo?.getChannel() === 'mobile';
+    }
     verifyRouteHash(route) {
         const { description, details } = route;
         const prev = description.routeHash;
@@ -35,6 +53,11 @@ class Loader {
             return;
         if (descr.videoUrl) {
             const details = route.details;
+            const corrected = (0, exports.correctVideoUrl)(details.video.url, this.isMobile());
+            if (corrected) {
+                details.video.url = corrected;
+                updated = true;
+            }
             if (details.video.url.startsWith('video:') && !descr.isDownloaded && !descr.isLocal) {
                 descr.isDownloaded = true;
                 updated = true;

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

@@ -892,6 +892,13 @@ let RouteListService = (() => {
                             this.db.save(route, false);
                         });
                     }
+                    if (route.description.hasVideo && route.description.isDownloaded) {
+                        card.videoExists().then(exists => {
+                            if (!exists) {
+                                card.resetDownload();
+                            }
+                        });
+                    }
                 })
                     .catch(() => {
                 });

package/lib/cjs/workouts/ride/page/service.js

@@ -167,7 +167,7 @@ let WorkoutRidePageService = (() => {
                 const current = this.getRideDisplay().getDisplayProperties().workout;
                 return {
                     ...base,
-                    title: this.getMobileStepTitle(wo),
+                    title: wo.title ?? '',
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
                     dashboard: this.buildDashboardLine(wo),
@@ -452,20 +452,17 @@ let WorkoutRidePageService = (() => {
             const hasMore = currentIndex + 1 + UPCOMING_STEPS_COUNT < flattened.length;
             return { previous, current: currentStep, upcoming, hasMore };
         }
-        getMobileStepTitle(wo) {
-            const title = wo.title ?? '';
-            const name = wo.workout?.name;
-            const prefix = name ? `${name}: ` : '';
-            return prefix && title.startsWith(prefix) ? title.slice(prefix.length) : title;
-        }
         buildDashboardLine(wo) {
             const limits = this.getWorkoutRide().getCurrentLimits();
-            const title = this.getMobileStepTitle(wo);
+            const title = wo.title ?? '';
             if (!limits)
                 return { text: title, mode: wo.mode ?? null };
             const target = (0, graph_1.getStepTargetText)(limits.step ?? {}, wo.ftp);
             const duration = (0, graph_1.getStepDuration)({ duration: limits.duration });
-            const text = title ? `${target} for ${duration} - ${title}` : `${target} for ${duration}`;
+            const base = `${target} for ${duration}`;
+            let text = base;
+            if (title && title !== base)
+                text = title.startsWith('(') ? `${base}${title}` : `${base} - ${title}`;
             return { text, mode: wo.mode ?? null };
         }
         getStepAbsolutePower(step, ftp) {

package/lib/cjs/workouts/ride/service.js

@@ -35,6 +35,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWorkoutRide = exports.useWorkoutRide = exports.WorkoutRide = void 0;
+const api_1 = require("../../api");
 const service_1 = require("../../base/service");
 const types_1 = require("../../base/types");
 const observer_1 = require("../../base/types/observer");
@@ -42,6 +43,7 @@ const devices_1 = require("../../devices");
 const settings_1 = require("../../settings");
 const utils_1 = require("../../utils");
 const valid_1 = require("../../utils/valid");
+const graph_1 = require("../base/graph");
 const list_1 = require("../list");
 const decorators_1 = require("../../base/decorators");
 const DEFAULT_FTP = 200;
@@ -521,35 +523,40 @@ let WorkoutRide = (() => {
             }
             return { start, stop };
         }
+        getBindings() {
+            return (0, api_1.getBindings)();
+        }
         getStepTitle(time) {
             if (!this.workout)
                 return;
-            let title = this.workout.name;
             const limit = this.workout.getLimits(time, true);
             const segment = this.workout.getSegment(time);
-            let ch = ': ';
-            if (segment?.text) {
-                title += `${ch}${segment.text}`;
-                ch = ' - ';
-            }
-            if (segment?.text && segment?.repeat > 0) {
-                const repeatTime = segment.duration / segment.repeat;
-                const repeatCount = Math.floor((time - segment.getStart()) / repeatTime) + 1;
-                title += `(${repeatCount}/${segment.repeat})`;
-            }
-            if (!limit) {
-                title += `${ch}free`;
-            }
-            else {
-                if (limit?.text)
-                    title += `${ch}${limit.text}`;
-                if (limit?.text && segment && !segment.text && segment.repeat > 0) {
+            const isMobile = this.getBindings()?.appInfo?.getChannel() === 'mobile';
+            const repeatSuffix = (segment?.repeat > 0)
+                ? (() => {
                     const repeatTime = segment.duration / segment.repeat;
                     const repeatCount = Math.floor((time - segment.getStart()) / repeatTime) + 1;
-                    title += `(${repeatCount}/${segment.repeat})`;
-                }
-            }
-            return title;
+                    return `(${repeatCount}/${segment.repeat})`;
+                })()
+                : '';
+            const compose = (body) => isMobile ? body : `${this.workout.name}: ${body}`;
+            if (!limit)
+                return compose('free');
+            const segmentName = segment?.text;
+            const stepName = limit?.text;
+            if (segmentName && stepName)
+                return compose(`${segmentName}${repeatSuffix} - ${stepName}`);
+            if (segmentName)
+                return compose(`${segmentName}${repeatSuffix}`);
+            if (stepName)
+                return compose(`${stepName}${repeatSuffix}`);
+            const rawStep = this.currentLimits?.step ?? limit;
+            const verbalDescription = `${(0, graph_1.getStepTargetText)(rawStep, this.settings?.ftp)} for ${(0, graph_1.getStepDuration)(rawStep)}`;
+            if (isMobile)
+                return repeatSuffix || verbalDescription;
+            if (!segment)
+                return this.workout.name;
+            return compose(`${verbalDescription}${repeatSuffix}`);
         }
         getPowerVal(power, key) {
             if (power === undefined)

package/lib/esm/routes/base/parsers/tacx/TacxParser.js

@@ -40,7 +40,7 @@ import { getRouteHash, validateRoute } from "../../utils/route";
 import { PGMFFileReader } from "./pgmf";
 import { RLVFileReader } from "./rlv";
 import { TacxFileReader } from "./TacxReader";
-import { fixIncorrectFileInfo } from "../utils";
+import { buildVideoUrl, fixIncorrectFileInfo } from "../utils";
 import { EventLogger } from "gd-eventlog";
 import { Injectable } from "../../../../base/decorators";
 let TacxParser = (() => {
@@ -136,10 +136,7 @@ let TacxParser = (() => {
             }
         }
         buildVideoUrl(filePath) {
-            if (filePath.startsWith('/') || /^[A-Za-z]:/.test(filePath)) {
-                return `video:///${filePath}`;
-            }
-            return `video://${filePath}`;
+            return buildVideoUrl(filePath);
         }
         async buildResult(context) {
             if (!context.rlvData || !context.pgmfData) {

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

@@ -111,6 +111,15 @@ const isAbsolutePath = (path) => {
         return true;
     return false;
 };
+export const buildVideoUrl = (filePath) => {
+    if (isAbsolutePath(filePath)) {
+        if (/^[A-Za-z]:/.test(filePath)) {
+            return `video:///${filePath}`;
+        }
+        return `video://${filePath}`;
+    }
+    return `video://${filePath}`;
+};
 export const safeDecode = (path) => {
     try {
         return decodeURIComponent(path);
@@ -128,7 +137,7 @@ const handleFileUrlPath = (fileName) => {
     const cleanPath = safeDecode(fileName.replace(/^file:\/\/\/?/, ''));
     return `file://${encodeURI(cleanPath)}`;
 };
-const buildFileUrl = (normalizedPath) => {
+export const buildFileUrl = (normalizedPath) => {
     if (isAbsolutePath(normalizedPath)) {
         if (/^[A-Za-z]:/.exec(normalizedPath)) {
             return `file:///${encodeURI(normalizedPath)}`;

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

@@ -37,6 +37,7 @@ import { Injectable, Singleton } from "../../base/decorators";
 import { IncyclistService } from "../../base/service";
 import { useUserSettings } from "../../settings";
 import { waitNextTick } from "../../utils";
+import { buildVideoUrl } from "../base/parsers/utils";
 import { RoutesApiLoader } from "../list/loaders/api";
 import { RoutesDbLoader } from "../list/loaders/db";
 import { DownloadObserver } from "./types";
@@ -214,8 +215,9 @@ let RouteDownloadService = (() => {
                 session.on('progress', onProgress);
                 session.on('error', onError);
                 session.once('done', () => {
-                    this.logEvent({ message: 'download finished ', title, id, url });
-                    observer.emit('done', `video:///${file}`);
+                    const localUrl = buildVideoUrl(file);
+                    this.logEvent({ message: 'download finished ', title, id, url, localUrl });
+                    observer.emit('done', localUrl);
                 });
                 session.start();
             }

package/lib/esm/routes/list/cards/RouteCard.js

@@ -359,7 +359,7 @@ let RouteCard = (() => {
             }
             if (descr?.hasVideo && !descr.videoUrl) {
                 const details = this.getRouteData();
-                if (details.video.url) {
+                if (details.video?.url) {
                     canStart = false;
                     videoChecking = true;
                     videoMissing = this.isVideoMissing();

package/lib/esm/routes/list/loaders/db.js

@@ -35,7 +35,9 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 import { JsonRepository } from "../../../api";
 import { Singleton } from "../../../base/types";
 import { PromiseObserver } from "../../../base/types/observer";
+import { Route } from "../../base/model/route";
 import { RoutesLegacyDbLoader } from "./LegacyDB";
+import { correctVideoUrl } from "./types";
 import { DBLoader } from "./DBLoader";
 import { waitNextTick } from "../../../utils";
 import { addDetails, getTotalElevation, validateDistance, validateSlopes } from "../../base/utils/route";
@@ -120,8 +122,34 @@ let RoutesDbLoader = (() => {
             if (!descr)
                 return;
             const details = await this.loadDetailRecord(descr);
+            if (!details)
+                return details;
+            await this.correctPersistedVideoUrl(descr, details);
             return details;
         }
+        async correctPersistedVideoUrl(descr, details) {
+            const corrected = correctVideoUrl(details.video?.url, this.isMobile());
+            if (!corrected)
+                return false;
+            details.video.url = corrected;
+            if (descr.videoUrl !== corrected) {
+                descr.videoUrl = corrected;
+            }
+            await this.writeDetailsRecord(descr, details);
+            return true;
+        }
+        async writeDetailsRecord(descr, details) {
+            const repo = this.getDetailsRepo(new Route(descr));
+            if (!repo)
+                return;
+            const id = descr.legacyId || descr.id;
+            try {
+                await repo.write(id, details);
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'could not persist corrected video URL', id, error: err.message });
+            }
+        }
         async writeRepo() {
             if (this.saveObserver)
                 await this.saveObserver.wait();
@@ -265,9 +293,16 @@ let RoutesDbLoader = (() => {
         async loadDetails(route, alreadyAdded) {
             const details = await this.loadDetailRecord(route);
             let updated = false;
+            const verifyVideoUrl = (route) => {
+                const res = this.verifyVideoUrl(route);
+                if (res) {
+                    this.logger.logEvent({ message: 'video URL updated', url: route?.details?.video?.url });
+                }
+                return res;
+            };
             addDetails(route, details);
             updated ||= this.verifyRouteHash(route);
-            updated ||= this.verifyVideoUrl(route);
+            updated ||= verifyVideoUrl(route);
             if (alreadyAdded)
                 this.emitRouteUpdate(route);
             this.emitRouteAdded(route);

package/lib/esm/routes/list/loaders/types.js

@@ -1,6 +1,20 @@
+import { getBindings } from "../../../api";
 import { waitNextTick } from "../../../utils";
 import { valid } from "../../../utils/valid";
+import { buildFileUrl, buildVideoUrl } from "../../base/parsers/utils";
 import { getRouteHash } from "../../base/utils/route";
+const MALFORMED_VIDEO_URL = /^video:\/{4,}/;
+export const correctVideoUrl = (url, isMobile = false) => {
+    if (!url || !url.startsWith('video:'))
+        return undefined;
+    const malformed = MALFORMED_VIDEO_URL.test(url);
+    if (!malformed && !isMobile)
+        return undefined;
+    const rawPath = malformed
+        ? url.replace(/^video:\/{3}/, '')
+        : url.replace(/^video:\/{2}/, '');
+    return isMobile ? buildFileUrl(rawPath) : buildVideoUrl(rawPath);
+};
 export class Loader {
     loadObserver;
     isCompleted(route) {
@@ -12,6 +26,9 @@ export class Loader {
         }
         return true;
     }
+    isMobile() {
+        return getBindings()?.appInfo?.getChannel() === 'mobile';
+    }
     verifyRouteHash(route) {
         const { description, details } = route;
         const prev = description.routeHash;
@@ -32,6 +49,11 @@ export class Loader {
             return;
         if (descr.videoUrl) {
             const details = route.details;
+            const corrected = correctVideoUrl(details.video.url, this.isMobile());
+            if (corrected) {
+                details.video.url = corrected;
+                updated = true;
+            }
             if (details.video.url.startsWith('video:') && !descr.isDownloaded && !descr.isLocal) {
                 descr.isDownloaded = true;
                 updated = true;

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

@@ -886,6 +886,13 @@ let RouteListService = (() => {
                             this.db.save(route, false);
                         });
                     }
+                    if (route.description.hasVideo && route.description.isDownloaded) {
+                        card.videoExists().then(exists => {
+                            if (!exists) {
+                                card.resetDownload();
+                            }
+                        });
+                    }
                 })
                     .catch(() => {
                 });

package/lib/esm/workouts/ride/page/service.js

@@ -164,7 +164,7 @@ let WorkoutRidePageService = (() => {
                 const current = this.getRideDisplay().getDisplayProperties().workout;
                 return {
                     ...base,
-                    title: this.getMobileStepTitle(wo),
+                    title: wo.title ?? '',
                     graph: this.buildGraphPlan(current, wo.ftp),
                     steps: this.buildUpcomingSteps(current, wo.ftp),
                     dashboard: this.buildDashboardLine(wo),
@@ -449,20 +449,17 @@ let WorkoutRidePageService = (() => {
             const hasMore = currentIndex + 1 + UPCOMING_STEPS_COUNT < flattened.length;
             return { previous, current: currentStep, upcoming, hasMore };
         }
-        getMobileStepTitle(wo) {
-            const title = wo.title ?? '';
-            const name = wo.workout?.name;
-            const prefix = name ? `${name}: ` : '';
-            return prefix && title.startsWith(prefix) ? title.slice(prefix.length) : title;
-        }
         buildDashboardLine(wo) {
             const limits = this.getWorkoutRide().getCurrentLimits();
-            const title = this.getMobileStepTitle(wo);
+            const title = wo.title ?? '';
             if (!limits)
                 return { text: title, mode: wo.mode ?? null };
             const target = getStepTargetText(limits.step ?? {}, wo.ftp);
             const duration = getStepDuration({ duration: limits.duration });
-            const text = title ? `${target} for ${duration} - ${title}` : `${target} for ${duration}`;
+            const base = `${target} for ${duration}`;
+            let text = base;
+            if (title && title !== base)
+                text = title.startsWith('(') ? `${base}${title}` : `${base} - ${title}`;
             return { text, mode: wo.mode ?? null };
         }
         getStepAbsolutePower(step, ftp) {

package/lib/esm/workouts/ride/service.js

@@ -32,6 +32,7 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
+import { getBindings } from "../../api";
 import { IncyclistService } from "../../base/service";
 import { Singleton } from "../../base/types";
 import { Observer } from "../../base/types/observer";
@@ -39,6 +40,7 @@ import { useDeviceRide } from "../../devices";
 import { useUserSettings } from "../../settings";
 import { waitNextTick } from "../../utils";
 import { valid } from "../../utils/valid";
+import { getStepDuration, getStepTargetText } from "../base/graph";
 import { useWorkoutList } from "../list";
 import { Injectable } from "../../base/decorators";
 const DEFAULT_FTP = 200;
@@ -518,35 +520,40 @@ let WorkoutRide = (() => {
             }
             return { start, stop };
         }
+        getBindings() {
+            return getBindings();
+        }
         getStepTitle(time) {
             if (!this.workout)
                 return;
-            let title = this.workout.name;
             const limit = this.workout.getLimits(time, true);
             const segment = this.workout.getSegment(time);
-            let ch = ': ';
-            if (segment?.text) {
-                title += `${ch}${segment.text}`;
-                ch = ' - ';
-            }
-            if (segment?.text && segment?.repeat > 0) {
-                const repeatTime = segment.duration / segment.repeat;
-                const repeatCount = Math.floor((time - segment.getStart()) / repeatTime) + 1;
-                title += `(${repeatCount}/${segment.repeat})`;
-            }
-            if (!limit) {
-                title += `${ch}free`;
-            }
-            else {
-                if (limit?.text)
-                    title += `${ch}${limit.text}`;
-                if (limit?.text && segment && !segment.text && segment.repeat > 0) {
+            const isMobile = this.getBindings()?.appInfo?.getChannel() === 'mobile';
+            const repeatSuffix = (segment?.repeat > 0)
+                ? (() => {
                     const repeatTime = segment.duration / segment.repeat;
                     const repeatCount = Math.floor((time - segment.getStart()) / repeatTime) + 1;
-                    title += `(${repeatCount}/${segment.repeat})`;
-                }
-            }
-            return title;
+                    return `(${repeatCount}/${segment.repeat})`;
+                })()
+                : '';
+            const compose = (body) => isMobile ? body : `${this.workout.name}: ${body}`;
+            if (!limit)
+                return compose('free');
+            const segmentName = segment?.text;
+            const stepName = limit?.text;
+            if (segmentName && stepName)
+                return compose(`${segmentName}${repeatSuffix} - ${stepName}`);
+            if (segmentName)
+                return compose(`${segmentName}${repeatSuffix}`);
+            if (stepName)
+                return compose(`${stepName}${repeatSuffix}`);
+            const rawStep = this.currentLimits?.step ?? limit;
+            const verbalDescription = `${getStepTargetText(rawStep, this.settings?.ftp)} for ${getStepDuration(rawStep)}`;
+            if (isMobile)
+                return repeatSuffix || verbalDescription;
+            if (!segment)
+                return this.workout.name;
+            return compose(`${verbalDescription}${repeatSuffix}`);
         }
         getPowerVal(power, key) {
             if (power === undefined)

package/lib/types/routes/base/parsers/utils.d.ts

@@ -21,8 +21,10 @@ export declare const getReferencedFileInfo: (info: FileInfo, referenced: {
     file?: string;
     url?: string;
 }, scheme?: string) => string;
+export declare const buildVideoUrl: (filePath: string) => string;
 export declare const safeDecode: (path: string) => string;
 export declare const safeEncode: (path: string) => string;
+export declare const buildFileUrl: (normalizedPath: string) => string;
 export declare const parseInformations: (informations?: Array<JSONObject>) => Array<RouteInfoText>;
 export declare const fixIncorrectFileInfo: (file: Partial<FileInfo>) => void;
 export declare const getUtf8Data: (res: string | Buffer) => string;

package/lib/types/routes/list/cards/RouteCard.d.ts

@@ -107,7 +107,7 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     protected deleteRouteUserSettings(): void;
     protected deleteFromUIList(): void;
     protected markDeleted(): Promise<void>;
-    protected resetDownload(): Promise<void>;
+    resetDownload(): Promise<void>;
     protected deleteRoute(): Promise<void>;
     protected logError(err: Error, fn: string): void;
     protected getSettings(): RouteSettings;

package/lib/types/routes/list/loaders/db.d.ts

@@ -19,6 +19,8 @@ export declare class RoutesDbLoader extends DBLoader<RouteInfoDBEntry> {
     delete(route: Route): Promise<void>;
     getDescription(id: string): RouteInfo;
     getDetails(id: string): Promise<RouteApiDetail>;
+    protected correctPersistedVideoUrl(descr: RouteInfo, details: RouteApiDetail): Promise<boolean>;
+    protected writeDetailsRecord(descr: RouteInfo, details: RouteApiDetail): Promise<void>;
     protected writeRepo(): Promise<void>;
     protected write(): void;
     protected getLegacyLoader(): RoutesLegacyDbLoader;

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

@@ -2,6 +2,7 @@ import { Observer } from "../../../base/types/observer";
 import { RouteApiDescription } from "../../base/api/types";
 import { Route } from "../../base/model/route";
 import { RouteInfo } from "../../base/types";
+export declare const correctVideoUrl: (url?: string, isMobile?: boolean) => string | undefined;
 export interface RouteInfoDBEntry extends RouteInfo {
     pointsEncoded?: string;
 }
@@ -21,6 +22,7 @@ export declare abstract class Loader<T extends MinimalDescription> {
     abstract save(route: Route): Promise<void>;
     protected abstract buildRouteInfo(descr: T): RouteInfo;
     protected isCompleted(route: Route): boolean;
+    protected isMobile(): boolean;
     protected verifyRouteHash(route: Route): boolean;
     protected verifyVideoUrl(route: Route): boolean;
     protected verifyCountry(route: Route): Promise<void>;

package/lib/types/workouts/ride/page/service.d.ts

@@ -57,7 +57,6 @@ export declare class WorkoutRidePageService extends IncyclistPageService impleme
     protected getLoadIncrement(): number;
     protected buildGraphPlan(current: Workout | undefined, ftp: number): WorkoutGraphPlan;
     protected buildUpcomingSteps(current: Workout | undefined, ftp: number): WorkoutUpcomingSteps;
-    protected getMobileStepTitle(wo: WorkoutDisplayProperties): string;
     protected buildDashboardLine(wo: WorkoutDisplayProperties): WorkoutDashboardLine;
     protected getStepAbsolutePower(step: StepDefinition, ftp?: number): number | null;
     protected getStepFlags(): {

package/lib/types/workouts/ride/service.d.ts

@@ -56,6 +56,7 @@ export declare class WorkoutRide extends IncyclistService {
         start: any;
         stop: any;
     };
+    protected getBindings(): import("../../api").IncyclistBindings;
     protected getStepTitle(time: number): string;
     protected getPowerVal(power: PowerLimit, key: 'min' | 'max'): number;
     protected getFtpFromUserSettings(): any;

package/package.json

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