- media
+{% include 'infobox.html' with message=message %}
+',
+ MediaThumbView.as_view(),
+ name='media-thumb'),
+
+ path('media-item/',
+ MediaItemView.as_view(),
+ name='media-item'),
+
# Task URLs
path('tasks',
diff --git a/app/sync/utils.py b/app/sync/utils.py
index 3fec18e..5bde56b 100644
--- a/app/sync/utils.py
+++ b/app/sync/utils.py
@@ -1,4 +1,6 @@
import re
+import requests
+from PIL import Image
from urllib.parse import urlsplit, parse_qs
from django.forms import ValidationError
@@ -42,3 +44,13 @@ def validate_url(url, validator):
elif extract_from == 'qs_args':
extract_value = url_query_parts[extract_param][0]
return extract_value
+
+
+def get_remote_image(url):
+ headers = {
+ 'user-agent': ('Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 '
+ '(KHTML, like Gecko) Chrome/69.0.3497.64 Safari/537.36')
+ }
+ r = requests.get(url, headers=headers, stream=True, timeout=60)
+ r.raw.decode_content = True
+ return Image.open(r.raw)
diff --git a/app/sync/views.py b/app/sync/views.py
index 8fabbbe..78f55af 100644
--- a/app/sync/views.py
+++ b/app/sync/views.py
@@ -1,16 +1,19 @@
+from base64 import b64decode
from django.conf import settings
from django.http import Http404
from django.views.generic import TemplateView, ListView, DetailView
from django.views.generic.edit import (FormView, FormMixin, CreateView, UpdateView,
DeleteView)
+from django.http import HttpResponse
from django.urls import reverse_lazy
from django.forms import ValidationError
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
from common.utils import append_uri_params
-from .models import Source
+from .models import Source, Media
from .forms import ValidateSourceForm, ConfirmDeleteSourceForm
from .utils import validate_url
+from . import signals
from . import youtube
@@ -196,8 +199,8 @@ class AddSourceView(CreateView):
template_name = 'sync/source-add.html'
model = Source
fields = ('source_type', 'key', 'name', 'directory', 'delete_old_media',
- 'days_to_keep', 'source_profile', 'prefer_60fps', 'prefer_hdr',
- 'output_format', 'fallback')
+ 'days_to_keep', 'source_resolution', 'source_vcodec', 'source_acodec',
+ 'prefer_60fps', 'prefer_hdr', 'fallback')
def __init__(self, *args, **kwargs):
self.prepopulated_data = {}
@@ -240,8 +243,8 @@ class UpdateSourceView(UpdateView):
template_name = 'sync/source-update.html'
model = Source
fields = ('source_type', 'key', 'name', 'directory', 'delete_old_media',
- 'days_to_keep', 'source_profile', 'prefer_60fps', 'prefer_hdr',
- 'output_format', 'fallback')
+ 'days_to_keep', 'source_resolution', 'source_vcodec', 'source_acodec',
+ 'prefer_60fps', 'prefer_hdr', 'fallback')
def get_success_url(self):
url = reverse_lazy('sync:sources')
@@ -272,16 +275,76 @@ class DeleteSourceView(DeleteView, FormMixin):
return append_uri_params(url, {'message': 'source-deleted'})
-class MediaView(TemplateView):
+class MediaView(ListView):
'''
A bare list of media added with their states.
'''
template_name = 'sync/media.html'
+ context_object_name = 'media'
+ paginate_by = settings.MEDIA_PER_PAGE
+ messages = {
+ 'filter': _('Viewing media for source: {name}'),
+ }
+
+ def __init__(self, *args, **kwargs):
+ self.filter_source = None
+ super().__init__(*args, **kwargs)
def dispatch(self, request, *args, **kwargs):
+ filter_by = request.GET.get('filter', '')
+ if filter_by:
+ try:
+ self.filter_source = Source.objects.get(pk=filter_by)
+ except Source.DoesNotExist:
+ self.filter_source = None
return super().dispatch(request, *args, **kwargs)
+ def get_queryset(self):
+ if self.filter_source:
+ return Media.objects.filter(source=self.filter_source).order_by('-created')
+ else:
+ return Media.objects.all().order_by('-created')
+
+ def get_context_data(self, *args, **kwargs):
+ data = super().get_context_data(*args, **kwargs)
+ data['message'] = ''
+ data['source'] = None
+ if self.filter_source:
+ message = str(self.messages.get('filter', ''))
+ print(message)
+ data['message'] = message.format(name=self.filter_source.name)
+ data['source'] = self.filter_source
+ print(data)
+ return data
+
+
+class MediaThumbView(DetailView):
+ '''
+ Shows a media thumbnail. Whitenose doesn't support post-start media image
+ serving and the images here are pretty small, just serve them manually. This
+ isn't fast, but it's not likely to be a serious bottleneck.
+ '''
+
+ model = Media
+
+ def get(self, request, *args, **kwargs):
+ media = self.get_object()
+ if media.thumb:
+ thumb = open(media.thumb.path, 'rb').read()
+ content_type = 'image/jpeg'
+ else:
+ thumb = b64decode('R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAA'
+ 'AAAABAAEAAAICTAEAOw==')
+ content_type = 'image/gif'
+ return HttpResponse(thumb, content_type=content_type)
+
+
+class MediaItemView(DetailView):
+
+ template_name = 'sync/media-item.html'
+ model = Media
+
class TasksView(TemplateView):
'''
diff --git a/app/sync/youtube.py b/app/sync/youtube.py
index 27de315..0c3ac97 100644
--- a/app/sync/youtube.py
+++ b/app/sync/youtube.py
@@ -15,22 +15,20 @@ class YouTubeError(youtube_dl.utils.DownloadError):
'''
Generic wrapped error for all errors that could be raised by youtube-dl.
'''
-
pass
-def extract_info(url):
+def get_media_info(url):
'''
Extracts information from a YouTube URL and returns it as a dict. For a channel
or playlist this returns a dict of all the videos on the channel or playlist
as well as associated metadata.
'''
+
opts = _defaults.update({
'skip_download': True,
'forcejson': True,
'simulate': True,
- 'extract_flat': 'in_playlist',
- 'playlist_items': 1,
})
response = {}
with youtube_dl.YoutubeDL(opts) as y:
diff --git a/app/tubesync/settings.py b/app/tubesync/settings.py
index e657aeb..77d882d 100644
--- a/app/tubesync/settings.py
+++ b/app/tubesync/settings.py
@@ -96,7 +96,7 @@ USE_TZ = True
STATIC_URL = '/static/'
STATIC_ROOT = BASE_DIR / 'static'
-MEDIA_URL = '/media/'
+#MEDIA_URL = '/media/'
MEDIA_ROOT = BASE_DIR / 'media'
SYNC_VIDEO_ROOT = BASE_DIR / 'downloads' / 'video'
SYNC_AUDIO_ROOT = BASE_DIR / 'downloads' / 'audio'
@@ -121,10 +121,17 @@ BACKGROUND_TASK_PRIORITY_ORDERING = 'DESC' # Process high priority tasks first
SOURCES_PER_PAGE = 25
+MEDIA_PER_PAGE = 25
+
+
+INDEX_SOURCE_EVERY = 60 # Seconds between indexing sources, 21600 = every 6 hours
+
+
+MAX_MEDIA_THUMBNAIL_SIZE = (320, 240) # Max size in pixels for media thumbnails
YOUTUBE_DEFAULTS = {
- 'age_limit': 99,
+ 'age_limit': 99, # Age in years to spoof the client as
}
+ {% for m in media %}
+
+ {% empty %}
+
+{% include 'pagination.html' with pagination=sources.paginator %}
{% endblock %}
diff --git a/app/sync/urls.py b/app/sync/urls.py
index d6ee938..d60386a 100644
--- a/app/sync/urls.py
+++ b/app/sync/urls.py
@@ -1,7 +1,7 @@
from django.urls import path
from .views import (DashboardView, SourcesView, ValidateSourceView, AddSourceView,
SourceView, UpdateSourceView, DeleteSourceView, MediaView,
- TasksView, LogsView)
+ MediaThumbView, MediaItemView, TasksView, LogsView)
app_name = 'sync'
@@ -41,12 +41,20 @@ urlpatterns = [
DeleteSourceView.as_view(),
name='delete-source'),
- # Media URLs (note /media/ is the static media URL, don't use that)
+ # Media URLs
- path('mediafiles',
+ path('media',
MediaView.as_view(),
name='media'),
+ path('media-thumb/
+
+
+ {% endfor %}
+ No media has been indexed.
+
+