Skip to content

Commit b1b7cb9

Browse files
authored
Merge pull request #1392 from meeb/issue/1391/media_format
Add `MEDIA_FORMATSTR` setting
2 parents a283c17 + ce2e675 commit b1b7cb9

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

tubesync/sync/forms.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
from django import forms, VERSION as DJANGO_VERSION
3+
from django.conf import settings
34
from django.utils.translation import gettext_lazy as _
45

56
from .models import Source
@@ -29,6 +30,12 @@
2930
},
3031
)
3132

33+
def source_clean_media_format(self):
34+
data = self.cleaned_data.get('media_format', '').strip()
35+
return data or getattr(settings, 'MEDIA_FORMATSTR', settings.MEDIA_FORMATSTR_DEFAULT)
36+
37+
SourceForm.clean_media_format = source_clean_media_format
38+
3239
class ValidateSourceForm(forms.Form):
3340

3441
source_url = forms.URLField(

tubesync/sync/views.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,10 @@ def __init__(self, *args, **kwargs):
378378
super().__init__(*args, **kwargs)
379379

380380
def dispatch(self, request, *args, **kwargs):
381+
# Inject the adjustable media format default
382+
self.prepopulated_data['media_format'] = getattr(
383+
settings, 'MEDIA_FORMATSTR', settings.MEDIA_FORMATSTR_DEFAULT
384+
)
381385
source_type = request.GET.get('source_type', '')
382386
if source_type and source_type in YouTube_SourceType.values:
383387
self.prepopulated_data['source_type'] = source_type

0 commit comments

Comments
 (0)