incyclist-services 1.7.53 → 1.7.54

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

@@ -325,6 +325,7 @@ let RouteLibraryScannerService = (() => {
             return {
                 folderUri,
                 folderName,
+                files: folderFiles,
                 controlFileUri: controlFile.uri,
                 format: ext,
                 scanError: skipReason
@@ -365,7 +366,7 @@ let RouteLibraryScannerService = (() => {
                     throw new Error(`Could not parse: [${err.message}]`);
                 }
                 if (result.data.hasVideo) {
-                    this.validateVideoUrl(result.details, target.folderUri);
+                    this.validateVideoUrl(result.details, target.folderUri, target.files);
                 }
                 observer.emit('parse-result', {
                     alreadyImported: false,
@@ -386,14 +387,14 @@ let RouteLibraryScannerService = (() => {
                 });
             }
         }
-        validateVideoUrl(routeDetail, folderUri) {
+        validateVideoUrl(routeDetail, folderUri, folderFiles) {
             if (this.isMobile()) {
                 if (routeDetail.video.format === 'avi') {
                     throw new Error('AVI video not supported');
                 }
             }
             if (routeDetail.video.file) {
-                routeDetail.video.file = this.resolveVideoUri(routeDetail.video.file, folderUri);
+                routeDetail.video.file = this.resolveVideoUri(routeDetail.video.file, folderUri, folderFiles);
             }
         }
         async _ingest(routes, observer) {
@@ -425,7 +426,7 @@ let RouteLibraryScannerService = (() => {
             const skipped = routes.length - target.length;
             observer.emit('ingest-complete', { imported: importedRoutes.length, skipped, errors, failedRoutes, importedRoutes });
         }
-        resolveVideoUri(videoRef, folderUri) {
+        resolveVideoUri(videoRef, folderUri, folderFiles) {
             if (videoRef.startsWith('http://') || videoRef.startsWith('https://')) {
                 return videoRef;
             }
@@ -434,10 +435,13 @@ let RouteLibraryScannerService = (() => {
             }
             if (videoRef.startsWith('/') || /^[A-Za-z]:[/\\]/.test(videoRef)) {
                 if (this.isMobile())
-                    throw new Error('Absolute video path references are not supported during ingest');
+                    throw new Error('Absolute video path references are not supported');
                 return videoRef;
             }
-            return `${folderUri}/${videoRef}`;
+            const match = folderFiles.find(f => f.name.toLowerCase() === videoRef.toLowerCase());
+            if (!match)
+                throw new Error(`Video file not found in folder: ${videoRef}`);
+            return match.uri;
         }
         async upsertImportHistory(folderInfo, routeCount) {
             try {
@@ -489,7 +493,7 @@ let RouteLibraryScannerService = (() => {
                 distance,
                 label: route.title,
                 alreadyImported,
-                importable: parseError != null,
+                importable: parseError == null,
                 format,
                 errorReason: parseError
             };
@@ -508,13 +512,6 @@ let RouteLibraryScannerService = (() => {
             const dot = filename.lastIndexOf('.');
             return dot >= 0 ? filename.slice(dot + 1).toLowerCase() : '';
         }
-        containsAbsolutePath(content) {
-            if (/[>"']\//m.test(content))
-                return true;
-            if (/[A-Za-z]:[/\\]/m.test(content))
-                return true;
-            return false;
-        }
         isMobile() {
             return this.getBindings()?.appInfo?.getChannel() === 'mobile';
         }

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

@@ -322,6 +322,7 @@ let RouteLibraryScannerService = (() => {
             return {
                 folderUri,
                 folderName,
+                files: folderFiles,
                 controlFileUri: controlFile.uri,
                 format: ext,
                 scanError: skipReason
@@ -362,7 +363,7 @@ let RouteLibraryScannerService = (() => {
                     throw new Error(`Could not parse: [${err.message}]`);
                 }
                 if (result.data.hasVideo) {
-                    this.validateVideoUrl(result.details, target.folderUri);
+                    this.validateVideoUrl(result.details, target.folderUri, target.files);
                 }
                 observer.emit('parse-result', {
                     alreadyImported: false,
@@ -383,14 +384,14 @@ let RouteLibraryScannerService = (() => {
                 });
             }
         }
-        validateVideoUrl(routeDetail, folderUri) {
+        validateVideoUrl(routeDetail, folderUri, folderFiles) {
             if (this.isMobile()) {
                 if (routeDetail.video.format === 'avi') {
                     throw new Error('AVI video not supported');
                 }
             }
             if (routeDetail.video.file) {
-                routeDetail.video.file = this.resolveVideoUri(routeDetail.video.file, folderUri);
+                routeDetail.video.file = this.resolveVideoUri(routeDetail.video.file, folderUri, folderFiles);
             }
         }
         async _ingest(routes, observer) {
@@ -422,7 +423,7 @@ let RouteLibraryScannerService = (() => {
             const skipped = routes.length - target.length;
             observer.emit('ingest-complete', { imported: importedRoutes.length, skipped, errors, failedRoutes, importedRoutes });
         }
-        resolveVideoUri(videoRef, folderUri) {
+        resolveVideoUri(videoRef, folderUri, folderFiles) {
             if (videoRef.startsWith('http://') || videoRef.startsWith('https://')) {
                 return videoRef;
             }
@@ -431,10 +432,13 @@ let RouteLibraryScannerService = (() => {
             }
             if (videoRef.startsWith('/') || /^[A-Za-z]:[/\\]/.test(videoRef)) {
                 if (this.isMobile())
-                    throw new Error('Absolute video path references are not supported during ingest');
+                    throw new Error('Absolute video path references are not supported');
                 return videoRef;
             }
-            return `${folderUri}/${videoRef}`;
+            const match = folderFiles.find(f => f.name.toLowerCase() === videoRef.toLowerCase());
+            if (!match)
+                throw new Error(`Video file not found in folder: ${videoRef}`);
+            return match.uri;
         }
         async upsertImportHistory(folderInfo, routeCount) {
             try {
@@ -486,7 +490,7 @@ let RouteLibraryScannerService = (() => {
                 distance,
                 label: route.title,
                 alreadyImported,
-                importable: parseError != null,
+                importable: parseError == null,
                 format,
                 errorReason: parseError
             };
@@ -505,13 +509,6 @@ let RouteLibraryScannerService = (() => {
             const dot = filename.lastIndexOf('.');
             return dot >= 0 ? filename.slice(dot + 1).toLowerCase() : '';
         }
-        containsAbsolutePath(content) {
-            if (/[>"']\//m.test(content))
-                return true;
-            if (/[A-Za-z]:[/\\]/m.test(content))
-                return true;
-            return false;
-        }
         isMobile() {
             return this.getBindings()?.appInfo?.getChannel() === 'mobile';
         }

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

@@ -32,7 +32,6 @@ export declare class RouteLibraryScannerService extends IncyclistService {
     private buildRouteDisplayItem;
     private getCompanionExts;
     private getExtension;
-    private containsAbsolutePath;
     private isMobile;
     protected getRouteList(): import("../list/service").RouteListService;
     protected getBindings(): import("../../api").IncyclistBindings;

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

@@ -1,3 +1,4 @@
+import { ReadDirResult } from "../../api";
 import { FormattedNumber } from "../../i18n";
 import { Route } from "../base/model/route";
 export interface FolderInfo {
@@ -10,6 +11,7 @@ export interface ScannedRoute {
     folderName: string;
     format: RouteFormat;
     scanError?: string;
+    files: ReadDirResult[];
 }
 export type RouteFormat = string;
 export interface ParsedRoute {

package/package.json

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