Quick fix for unsupported marker types

Turns out there's a 'commercial' marker type for DVR content, and
MarkerBreakdown's deltaFromType is too strict and throws when this
marker type is found. Instead, just ignore unsupported marker types, and
hopefully add better handling in the future.

Also bump for 2.1.2 for a quick release

Server/Commands/QueryCommands.js

@@ -34,7 +34,10 @@ class QueryCommands {
 
         const rawMarkers = await PlexQueries.getMarkersForItems(keys);
         for (const rawMarker of rawMarkers) {
-            markers[rawMarker.parent_id].push(new MarkerData(rawMarker));
+            // TODO: better handing of non intros/credits (i.e. commercials)
+            if (MarkerType.supportedType(rawMarker.marker_type)) {
+                markers[rawMarker.parent_id].push(new MarkerData(rawMarker));
+            }
         }
 
         return markers;
@@ -196,7 +199,13 @@ class QueryCommands {
         let countCur = 0;
         // See MarkerBreakdown.js
         const bucketDelta = (markerType) => markerType == MarkerType.Intro ? 1 : (1 << 16);
+
         for (const row of rows) {
+            // TODO: better handing of non intros/credits (i.e. commercials)
+            if (!MarkerType.supportedType(row.marker_type)) {
+                continue;
+            }
+
             if (row.parent_id == idCur) {
                 if (row.tag_id == PlexQueries.markerTagId()) {
                     // See MarkerBreakdown.js

Server/MarkerCacheManager.js

@@ -1,6 +1,7 @@
 import { Log } from '../Shared/ConsoleLog.js';
 
 import MarkerBreakdown from '../Shared/MarkerBreakdown.js';
+import { MarkerType } from '../Shared/PlexTypes.js';
 
 /** @typedef {!import('./DatabaseWrapper').default} DatabaseWrapper */
 /** @typedef {!import('./PlexQueryManager').RawMarkerData} RawMarkerData */
@@ -101,6 +102,12 @@ class BaseItemNode extends MarkerNodeBase {
         // TODO: temporary. Make sure that base items only have a single "active" bucket, it doesn't
         //       make sense for a single episode/movie to have multiple buckets.
         Log.assert(this.markerBreakdown.buckets() == 1);
+        // Silently ignore unsupported marker types.
+        // TODO: better support for unsupported types (i.e. commercials)
+        if (!MarkerType.supportedType(markerData.marker_type)) {
+            return;
+        }
+
         const deltaReal = MarkerBreakdown.deltaFromType(multiplier, markerData.marker_type);
         this.markerBreakdown.delta(this.#currentKey, deltaReal);
         this.#currentKey += deltaReal;

Shared/MarkerBreakdown.js

@@ -23,7 +23,9 @@ class MarkerBreakdown {
             case MarkerType.Credits:
                 return delta << CreditsShift;
             default:
-                throw new Error(`Invalid marker type ${markerType}`);
+                // Unexpected, but just log an error and treat it as an intro.
+                Log.error(`Invalid marker type ${markerType}`);
+                return delta;
         }
     }
 

Shared/PlexTypes.js

@@ -450,6 +450,8 @@ class MovieData extends TopLevelData {
     }
 }
 
+const _supportedMarkerTypes = new Set(['intro', 'credits']);
+
 /**
  * Possible marker types
  * @enum */
@@ -458,6 +460,7 @@ const MarkerType = {
     Intro   : 'intro',
     /** @readonly */
     Credits : 'credits',
+    supportedType : (markerType) => _supportedMarkerTypes.has(markerType)
 };
 
 /**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "marker-editor-for-plex",
   "type": "module",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Add, edit, and delete Plex markers",
   "main": "app.js",
   "scripts": {