+
-
+
{% endblock %}
diff --git a/app/sync/urls.py b/app/sync/urls.py
index 818fd9b..9bc9864 100644
--- a/app/sync/urls.py
+++ b/app/sync/urls.py
@@ -1,6 +1,6 @@
from django.urls import path
from .views import (DashboardView, SourcesView, ValidateSourceView, AddSourceView,
- MediaView, TasksView, LogsView)
+ SourceView, MediaView, TasksView, LogsView)
app_name = 'sync'
@@ -24,6 +24,10 @@ urlpatterns = [
AddSourceView.as_view(),
name='add-source'),
+ path('source/
',
+ SourceView.as_view(),
+ name='source'),
+
path('media',
MediaView.as_view(),
name='media'),
diff --git a/app/sync/views.py b/app/sync/views.py
index 52cadae..1338863 100644
--- a/app/sync/views.py
+++ b/app/sync/views.py
@@ -1,5 +1,6 @@
+from django.conf import settings
from django.http import Http404
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, ListView, DetailView
from django.views.generic.edit import FormView, CreateView
from django.urls import reverse_lazy
from django.forms import ValidationError
@@ -22,16 +23,37 @@ class DashboardView(TemplateView):
return super().dispatch(request, *args, **kwargs)
-class SourcesView(TemplateView):
+class SourcesView(ListView):
'''
A bare list of the sources which have been created with their states.
'''
template_name = 'sync/sources.html'
+ context_object_name = 'sources'
+ paginate_by = settings.SOURCES_PER_PAGE
+ messages = {
+ 'source-added': _('Your new source has been added'),
+ 'source-deleted': _('Your selected source has been deleted.'),
+ 'source-updated': _('Your selected source has been updated.'),
+ }
+
+ def __init__(self, *args, **kwargs):
+ self.message = None
+ super().__init__(*args, **kwargs)
def dispatch(self, request, *args, **kwargs):
+ message_key = request.GET.get('message', '')
+ self.message = self.messages.get(message_key, '')
return super().dispatch(request, *args, **kwargs)
+ def get_queryset(self):
+ return Source.objects.all().order_by('name')
+
+ def get_context_data(self, *args, **kwargs):
+ data = super().get_context_data(*args, **kwargs)
+ data['message'] = self.message
+ return data
+
class ValidateSourceView(FormView):
'''
@@ -64,16 +86,15 @@ class ValidateSourceView(FormView):
),
Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: _(
'Enter a YouTube playlist URL into the box below. A playlist URL will be '
- 'in the format of https://www.youtube.com/watch?v=AAAAAA&list='
+ 'in the format of https://www.youtube.com/playlist?list='
'BiGLoNgUnIqUeId where BiGLoNgUnIqUeId is the '
'unique ID of the playlist you want to add.'
),
}
help_examples = {
Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'https://www.youtube.com/google',
- Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: ('https://www.youtube.com/watch?v=DcKEPl'
- '-MpLA&list=PL590L5WQmH8dpP0RyH5pCfIaDE'
- 'dt9nk7r')
+ Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: ('https://www.youtube.com/playlist?list='
+ 'PL590L5WQmH8dpP0RyH5pCfIaDEdt9nk7r')
}
validation_urls = {
Source.SOURCE_TYPE_YOUTUBE_CHANNEL: {
@@ -87,10 +108,10 @@ class ValidateSourceView(FormView):
Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: {
'scheme': 'https',
'domain': 'www.youtube.com',
- 'path_regex': '^\/watch$',
- 'qs_args': ['v', 'list'],
+ 'path_regex': '^\/playlist$',
+ 'qs_args': ['list'],
'extract_key': ('qs_args', 'list'),
- 'example': 'https://www.youtube.com/watch?v=VIDEOID&list=PLAYLISTID'
+ 'example': 'https://www.youtube.com/playlist?list=PLAYLISTID'
},
}
prepopulate_fields = {
@@ -186,7 +207,7 @@ class AddSourceView(CreateView):
self.prepopulated_data['source_type'] = source_type
key = request.GET.get('key', '')
if key:
- self.prepopulated_data['key'] = slugify(key)
+ self.prepopulated_data['key'] = key.strip()
name = request.GET.get('name', '')
if name:
self.prepopulated_data['name'] = slugify(name)
@@ -201,6 +222,16 @@ class AddSourceView(CreateView):
initial[k] = v
return initial
+ def get_success_url(self):
+ url = reverse_lazy('sync:sources')
+ return append_uri_params(url, {'message': 'source-created'})
+
+
+class SourceView(DetailView):
+
+ template_name = 'sync/source.html'
+ model = Source
+
class MediaView(TemplateView):
'''
diff --git a/app/tubesync/local_settings.py.container b/app/tubesync/local_settings.py.container
index c0fc918..af049fc 100644
--- a/app/tubesync/local_settings.py.container
+++ b/app/tubesync/local_settings.py.container
@@ -1,4 +1,9 @@
import os
+from pathlib import Path
+
+
+BASE_DIR = Path(__file__).resolve().parent.parent
+ROOT_DIR = Path('/')
SECRET_KEY = str(os.getenv('DJANGO_SECRET_KEY', ''))
@@ -12,3 +17,7 @@ DATABASES = {
'NAME': '/config/db.sqlite3',
}
}
+
+
+SYNC_VIDEO_ROOT = ROOT_DIR / 'downloads' / 'video'
+SYNC_AUDIO_ROOT = ROOT_DIR / 'downloads' / 'audio'
diff --git a/app/tubesync/settings.py b/app/tubesync/settings.py
index 79fa22c..2189fd3 100644
--- a/app/tubesync/settings.py
+++ b/app/tubesync/settings.py
@@ -98,6 +98,8 @@ STATIC_URL = '/static/'
STATIC_ROOT = BASE_DIR / 'static'
MEDIA_URL = '/media/'
MEDIA_ROOT = BASE_DIR / 'media'
+SYNC_VIDEO_ROOT = BASE_DIR / 'downloads' / 'video'
+SYNC_AUDIO_ROOT = BASE_DIR / 'downloads' / 'audio'
SASS_PROCESSOR_ROOT = STATIC_ROOT
@@ -114,6 +116,9 @@ HEALTHCHECK_ALLOWED_IPS = ('127.0.0.1',)
DJANGO_SIMPLE_TASK_WORKERS = 2
+SOURCES_PER_PAGE = 50
+
+
try:
from .local_settings import *
except ImportError as e: