diff --git a/app/sync/templates/sync/sources.html b/app/sync/templates/sync/sources.html
index 8593971..35feb69 100644
--- a/app/sync/templates/sync/sources.html
+++ b/app/sync/templates/sync/sources.html
@@ -17,10 +17,9 @@
{% for source in sources %}
- {{ source.icon|safe }} {{ source.name }}
- {{ source.get_source_type_display }}
- {{ source.get_source_profile_display }} media in a {{ source.get_output_format_display }}
- {% if source.delete_old_media and source.days_to_keep > 0 %}Delete media after {{ source.days_to_keep }} days{% endif %}
+ {{ source.icon|safe }} {{ source.name }}, {{ source.get_source_type_display }}
+ {{ source.format_summary }}
+ {{ source.media_count }} media items{% if source.delete_old_media and source.days_to_keep > 0 %}, keep {{ source.days_to_keep }} days of media{% endif %}
{% empty %}
You haven't added any sources.
diff --git a/app/sync/utils.py b/app/sync/utils.py
index 5bde56b..2e0366b 100644
--- a/app/sync/utils.py
+++ b/app/sync/utils.py
@@ -1,6 +1,9 @@
+import os
import re
+from pathlib import Path
import requests
from PIL import Image
+from django.conf import settings
from urllib.parse import urlsplit, parse_qs
from django.forms import ValidationError
@@ -54,3 +57,41 @@ def get_remote_image(url):
r = requests.get(url, headers=headers, stream=True, timeout=60)
r.raw.decode_content = True
return Image.open(r.raw)
+
+
+
+def path_is_parent(parent_path, child_path):
+ # Smooth out relative path names, note: if you are concerned about symbolic links, you should use os.path.realpath too
+ parent_path = os.path.abspath(parent_path)
+ child_path = os.path.abspath(child_path)
+
+ # Compare the common path of the parent and child path with the common path of just the parent path. Using the commonpath method on just the parent path will regularise the path name in the same way as the comparison that deals with both paths, removing any trailing path separator
+ return os.path.commonpath([parent_path]) == os.path.commonpath([parent_path, child_path])
+
+
+def file_is_editable(filepath):
+ '''
+ Checks that a file exists and the file is in an allowed predefined tuple of
+ directories we want to allow writing or deleting in.
+ '''
+ allowed_paths = (
+ # Media item thumbnails
+ os.path.commonpath([os.path.abspath(str(settings.MEDIA_ROOT))]),
+ # Downloaded video files
+ os.path.commonpath([os.path.abspath(str(settings.SYNC_VIDEO_ROOT))]),
+ # Downloaded audio files
+ os.path.commonpath([os.path.abspath(str(settings.SYNC_AUDIO_ROOT))]),
+ )
+ filepath = os.path.abspath(str(filepath))
+ if not os.path.isfile(filepath):
+ return False
+ for allowed_path in allowed_paths:
+ if allowed_path == os.path.commonpath([allowed_path, filepath]):
+ return True
+ return False
+
+
+def delete_file(filepath):
+ if file_is_editable(filepath):
+ return os.remove(filepath)
+ return False
diff --git a/app/sync/views.py b/app/sync/views.py
index 78f55af..74cc4bb 100644
--- a/app/sync/views.py
+++ b/app/sync/views.py
@@ -6,6 +6,7 @@ from django.views.generic.edit import (FormView, FormMixin, CreateView, UpdateVi
DeleteView)
from django.http import HttpResponse
from django.urls import reverse_lazy
+from django.db.models import Count
from django.forms import ValidationError
from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
@@ -52,7 +53,8 @@ class SourcesView(ListView):
return super().dispatch(request, *args, **kwargs)
def get_queryset(self):
- return Source.objects.all().order_by('name')
+ all_sources = Source.objects.all().order_by('name')
+ return all_sources.annotate(media_count=Count('media_source'))
def get_context_data(self, *args, **kwargs):
data = super().get_context_data(*args, **kwargs)
diff --git a/app/sync/youtube.py b/app/sync/youtube.py
index 0c3ac97..7857a1b 100644
--- a/app/sync/youtube.py
+++ b/app/sync/youtube.py
@@ -5,10 +5,13 @@
from django.conf import settings
+from copy import copy
+from common.logger import log
import youtube_dl
_defaults = getattr(settings, 'YOUTUBE_DEFAULTS', {})
+_defaults.update({'logger': log})
class YouTubeError(youtube_dl.utils.DownloadError):
@@ -24,8 +27,8 @@ def get_media_info(url):
or playlist this returns a dict of all the videos on the channel or playlist
as well as associated metadata.
'''
-
- opts = _defaults.update({
+ opts = copy(_defaults)
+ opts.update({
'skip_download': True,
'forcejson': True,
'simulate': True,
diff --git a/app/tubesync/settings.py b/app/tubesync/settings.py
index 77d882d..4f3b394 100644
--- a/app/tubesync/settings.py
+++ b/app/tubesync/settings.py
@@ -124,14 +124,14 @@ SOURCES_PER_PAGE = 25
MEDIA_PER_PAGE = 25
-INDEX_SOURCE_EVERY = 60 # Seconds between indexing sources, 21600 = every 6 hours
+INDEX_SOURCE_EVERY = 21600 # 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 in years to spoof the client as
+ 'age_limit': 99, # 'Age in years' to spoof
}