sort annotations

pandora/archive/external.py

@@ -40,8 +40,12 @@ info_key_map = {
     'display_id': 'id',
 }
 
+YT_DLP = ['yt-dlp']
+if settings.YT_DLP_EXTRA:
+    YT_DLP += settings.YT_DLP_EXTRA
+
 def get_info(url, referer=None):
-    cmd = ['yt-dlp', '-j', '--all-subs', url]
+    cmd = YT_DLP + ['-j', '--all-subs', url]
     if referer:
         cmd += ['--referer', referer]
     p = subprocess.Popen(cmd,
@@ -93,7 +97,7 @@ def add_subtitles(item, media, tmp):
                     sub.save()
 
 def load_formats(url):
-    cmd = ['yt-dlp', '-q', url, '-j', '-F']
+    cmd = YT_DLP + ['-q', url, '-j', '-F']
     p = subprocess.Popen(cmd,
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE, close_fds=True)
@@ -112,7 +116,7 @@ def download(item_id, url, referer=None):
     if isinstance(tmp, bytes):
         tmp = tmp.decode('utf-8')
     os.chdir(tmp)
-    cmd = ['yt-dlp', '-q', media['url']]
+    cmd = YT_DLP + ['-q', media['url']]
     if referer:
         cmd += ['--referer', referer]
     elif 'referer' in media:

pandora/settings.py

@@ -291,6 +291,8 @@ DATA_UPLOAD_MAX_MEMORY_SIZE = 32 * 1024 * 1024
 
 EMPTY_CLIPS = True
 
+YT_DLP_EXTRA = []
+
 #you can ignore things below this line
 #=========================================================================
 LOCAL_APPS = []

static/mobile/js/item.js

@@ -129,6 +129,7 @@ async function loadData(id, args) {
             <span class="icon">${icon.down}</span>
             ${layerData.title}
         </h3>`)
+        data.layers[layer] = sortBy(data.layers[layer], ["+in", "+created"])
         data.layers[layer].forEach(annotation => {
             if (pandora.url) {
                 annotation.value = annotation.value.replace(

static/mobile/js/utils.js

@@ -161,3 +161,33 @@ const getVideoURL = function(id, resolution, part, track, streamId) {
     return prefix + '/' + getVideoURLName(id, resolution, part, track, streamId);
 };
 
+function getSortValue(value) {
+    var getSortValue = Ox.cache(function getSortValue(value) {
+        var sortValue = value;
+        return sortValue;
+}
+
+function sortBy(array, by, map) {
+    return array.sort(function(a, b) {
+        var aValue, bValue, index = 0, key, ret = 0;
+        while (ret == 0 && index < by.length) {
+            key = by[index].key;
+            aValue = getSortValue(
+                map[key] ? map[key](a[key], a) : a[key]
+            );
+            bValue = getSortValue(
+                map[key] ? map[key](b[key], b) : b[key]
+            );
+            if ((aValue === null) != (bValue === null)) {
+                ret = aValue === null ? 1 : -1;
+            } else if (aValue < bValue) {
+                ret = by[index].operator == '+' ? -1 : 1;
+            } else if (aValue > bValue) {
+                ret = by[index].operator == '+' ? 1 : -1;
+            } else {
+                index++;
+            }
+        }
+        return ret;
+    });
+}