incyclist-services 1.1.87 → 1.1.89

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

@@ -16,13 +16,14 @@ export interface RouteApiDescription extends RouteBase {
     points?: {
         id: string;
     };
-    version?: string;
+    version?: number;
     category?: RouteCategory;
     provider?: RouteProvider;
     video?: VideoDescription;
     type?: RouteType;
     localizedTitle?: LocalizedText;
     previewUrl?: string;
+    isDeleted?: boolean;
 }
 export type LegacyRouteGpxRepoDescription = {
     id: string;

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

@@ -106,6 +106,7 @@ export interface RouteInfo extends RouteBase {
     isDownloaded?: boolean;
     isDeleted?: boolean;
     originalName?: string;
+    version?: number;
 }
 export type LocalizedText = {
     [index: string]: string;

package/lib/routes/list/lists/myroutes.js

@@ -12,8 +12,7 @@ const score = (r) => {
             val += 1;
         val += Math.log10(365 - tsAction);
     }
-    if (val > 1)
-        return val;
+    return val;
 };
 const sortFn = (a, b) => {
     const routeA = a.getRouteDescription();

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

@@ -1,3 +1,4 @@
+import { EventLogger } from "gd-eventlog";
 import { JsonRepository } from "../../../api";
 import { Observer } from "../../../base/types/observer";
 import { Route } from "../../base/model/route";
@@ -7,8 +8,10 @@ export declare abstract class DBLoader<T> extends Loader<T> {
     protected routeDescriptions: Array<T>;
     protected videosRepo: JsonRepository;
     protected routesRepo: JsonRepository;
+    protected logger: EventLogger;
     protected abstract loadDescriptions(): Promise<Array<T>>;
     protected abstract buildRouteDBInfo(descr: RouteInfo): T;
+    constructor();
     load(): Observer;
     stopLoad(): void;
     protected _load(): Promise<void>;

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

@@ -10,11 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DBLoader = void 0;
+const gd_eventlog_1 = require("gd-eventlog");
 const api_1 = require("../../../api");
 const observer_1 = require("../../../base/types/observer");
 const route_1 = require("../../base/model/route");
 const types_1 = require("./types");
 class DBLoader extends types_1.Loader {
+    constructor() {
+        super();
+        this.logger = new gd_eventlog_1.EventLogger('RoutesDB');
+    }
     load() {
         if (this.loadObserver)
             return this.loadObserver;

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

@@ -42,7 +42,10 @@ class RoutesApiLoader extends types_1.Loader {
                         const descr = p.value[j];
                         let description;
                         const existing = this.getDescriptionFromDB(descr.routeId || descr.id);
-                        if (existing) {
+                        const { isDeleted = false } = descr;
+                        if (existing
+                            && ((existing.version || 0) >= (descr.version || 0))
+                            && (!isDeleted || (isDeleted && existing.isDownloaded))) {
                             const details = yield this.getDetailsFromDB(existing.id);
                             if (details) {
                                 continue;
@@ -52,13 +55,21 @@ class RoutesApiLoader extends types_1.Loader {
                         else {
                             description = this.buildRouteInfo(descr);
                         }
+                        if (!description) {
+                            continue;
+                        }
                         const route = new route_1.Route(description);
                         const isComplete = this.isCompleted(route);
                         if (isComplete) {
                             this.verifyRouteHash(route);
                             this.emitRouteAdded(route);
                         }
-                        items.push({ route, added: isComplete });
+                        if (!existing) {
+                            items.push({ route, added: isComplete });
+                        }
+                        else {
+                            this.save(route, true);
+                        }
                     }
                 }
             }
@@ -142,8 +153,8 @@ class RoutesApiLoader extends types_1.Loader {
         });
     }
     buildRouteInfo(descr, isLocal) {
-        const { id, routeId, title, localizedTitle, country, distance, elevation, category, provider, video, points, previewUrl, routeHash } = descr;
-        const data = { title, localizedTitle, country, distance, elevation, provider, category, previewUrl, routeHash };
+        const { id, routeId, title, localizedTitle, country, distance, elevation, category, provider, video, points, previewUrl, routeHash, version, isDeleted } = descr;
+        const data = { title, localizedTitle, country, distance, elevation, provider, category, previewUrl, routeHash, version, isDeleted };
         data.hasVideo = false;
         data.hasGpx = false;
         data.isLocal = isLocal || false;

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

@@ -29,6 +29,7 @@ export declare class RoutesDbLoader extends DBLoader<RouteInfoDBEntry> {
     protected buildRouteDBInfo(descr: RouteInfo): RouteInfoDBEntry;
     protected loadFromLegacy(): Promise<Array<RouteInfoDBEntry>>;
     protected loadDescriptions(): Promise<Array<RouteInfoDBEntry>>;
+    protected removeDuplicates(routes: Array<RouteInfoDBEntry>): any[];
     protected loadDetailRecord(target: Route | RouteInfo): Promise<RouteApiDetail>;
     protected loadDetails(route: Route, alreadyAdded?: boolean): Promise<void>;
     protected getVideoRepo(): JsonRepository;

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

@@ -128,7 +128,7 @@ let RoutesDbLoader = (() => {
                         yield this.routesRepo.write('db', this.routeDescriptions.map(this.buildRouteDBInfo.bind(this)));
                     }
                     catch (err) {
-                        console.log(err);
+                        this.logger.logEvent({ message: 'could not safe repo', error: err.message });
                     }
                 });
                 this.saveObserver = new observer_1.PromiseObserver(save());
@@ -171,12 +171,26 @@ let RoutesDbLoader = (() => {
             return __awaiter(this, void 0, void 0, function* () {
                 const descriptions = yield this.getRoutesRepo().read('db');
                 if (descriptions) {
-                    return descriptions;
+                    const routes = descriptions;
+                    const cleaned = this.removeDuplicates(routes);
+                    return cleaned;
                 }
                 const legacy = yield this.loadFromLegacy();
                 return legacy;
             });
         }
+        removeDuplicates(routes) {
+            const ids = routes.map(r => r.legacyId || r.id);
+            const uniqueIds = ids.filter((d, pos) => ids.indexOf(d) === pos);
+            const cleaned = [];
+            uniqueIds.forEach(id => {
+                const routeWithLegacy = routes.find(r => r.legacyId === id);
+                const route = routeWithLegacy || routes.find(r => r.id === id);
+                if (route)
+                    cleaned.push(route);
+            });
+            return cleaned;
+        }
         loadDetailRecord(target) {
             return __awaiter(this, void 0, void 0, function* () {
                 const description = (target.description || target);
@@ -188,7 +202,7 @@ let RoutesDbLoader = (() => {
                     description.originalName = details.title;
                 }
                 catch (err) {
-                    console.log(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), reason: err.message, stack: err.stack });
                 }
                 if (!details) {
                     return;

package/lib/routes/list/service.js

@@ -344,6 +344,8 @@ let RouteListService = (() => {
                 const importCards = [];
                 if (!retry) {
                     files.forEach((file) => {
+                        if (!file)
+                            return;
                         const card = this.addImportCard(file);
                         importCards.push(card);
                         this.emitLists('updated');
@@ -353,6 +355,8 @@ let RouteListService = (() => {
                     importCards.push(retry);
                 }
                 files.forEach((file, idx) => __awaiter(this, void 0, void 0, function* () {
+                    if (!file)
+                        return;
                     const importCard = importCards[idx];
                     try {
                         const { data, details } = yield parsers_1.RouteParser.parse(file);
@@ -375,6 +379,7 @@ let RouteListService = (() => {
                             }
                         }
                         else {
+                            route.description.tsImported = Date.now();
                             card = new RouteCard_1.RouteCard(route, { list: this.myRoutes });
                             card.verify();
                             card.save();

package/lib/settings/user/service.js

@@ -77,13 +77,13 @@ class UserSettingsService {
         const settings = this.settings;
         const keys = key.split('.');
         if (keys.length < 2)
-            return settings[key] || defValue;
-        const retVal = (value) => (0, valid_1.valid)(value) ? (0, clone_1.default)(value) : value;
+            return (0, valid_1.valid)(settings[key]) ? settings[key] : defValue;
+        const retVal = (value, defValue) => (0, valid_1.valid)(value) ? (0, clone_1.default)(value) : defValue;
         let child = {};
         for (let index = 0; index < keys.length; index++) {
             const k = keys[index];
             if (index === keys.length - 1)
-                return retVal(child[k] || defValue);
+                return retVal(child[k], defValue);
             else {
                 child = index === 0 ? settings[k] : child[k];
                 if (child === undefined) {

package/package.json

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