incyclist-services 1.3.32 → 1.3.33

package/lib/routes/base/types/index.d.ts

@@ -96,6 +96,7 @@ export interface RouteInfo extends RouteBase {
     requiresDownload?: boolean;
     videoFormat?: string;
     videoUrl?: string;
+    originalVideoUrl?: string;
     downloadUrl?: string;
     previewUrl?: string;
     points?: Array<RoutePoint>;

package/lib/routes/base/utils/route.js

@@ -129,7 +129,7 @@ const addGenericDetails = (details, route) => {
         route.description.routeHash = details.routeHash;
 };
 const addVideoDetails = (route, details) => {
-    var _a, _b;
+    var _a, _b, _c;
     if (!(0, valid_1.valid)(route.description.requiresDownload))
         route.description.requiresDownload = (_a = details.requiresDownload) !== null && _a !== void 0 ? _a : (0, valid_1.valid)(details.downloadUrl);
     if (!(0, valid_1.valid)(route.description.downloadUrl))
@@ -138,7 +138,9 @@ const addVideoDetails = (route, details) => {
         route.description.videoUrl = details.video.url;
     }
     if (!(0, valid_1.valid)(route.description.videoUrl)) {
-        route.description.videoUrl = (0, valid_1.valid)(details.video.file) ? 'video:///' + details.video.file : undefined;
+        if ((0, valid_1.valid)((_b = details.video) === null || _b === void 0 ? void 0 : _b.file)) {
+            route.description.videoUrl = details.video.file.startsWith('http') ? details.video.file : 'video:///' + details.video.file;
+        }
     }
     if (!(0, valid_1.valid)(route.description.videoFormat)) {
         route.description.videoFormat = details.video.format;
@@ -147,7 +149,7 @@ const addVideoDetails = (route, details) => {
         route.description.previewUrl = details.previewUrl;
     }
     route.description.hasGpx = details.points.find(p => p.lat && p.lng) !== undefined;
-    route.description.next = (_b = details.video) === null || _b === void 0 ? void 0 : _b.next;
+    route.description.next = (_c = details.video) === null || _c === void 0 ? void 0 : _c.next;
 };
 const validateRoute = (route) => {
     var _a;

package/lib/routes/download/service.d.ts

@@ -1,5 +1,7 @@
 import { IncyclistService } from "../../base/service";
 import { Route } from "../base/model/route";
+import { RoutesApiLoader } from "../list/loaders/api";
+import { RoutesDbLoader } from "../list/loaders/db";
 import { DownloadObserver } from "./types";
 export declare class RouteDownloadService extends IncyclistService {
     protected downloads: Array<{
@@ -8,11 +10,14 @@ export declare class RouteDownloadService extends IncyclistService {
     }>;
     protected progressLogTs: Record<string, number>;
     constructor();
+    getRepo(): RoutesDbLoader;
+    getRoutesApi(): RoutesApiLoader;
     download(route: Route): DownloadObserver;
     stopDownload(route: Route): void;
     protected getObserver(route: Route): DownloadObserver;
     protected _download(route: Route): Promise<void>;
     protected waitForVideoDir(observer: DownloadObserver): any;
     protected downloadRoute(route: Route, targetDir: string, observer: DownloadObserver): Promise<void>;
+    protected restoreFromRepo(route: Route): Promise<string>;
     protected onDownloadProgress(id: string, observer: DownloadObserver, pct: any, speed: any, downloaded: any): void;
 }

package/lib/routes/download/service.js

@@ -14,6 +14,8 @@ const api_1 = require("../../api");
 const service_1 = require("../../base/service");
 const settings_1 = require("../../settings");
 const utils_1 = require("../../utils");
+const api_2 = require("../list/loaders/api");
+const db_1 = require("../list/loaders/db");
 const types_1 = require("./types");
 class RouteDownloadService extends service_1.IncyclistService {
     constructor() {
@@ -21,6 +23,12 @@ class RouteDownloadService extends service_1.IncyclistService {
         this.progressLogTs = {};
         this.downloads = [];
     }
+    getRepo() {
+        return new db_1.RoutesDbLoader();
+    }
+    getRoutesApi() {
+        return new api_2.RoutesApiLoader();
+    }
     download(route) {
         const running = this.getObserver(route);
         if (running) {
@@ -78,6 +86,13 @@ class RouteDownloadService extends service_1.IncyclistService {
             let url;
             try {
                 url = ((_a = route === null || route === void 0 ? void 0 : route.description) === null || _a === void 0 ? void 0 : _a.downloadUrl) || ((_b = route === null || route === void 0 ? void 0 : route.description) === null || _b === void 0 ? void 0 : _b.videoUrl);
+                if (!url) {
+                    url = this.restoreFromRepo(route);
+                }
+                if (!url) {
+                    observer.emit('error', new Error('download not supported'));
+                    return;
+                }
                 const { id, title } = route.description;
                 const { path, downloadManager } = (0, api_1.getBindings)();
                 if (!path || !downloadManager) {
@@ -117,6 +132,14 @@ class RouteDownloadService extends service_1.IncyclistService {
             }
         });
     }
+    restoreFromRepo(route) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.getRoutesApi().loadDetails([{ route, added: false }], true);
+            yield (0, utils_1.waitNextTick)();
+            const descr = this.getRepo().getDescription(route.description.id);
+            return (descr === null || descr === void 0 ? void 0 : descr.downloadUrl) || (descr === null || descr === void 0 ? void 0 : descr.videoUrl);
+        });
+    }
     onDownloadProgress(id, observer, pct, speed, downloaded) {
         const prev = this.progressLogTs[id] || 0;
         const ts = Date.now();

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

@@ -94,6 +94,8 @@ export declare class RouteCard extends BaseCard implements Card<Route> {
     download(): Observer;
     stopDownload(): void;
     protected onDownloadCompleted(url: string): Promise<void>;
+    private saveOriginalVideoUrl;
+    private restoreVideoUrl;
     protected onDownloadError(err: Error): Promise<void>;
     getCurrentConversion(): Observer;
     convert(): Observer;

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

@@ -360,10 +360,18 @@ class RouteCard extends base_1.BaseCard {
         }
     }
     download() {
-        var _a, _b;
+        var _a;
         try {
             if (!this.downloadObserver) {
-                (0, service_1.getRouteList)().logEvent({ message: 'download started', route: (_b = (_a = this.route) === null || _a === void 0 ? void 0 : _a.description) === null || _b === void 0 ? void 0 : _b.title });
+                const routeDescr = (_a = this.route) === null || _a === void 0 ? void 0 : _a.description;
+                const lv = (v) => {
+                    if (v === null)
+                        return 'null';
+                    if (v === undefined)
+                        return undefined;
+                    return v;
+                };
+                (0, service_1.getRouteList)().logEvent({ message: 'download started', route: routeDescr === null || routeDescr === void 0 ? void 0 : routeDescr.title, videoUrl: lv(routeDescr === null || routeDescr === void 0 ? void 0 : routeDescr.videoUrl), downloadUrl: lv(routeDescr === null || routeDescr === void 0 ? void 0 : routeDescr.downloadUrl) });
                 const dl = new service_2.RouteDownloadService();
                 this.downloadObserver = dl.download(this.route);
                 this.downloadObserver
@@ -392,12 +400,11 @@ class RouteCard extends base_1.BaseCard {
             var _a, _b;
             try {
                 (0, service_1.getRouteList)().logEvent({ message: 'download completed', route: (_b = (_a = this.route) === null || _a === void 0 ? void 0 : _a.description) === null || _b === void 0 ? void 0 : _b.title });
-                if (!this.route.description.downloadUrl) {
-                    this.route.description.downloadUrl = this.route.description.videoUrl;
-                }
-                this.route.description.videoUrl = url;
-                this.route.description.isDownloaded = true;
-                this.route.description.tsImported = Date.now();
+                this.saveOriginalVideoUrl();
+                const descr = this.getRouteDescription();
+                descr.videoUrl = url;
+                descr.isDownloaded = true;
+                descr.tsImported = Date.now();
                 this.route.details.video.file = undefined;
                 this.route.details.video.url = url;
                 this.updateRoute(this.route);
@@ -416,6 +423,19 @@ class RouteCard extends base_1.BaseCard {
             }
         });
     }
+    saveOriginalVideoUrl() {
+        const descr = this.getRouteDescription();
+        descr.originalVideoUrl = descr.videoUrl;
+        if (!descr.downloadUrl && descr.videoUrl.startsWith('http')) {
+            descr.downloadUrl = descr.videoUrl;
+        }
+        this.save();
+    }
+    restoreVideoUrl() {
+        var _a;
+        const descr = this.getRouteDescription();
+        descr.videoUrl = (_a = descr.originalVideoUrl) !== null && _a !== void 0 ? _a : descr.downloadUrl;
+    }
     onDownloadError(err) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -556,10 +576,10 @@ class RouteCard extends base_1.BaseCard {
         return __awaiter(this, void 0, void 0, function* () {
             const descr = this.getRouteDescription();
             descr.isDownloaded = false;
-            descr.videoUrl = descr.downloadUrl;
+            this.restoreVideoUrl();
             descr.tsImported = null;
             this.route.details.video.file = undefined;
-            this.route.details.video.url = descr.downloadUrl;
+            this.route.details.video.url = descr.videoUrl;
             if (this.downloadObserver) {
                 this.downloadObserver.stop();
                 process.nextTick(() => { delete this.downloadObserver; });

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

@@ -22,7 +22,7 @@ export declare class RoutesApiLoader extends Loader<RouteApiDescription> {
     protected isCompleted(route: Route): boolean;
     protected isPreviewMissing(route: Route): boolean;
     protected loadDetailsFromRepo(items: LoadDetailsTargets): Promise<LoadDetailsTargets>;
-    loadDetails(items: LoadDetailsTargets): Promise<void>;
+    loadDetails(items: LoadDetailsTargets, enforced?: boolean): Promise<void>;
     private processLoadDetailsResult;
     protected getDetails(route: Route): Promise<void>;
     protected buildRouteInfo(descr: RouteApiDescription, isLocal?: boolean): RouteInfo;

package/lib/routes/list/loaders/api.js

@@ -169,9 +169,9 @@ class RoutesApiLoader extends types_1.Loader {
             return failed;
         });
     }
-    loadDetails(items) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const failed = yield this.loadDetailsFromRepo(items);
+    loadDetails(items_1) {
+        return __awaiter(this, arguments, void 0, function* (items, enforced = false) {
+            const failed = enforced ? items : yield this.loadDetailsFromRepo(items);
             const promises = failed.map(i => this.getDetails(i.route));
             const res = yield Promise.allSettled(promises);
             yield this.processLoadDetailsResult(res, items, true);

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

@@ -122,7 +122,7 @@ let RoutesDbLoader = (() => {
         }
         getDetails(id) {
             return __awaiter(this, void 0, void 0, function* () {
-                const descr = this.routeDescriptions.find(d => d.id === id);
+                const descr = this.getDescription(id);
                 if (!descr)
                     return;
                 const details = yield this.loadDetailRecord(descr);
@@ -217,29 +217,34 @@ let RoutesDbLoader = (() => {
         }
         loadDetailRecord(target) {
             return __awaiter(this, void 0, void 0, function* () {
-                var _a;
                 const description = (target.description || target);
                 const repo = (description === null || description === void 0 ? void 0 : description.hasVideo) ? this.getVideosRepo() : this.getRoutesRepo();
-                let details;
-                try {
-                    const id = description.legacyId || description.id;
-                    details = (yield repo.read(id));
-                    description.originalName = details.title;
-                    if (description.hasVideo) {
-                        description.segments = ((_a = details.video) === null || _a === void 0 ? void 0 : _a.selectableSegments) || (details === null || details === void 0 ? void 0 : details.selectableSegments);
-                    }
-                }
-                catch (err) {
-                    this.logger.logEvent({ message: 'could not load route details', id: (description === null || description === void 0 ? void 0 : description.legacyId) || (description === null || description === void 0 ? void 0 : description.id), title: description === null || description === void 0 ? void 0 : description.title, reason: err.message, stack: err.stack });
-                    if (description.id && description.legacyId !== description.id) {
-                        try {
-                            details = (yield repo.read(description.id));
-                            description.originalName = details.title;
-                        }
-                        catch (err) {
-                            this.logger.logEvent({ message: 'could not load route details', id: (description === null || description === void 0 ? void 0 : description.legacyId) || (description === null || description === void 0 ? void 0 : description.id), title: description === null || description === void 0 ? void 0 : description.title, reason: err.message, stack: err.stack });
+                const loadFromRepo = (id_1, ...args_1) => __awaiter(this, [id_1, ...args_1], void 0, function* (id, logErrors = true) {
+                    var _a;
+                    try {
+                        const res = yield repo.read(id);
+                        if (res) {
+                            description.originalName = res.title;
+                            if (description.hasVideo && !description.segments) {
+                                description.segments = ((_a = res.video) === null || _a === void 0 ? void 0 : _a.selectableSegments) || res.selectableSegments;
+                            }
                         }
+                        else if (logErrors)
+                            this.logger.logEvent({ message: 'could not load route details', id, title: description === null || description === void 0 ? void 0 : description.title, reason: 'no data received' });
+                        return res;
                     }
+                    catch (err) {
+                        if (logErrors)
+                            this.logger.logEvent({ message: 'could not load route details', id, title: description === null || description === void 0 ? void 0 : description.title, reason: err.message, stack: err.stack });
+                        return null;
+                    }
+                });
+                let details;
+                if (description.legacyId) {
+                    details = yield loadFromRepo(description.legacyId, false);
+                }
+                if (!details) {
+                    details = yield loadFromRepo(description.id);
                 }
                 if (!details) {
                     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.3.32",
+  "version": "1.3.33",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },