diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4ed3a9935c5fe3f9afae84d6cb4f79068d05c95e..6d0424f22439b9ce695c2230c2bf5654cbb44841 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -48,7 +48,7 @@ repos: - name: Check for uncreated migrations. id: migrations-check language: system - entry: sh -c "src/manage.py makemigrations --check --dry-run" + entry: sh -c "pdm manage makemigrations --check --dry-run" files: "models/.*.py$" types: - python diff --git a/src/core/models/schedules.py b/src/core/models/schedules.py index 3e394cb9cfd7e64251ac33efe66eb9f6cef601fa..88caa2d7e5782c429d0f832bfdaeefc1eed1d8e5 100644 --- a/src/core/models/schedules.py +++ b/src/core/models/schedules.py @@ -473,6 +473,7 @@ class ScheduleSource(models.Model): """ # for the source id use the provided id, uuid or guid field (in order) + # TODO move id to end speaker_id = speaker_info.get('id') or speaker_info.get('uuid') or speaker_info.get('guid') # sanity check: verify that required attributes are present diff --git a/src/core/schedules/schedulejson.py b/src/core/schedules/schedulejson.py index 8af6a9b099765aa0c71be7f7dac1c0af81d08658..1d757d61d9c94f91621779df7a963b891888cbc9 100644 --- a/src/core/schedules/schedulejson.py +++ b/src/core/schedules/schedulejson.py @@ -15,12 +15,14 @@ class ScheduleJSONSupport(BaseScheduleSupport): identifier = 'schedule-json' readonly = True + # fmt: off configuration_fields = { # 'key': (type, default value, mandatory, translation text) 'feedback': ('bool', True, False, 'Enable/Disable feedback url generation'), 'kind': ('string', 'assembly', False, 'kind of events, either "assembly" or "official" or "sos" or "lightning"'), 'headers': ('dict', {}, False, 'HTTP headers to send with the request e.g. Authorization'), } + # fmt: on def ready(self): r = s.head(self.remote_url) diff --git a/src/core/schedules/schedulejsonfrab.py b/src/core/schedules/schedulejsonfrab.py index 5af35f9cc06edd54b62fa52197ab9b63d657424e..642daea7faf829aef31013e203a92f204d39d08c 100644 --- a/src/core/schedules/schedulejsonfrab.py +++ b/src/core/schedules/schedulejsonfrab.py @@ -19,13 +19,15 @@ class ScheduleJSONFrabSupport(ScheduleJSONSupport): identifier = 'schedule-json-frab' readonly = True + # fmt: off configuration_fields = { - 'feedback': ('bool', True, False, 'Enable/Disable feedback url generation'), - 'kind': ('string', 'assembly', False, 'kind of events, either "assembly" or "official" or "sos" or "lightning"'), + 'feedback': ('bool', True, False, 'Enable/Disable feedback url generation'), + 'kind': ('string', 'assembly', False, 'kind of events, either "assembly" or "official" or "sos" or "lightning"'), 'images_base_url': (['bool', 'str'], False, False, 'Use image urls from origin instead of hub'), - 'host': ('string', 'https://frab.cccv.de/', False, 'overwrite Base URL of the schedule, used for feedback page, images, etc.'), - 'auth': ('string', None, False, 'login data for frab instance, format: user:password'), + 'host': ('string', 'https://frab.cccv.de/', False, 'overwrite Base URL of the schedule, used for feedback page, images, etc.'), + 'auth': ('string', None, False, 'login data for frab instance, format: user:password'), } + # fmt: on origin_base_url = None