add canPlayClips flag to annotation layers and use those layers to limit playback to clips

pandora/config.0xdb.jsonc

@@ -733,6 +733,8 @@
     Optional keys are:
         "autocomplete": Available if the layer is used as a filter
         "canAddAnnotations": Permissions per user level
+        "canPlayClips": If true, clips from this layer will play for users
+            with canPlayClips access
         "entity": ID of the referenced entity (if type is "entity")
         "hasEvents": If true, the calendar will be populated with matches from
             this layer
@@ -768,6 +770,7 @@
             "id": "subtitles",
             "title": "Subtitles",
             "canAddAnnotations": {"staff": true, "admin": true},
+            "canPlayClips": true,
             "hasEvents": true,
             "hasPlaces": true,
             "isSubtitles": true,

pandora/config.indiancinema.jsonc

@@ -752,6 +752,8 @@
     Optional keys are:
         "autocomplete": Available if the layer is used as a filter
         "canAddAnnotations": Permissions per user level
+        "canPlayClips": If true, clips from this layer will play for users
+            with canPlayClips access
         "entity": ID of the referenced entity (if type is "entity")
         "hasEvents": If true, the calendar will be populated with matches from
             this layer
@@ -778,6 +780,7 @@
             "id": "notes",
             "title": "Notes",
             "canAddAnnotations": {"member": true, "researcher": true, "staff": true, "admin": true},
+            "canPlayClips": true,
             "hasEvents": true,
             "hasPlaces": true,
             "item": "Note",
@@ -789,6 +792,7 @@
             "id": "subtitles",
             "title": "Subtitles",
             "canAddAnnotations": {"researcher": true, "staff": true, "admin": true},
+            "canPlayClips": true,
             "hasEvents": true,
             "hasPlaces": true,
             "isSubtitles": true,

pandora/config.padma.jsonc

@@ -634,6 +634,8 @@
     Optional keys are:
         "autocomplete": Available if the layer is used as a filter
         "canAddAnnotations": Permissions per user level
+        "canPlayClips": If true, clips from this layer will play for users
+            with canPlayClips access
         "entity": ID of the referenced entity (if type is "entity")
         "hasEvents": If true, the calendar will be populated with matches from
             this layer
@@ -683,6 +685,7 @@
             "id": "transcripts",
             "title": "Transcripts",
             "canAddAnnotations": {"member": true, "staff": true, "admin": true},
+            "canPlayClips": true,
             "isSubtitles": true,
             "item": "Transcript",
             "showInfo": true,

pandora/config.pandora.jsonc

@@ -573,6 +573,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
     Optional keys are:
         "autocomplete": Available if the layer is used as a filter
         "canAddAnnotations": Permissions per user level
+        "canPlayClips": If true, clips from this layer will play for users
+            with canPlayClips access
         "entity": ID of the referenced entity (if type is "entity")
         "hasEvents": If true, the calendar will be populated with matches from
             this layer
@@ -616,6 +618,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
             "id": "subtitles",
             "title": "Subtitles",
             "canAddAnnotations": {"staff": true, "admin": true},
+            "canPlayClips": true,
             "hasEvents": true,
             "hasPlaces": true,
             "isSubtitles": true,

static/js/utils.js

@@ -1948,26 +1948,41 @@ pandora.getVideoURL = function(id, resolution, part, track) {
         + pandora.getVideoURLName(id, resolution, part, track);
 };
 
-pandora.getVideoOptions = function(data) {
+pandora.getCensoredClips = function(data) {
-    var canPlayClips = data.editable
+    var annotations = [],
-            || pandora.site.capabilities.canPlayClips[pandora.user.level]
+        clips = [],
-            >= data.rightslevel,
+        last;
-        canPlayVideo = data.editable
+    pandora.site.layers.filter(function(layer) {
-            || pandora.site.capabilities.canPlayVideo[pandora.user.level]
+        return layer.canPlayClips;
-            >= data.rightslevel,
+    }).forEach(function(layer) {
-        options = {};
+        data.layers[layer.id] && data.layers[layer.id].forEach(function(annotation, i) {
-    options.subtitlesLayer = pandora.getSubtitlesLayer();
+            annotations.push(annotation)
-    options.censored = canPlayVideo ? []
+        });
-        : canPlayClips ? (
+    });
-            options.subtitlesLayer && data.layers[options.subtitlesLayer].length
+    if (annotations.length) {
-                ? data.layers[options.subtitlesLayer].map(function(subtitle, i) {
+        Ox.sort(annotations, function(clip) {
+            return clip['in'];
+        }).forEach(function(clip) {
+            if (last && last['out'] >= clip['in']) {
+                last['out'] = Math.max(last['out'], clip['out']);
+            } else {
+                last = {
+                    'in': clip['in'],
+                    out: clip.out
+                };
+                clips.push(last);
+            }
+        });
+    }
+    return clips.length
+        ? clips.map(function(clip, i) {
             return {
                 'in': i == 0 ? 0
-                            : data.layers[options.subtitlesLayer][i - 1].out,
+                    : clips[i - 1].out,
-                        out: subtitle['in']
+                out: clip['in']
             };
         }).concat([{
-                    'in': Ox.last(data.layers[options.subtitlesLayer]).out,
+            'in': Ox.last(clips).out,
             out: data.duration
         }]).filter(function(censored) {
             // don't include gaps shorter than one second
@@ -1978,8 +1993,20 @@ pandora.getVideoOptions = function(data) {
                 'in': position + 5,
                 out: Math.min(position + 60, data.duration)
             };
-                })
+        });
-        )
+};
+
+pandora.getVideoOptions = function(data) {
+    var canPlayClips = data.editable
+            || pandora.site.capabilities.canPlayClips[pandora.user.level]
+            >= data.rightslevel,
+        canPlayVideo = data.editable
+            || pandora.site.capabilities.canPlayVideo[pandora.user.level]
+            >= data.rightslevel,
+        options = {};
+    options.subtitlesLayer = pandora.getSubtitlesLayer();
+    options.censored = canPlayVideo ? []
+        : canPlayClips ? pandora.getCensoredClips(data)
             : [{'in': 0, out: data.duration}];
     options.video = [];
     pandora.site.video.resolutions.forEach(function(resolution) {