From ba71665bc53250513b95e62dc4af50447df40930 Mon Sep 17 00:00:00 2001 From: j Date: Fri, 31 Jan 2025 12:36:09 +0530 Subject: [PATCH 1/2] default to single format, patents have expired. --- pandora/config.0xdb.jsonc | 2 +- pandora/config.indiancinema.jsonc | 2 +- pandora/config.padma.jsonc | 2 +- pandora/config.pandora.jsonc | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pandora/config.0xdb.jsonc b/pandora/config.0xdb.jsonc index 9170569a..0d4b1aae 100644 --- a/pandora/config.0xdb.jsonc +++ b/pandora/config.0xdb.jsonc @@ -1402,7 +1402,7 @@ 240, 288, 360, 432, 480, 720 and 1080. */ "video": { - "formats": ["webm", "mp4"], + "formats": ["mp4"], // fixme: this should be named "ratio" or "defaultRatio", // as it also applies to clip lists (on load) "previewRatio": 1.7777777778, diff --git a/pandora/config.indiancinema.jsonc b/pandora/config.indiancinema.jsonc index 1dae93b4..9c22a02f 100644 --- a/pandora/config.indiancinema.jsonc +++ b/pandora/config.indiancinema.jsonc @@ -1888,7 +1888,7 @@ 240, 288, 360, 432, 480, 720 and 1080. */ "video": { - "formats": ["webm", "mp4"], + "formats": ["mp4"], "previewRatio": 1.375, "resolutions": [240, 480] } diff --git a/pandora/config.padma.jsonc b/pandora/config.padma.jsonc index 82fe120c..a3e41988 100644 --- a/pandora/config.padma.jsonc +++ b/pandora/config.padma.jsonc @@ -1392,7 +1392,7 @@ 240, 288, 360, 432, 480, 720 and 1080. */ "video": { - "formats": ["webm", "mp4"], + "formats": ["mp4"], "previewRatio": 1.3333333333, //supported resolutions are //1080, 720, 480, 432, 360, 288, 240, 144, 96 diff --git a/pandora/config.pandora.jsonc b/pandora/config.pandora.jsonc index 5f08873f..b0a64ab4 100644 --- a/pandora/config.pandora.jsonc +++ b/pandora/config.pandora.jsonc @@ -1281,8 +1281,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution. 240, 288, 360, 432, 480, 720 and 1080. */ "video": { - "downloadFormat": "webm", - "formats": ["webm", "mp4"], + "downloadFormat": "mp4", + "formats": ["mp4"], "previewRatio": 1.3333333333, "resolutions": [240, 480] } From 194b286e30c9c33001be3107ba69bb37bb08ad80 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 6 Feb 2025 15:06:27 +0000 Subject: [PATCH 2/2] fix keys=None --- pandora/archive/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora/archive/models.py b/pandora/archive/models.py index 7423f1f3..4bbd5da1 100644 --- a/pandora/archive/models.py +++ b/pandora/archive/models.py @@ -485,7 +485,7 @@ class File(models.Model): 'wanted': self.wanted, } for key in ('folder', 'filename'): - if key in keys: + if keys and key in keys: data[key] = getattr(self, key) if error: data['error'] = error