bump to 0.6

Dockerfile

@@ -13,7 +13,8 @@ ENV DEBIAN_FRONTEND="noninteractive" \
     S6_EXPECTED_SHA256="52460473413601ff7a84ae690b161a074217ddc734990c2cdee9847166cf669e" \
     S6_DOWNLOAD="https://github.com/just-containers/s6-overlay/releases/download/v${S6_VERSION}/s6-overlay-${ARCH}.tar.gz" \
     FFMPEG_EXPECTED_SHA256="47d95c0129fba27d051748a442a44a73ce1bd38d1e3f9fe1e9dd7258c7581fa5" \
-    FFMPEG_DOWNLOAD="https://johnvansickle.com/ffmpeg/releases/ffmpeg-${FFMPEG_VERSION}-${ARCH}-static.tar.xz"
+    FFMPEG_DOWNLOAD="https://tubesync.sfo2.digitaloceanspaces.com/ffmpeg-${FFMPEG_VERSION}-${ARCH}-static.tar.xz"
+
 
 # Install third party software
 RUN set -x && \

README.md

@@ -1,6 +1,6 @@
 # TubeSync
 
-**This is a preview release of TubeSync, it may contain the bugs but should be usable**
+**This is a preview release of TubeSync, it may contain bugs but should be usable**
 
 TubeSync is a PVR (personal video recorder) for YouTube. Or, like Sonarr but for
 YouTube (with a built-in download client). It is designed to synchronize channels and
@@ -18,27 +18,34 @@ hands-free as possible, TubeSync has gradual retrying of failures with back-off
 so media which fails to download will be retried for an extended period making it,
 hopefully, quite reliable.
 
+
+# Latest container image
+
+```yaml
+ghcr.io/meeb/tubesync:v0.6
+```
+
 # Screenshots
 
 ### Dashboard
 
-![TubeSync Dashboard](https://github.com/meeb/tubesync/blob/main/docs/dashboard.png?raw=true)
+![TubeSync Dashboard](https://github.com/meeb/tubesync/blob/main/docs/dashboard-v0.5.png?raw=true)
 
 ### Sources overview
 
-![TubeSync sources overview](https://github.com/meeb/tubesync/blob/main/docs/sources.png?raw=true)
+![TubeSync sources overview](https://github.com/meeb/tubesync/blob/main/docs/sources-v0.5.png?raw=true)
 
 ### Source details
 
-![TubeSync source details](https://github.com/meeb/tubesync/blob/main/docs/source.png?raw=true)
+![TubeSync source details](https://github.com/meeb/tubesync/blob/main/docs/source-v0.5.png?raw=true)
 
 ### Media overview
 
-![TubeSync media overview](https://github.com/meeb/tubesync/blob/main/docs/media.png?raw=true)
+![TubeSync media overview](https://github.com/meeb/tubesync/blob/main/docs/media-v0.5.png?raw=true)
 
 ### Media details
 
-![TubeSync media-details](https://github.com/meeb/tubesync/blob/main/docs/media-item.png?raw=true)
+![TubeSync media-details](https://github.com/meeb/tubesync/blob/main/docs/media-item-v0.5.png?raw=true)
 
 
 # Requirements
@@ -92,7 +99,7 @@ Finally, download and run the container:
 
 ```bash
 # Pull a versioned image
-$ docker pull ghcr.io/meeb/tubesync:v0.3
+$ docker pull ghcr.io/meeb/tubesync:v0.6
 # Start the container using your user ID and group ID
 $ docker run \
   -d \
@@ -103,7 +110,7 @@ $ docker run \
   -v /some/directory/tubesync-config:/config \
   -v /some/directory/tubesync-downloads:/downloads \
   -p 4848:4848 \
-  ghcr.io/meeb/tubesync:v0.3
+  ghcr.io/meeb/tubesync:v0.6
 ```
 
 Once running, open `http://localhost:4848` in your browser and you should see the
@@ -115,7 +122,7 @@ Alternatively, for Docker Compose, you can use something like:
 
 ```yaml
   tubesync:
-    image: ghcr.io/meeb/tubesync:v0.3
+    image: ghcr.io/meeb/tubesync:v0.6
     container_name: tubesync
     restart: unless-stopped
     ports:
@@ -124,7 +131,7 @@ Alternatively, for Docker Compose, you can use something like:
       - /some/directory/tubesync-config:/config
       - /some/directory/tubesync-downloads:/downloads
     environment:
-      - TZ=$TIMEZONE
+      - TZ=Europe/London
       - PUID=1000
       - PGID=1000
 ```
@@ -134,7 +141,7 @@ Alternatively, for Docker Compose, you can use something like:
 To update, you can just pull a new version of the container image as they are released.
 
 ```bash
-$ docker pull pull ghcr.io/meeb/tubesync:v[number]
+$ docker pull ghcr.io/meeb/tubesync:v[number]
 ```
 
 Back-end updates such as database migrations should be automatic.
@@ -190,10 +197,10 @@ $ docker logs --follow tubesync
 
 ### 1. Index frequency
 
-It's a good idea to add sources with as low an index frequency as possible. This is the
+It's a good idea to add sources with as long of an index frequency as possible. This is
-duration between indexes of the source. An index is when TubeSync checks to see
+the duration between indexes of the source. An index is when TubeSync checks to see
 what videos available on a channel or playlist to find new media. Try and keep this as
-long as possible, 24 hours if possible.
+long as possible, up to 24 hours.
 
 
 ### 2. Indexing massive channels
@@ -216,7 +223,7 @@ automatically.
 
 ### Does TubeSync support any other video platforms?
 
-At the moment, no. This is a first release. The library TubeSync uses that does most
+At the moment, no. This is a pre-release. The library TubeSync uses that does most
 of the downloading work, `youtube-dl`, supports many hundreds of video sources so it's
 likely more will be added to TubeSync if there is demand for it.
 
@@ -230,7 +237,7 @@ your install is doing check the container logs.
 ### Are there alerts when a download is complete?
 
 No, this feature is best served by existing services such as the execelent
-[tautulli](https://tautulli.com/) which can monitor your Plex server and send alerts
+[Tautulli](https://tautulli.com/) which can monitor your Plex server and send alerts
 that way.
 
 ### There's errors in my "tasks" tab!
@@ -287,23 +294,24 @@ Just `amd64` for the moment. Others may be made available if there is demand.
 # Advanced configuration
 
 There are a number of other environment variables you can set. These are, mostly,
-**NOT** required to be set in the default container installation, they are mostly
+**NOT** required to be set in the default container installation, they are really only
 useful if you are manually installing TubeSync in some other environment. These are:
 
-| Name              | What                                  | Example                            |
+| Name                     | What                                  | Example                            |
-| ----------------- | ------------------------------------- | ---------------------------------- |
+| ------------------------ | ------------------------------------- | ---------------------------------- |
-| DJANGO_SECRET_KEY | Django secret key                     | YJySXnQLB7UVZw2dXKDWxI5lEZaImK6l   |
+| DJANGO_SECRET_KEY        | Django's SECRET_KEY                   | YJySXnQLB7UVZw2dXKDWxI5lEZaImK6l   |
-| TUBESYNC_DEBUG    | Enable debugging                      | True                               |
+| DJANGO_FORCE_SCRIPT_NAME | Django's FORCE_SCRIPT_NAME            | /somepath                          |
-| TUBESYNC_HOSTS    | Django's ALLOWED_HOSTS                | tubesync.example.com,otherhost.com |
+| TUBESYNC_DEBUG           | Enable debugging                      | True                               |
-| GUNICORN_WORKERS  | Number of gunicorn workers to spawn   | 3                                  |
+| TUBESYNC_HOSTS           | Django's ALLOWED_HOSTS                | tubesync.example.com,otherhost.com |
-| LISTEN_HOST       | IP address for gunicorn to listen on  | 127.0.0.1                          |
+| GUNICORN_WORKERS         | Number of gunicorn workers to spawn   | 3                                  |
-| LISTEN_PORT       | Port number for gunicorn to listen on | 8080                               |
+| LISTEN_HOST              | IP address for gunicorn to listen on  | 127.0.0.1                          |
+| LISTEN_PORT              | Port number for gunicorn to listen on | 8080                               |
 
 
 # Manual, non-containerised, installation
 
 As a relatively normal Django app you can run TubeSync without the container. Beyond
-the following rough guide you are on your own and should be knowledgeable about
+following this rough guide you are on your own and should be knowledgeable about
 installing and running WSGI-based Python web applications before attempting this.
 
 1. Clone or download this repo

tubesync/sync/management/commands/youtube-dl-info.py

@@ -0,0 +1,18 @@
+import json
+from django.core.management.base import BaseCommand, CommandError
+from sync.youtube import get_media_info
+
+
+class Command(BaseCommand):
+
+    help = 'Displays information obtained by youtube-dl in JSON to the console'
+
+    def add_arguments(self, parser):
+        parser.add_argument('url', type=str)
+
+    def handle(self, *args, **options):
+        url = options['url']
+        self.stdout.write(f'Showing information for URL: {url}')
+        info = get_media_info(url)
+        self.stdout.write(json.dumps(info, indent=4, sort_keys=True))
+        self.stdout.write('Done')

tubesync/sync/migrations/0003_source_copy_thumbnails.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2020-12-18 01:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sync', '0002_auto_20201213_0817'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='source',
+            name='copy_thumbnails',
+            field=models.BooleanField(default=False, help_text='Copy thumbnails with the media, these may be detected and used by some media servers', verbose_name='copy thumbnails'),
+        ),
+    ]

tubesync/sync/migrations/0004_source_media_format.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2020-12-18 01:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sync', '0003_source_copy_thumbnails'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='source',
+            name='media_format',
+            field=models.CharField(default='{yyyymmdd}_{source}_{title}_{key}_{format}.{ext}', help_text='File format to use for saving files', max_length=200, verbose_name='media format'),
+        ),
+    ]

tubesync/sync/migrations/0005_auto_20201219_0312.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2020-12-19 03:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sync', '0004_source_media_format'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='source',
+            name='source_type',
+            field=models.CharField(choices=[('c', 'YouTube channel'), ('i', 'YouTube channel by ID'), ('p', 'YouTube playlist')], db_index=True, default='c', help_text='Source type', max_length=1, verbose_name='source type'),
+        ),
+    ]

tubesync/sync/migrations/0006_source_write_nfo.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2020-12-19 03:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sync', '0005_auto_20201219_0312'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='source',
+            name='write_nfo',
+            field=models.BooleanField(default=False, help_text='Write an NFO file with the media, these may be detected and used by some media servers', verbose_name='write nfo'),
+        ),
+    ]

tubesync/sync/migrations/0007_auto_20201219_0645.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2020-12-19 06:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sync', '0006_source_write_nfo'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='source',
+            name='write_nfo',
+            field=models.BooleanField(default=False, help_text='Write an NFO file in XML with the media info, these may be detected and used by some media servers', verbose_name='write nfo'),
+        ),
+    ]

tubesync/sync/migrations/0008_source_download_cap.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.4 on 2020-12-19 06:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sync', '0007_auto_20201219_0645'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='source',
+            name='download_cap',
+            field=models.IntegerField(choices=[(0, 'No cap'), (604800, '1 week (7 days)'), (2592000, '1 month (30 days)'), (7776000, '3 months (90 days)'), (15552000, '6 months (180 days)'), (31536000, '1 year (365 days)'), (63072000, '2 years (730 days)'), (94608000, '3 years (1095 days)'), (157680000, '5 years (1825 days)'), (315360000, '10 years (3650 days)')], default=0, help_text='Do not download media older than this capped date', verbose_name='download cap'),
+        ),
+    ]

tubesync/sync/models.py

@@ -1,12 +1,15 @@
 import os
 import uuid
 import json
-from datetime import datetime
+from xml.etree import ElementTree
+from collections import OrderedDict
+from datetime import datetime, timedelta
 from pathlib import Path
 from django.conf import settings
 from django.db import models
 from django.core.files.storage import FileSystemStorage
 from django.utils.text import slugify
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from common.errors import NoFormatException
 from .youtube import (get_media_info as get_youtube_media_info,
@@ -27,10 +30,13 @@ class Source(models.Model):
     '''
 
     SOURCE_TYPE_YOUTUBE_CHANNEL = 'c'
+    SOURCE_TYPE_YOUTUBE_CHANNEL_ID = 'i'
     SOURCE_TYPE_YOUTUBE_PLAYLIST = 'p'
-    SOURCE_TYPES = (SOURCE_TYPE_YOUTUBE_CHANNEL, SOURCE_TYPE_YOUTUBE_PLAYLIST)
+    SOURCE_TYPES = (SOURCE_TYPE_YOUTUBE_CHANNEL, SOURCE_TYPE_YOUTUBE_CHANNEL_ID,
+                    SOURCE_TYPE_YOUTUBE_PLAYLIST)
     SOURCE_TYPE_CHOICES = (
         (SOURCE_TYPE_YOUTUBE_CHANNEL, _('YouTube channel')),
+        (SOURCE_TYPE_YOUTUBE_CHANNEL_ID, _('YouTube channel by ID')),
         (SOURCE_TYPE_YOUTUBE_PLAYLIST, _('YouTube playlist')),
     )
 
@@ -97,24 +103,40 @@ class Source(models.Model):
     # Fontawesome icons used for the source on the front end
     ICONS = {
         SOURCE_TYPE_YOUTUBE_CHANNEL: '<i class="fab fa-youtube"></i>',
+        SOURCE_TYPE_YOUTUBE_CHANNEL_ID: '<i class="fab fa-youtube"></i>',
         SOURCE_TYPE_YOUTUBE_PLAYLIST: '<i class="fab fa-youtube"></i>',
     }
     # Format to use to display a URL for the source
     URLS = {
         SOURCE_TYPE_YOUTUBE_CHANNEL: 'https://www.youtube.com/c/{key}',
+        SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'https://www.youtube.com/channel/{key}',
         SOURCE_TYPE_YOUTUBE_PLAYLIST: 'https://www.youtube.com/playlist?list={key}',
     }
     # Callback functions to get a list of media from the source
     INDEXERS = {
         SOURCE_TYPE_YOUTUBE_CHANNEL: get_youtube_media_info,
+        SOURCE_TYPE_YOUTUBE_CHANNEL_ID: get_youtube_media_info,
         SOURCE_TYPE_YOUTUBE_PLAYLIST: get_youtube_media_info,
     }
     # Field names to find the media ID used as the key when storing media
     KEY_FIELD = {
         SOURCE_TYPE_YOUTUBE_CHANNEL: 'id',
+        SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'id',
         SOURCE_TYPE_YOUTUBE_PLAYLIST: 'id',
     }
 
+    class CapChoices(models.IntegerChoices):
+        CAP_NOCAP = 0, _('No cap')
+        CAP_7DAYS = 604800, _('1 week (7 days)')
+        CAP_30DAYS = 2592000, _('1 month (30 days)')
+        CAP_90DAYS = 7776000, _('3 months (90 days)')
+        CAP_6MONTHS = 15552000, _('6 months (180 days)')
+        CAP_1YEAR = 31536000, _('1 year (365 days)')
+        CAP_2YEARs = 63072000, _('2 years (730 days)')
+        CAP_3YEARs = 94608000, _('3 years (1095 days)')
+        CAP_5YEARs = 157680000, _('5 years (1825 days)')
+        CAP_10YEARS = 315360000, _('10 years (3650 days)')
+
     class IndexSchedule(models.IntegerChoices):
         EVERY_HOUR = 3600, _('Every hour')
         EVERY_2_HOURS = 7200, _('Every 2 hours')
@@ -174,6 +196,12 @@ class Source(models.Model):
         unique=True,
         help_text=_('Directory name to save the media into')
     )
+    media_format = models.CharField(
+        _('media format'),
+        max_length=200,
+        default=settings.MEDIA_FORMATSTR_DEFAULT,
+        help_text=_('File format to use for saving files')
+    )
     index_schedule = models.IntegerField(
         _('index schedule'),
         choices=IndexSchedule.choices,
@@ -181,6 +209,12 @@ class Source(models.Model):
         default=IndexSchedule.EVERY_6_HOURS,
         help_text=_('Schedule of how often to index the source for new media')
     )
+    download_cap = models.IntegerField(
+        _('download cap'),
+        choices=CapChoices.choices,
+        default=CapChoices.CAP_NOCAP,
+        help_text=_('Do not download media older than this capped date')
+    )
     delete_old_media = models.BooleanField(
         _('delete old media'),
         default=False,
@@ -234,6 +268,16 @@ class Source(models.Model):
         default=FALLBACK_NEXT_BEST_HD,
         help_text=_('What do do when media in your source resolution and codecs is not available')
     )
+    copy_thumbnails = models.BooleanField(
+        _('copy thumbnails'),
+        default=False,
+        help_text=_('Copy thumbnails with the media, these may be detected and used by some media servers')
+    )
+    write_nfo = models.BooleanField(
+        _('write nfo'),
+        default=False,
+        help_text=_('Write an NFO file in XML with the media info, these may be detected and used by some media servers')
+    )
     has_failed = models.BooleanField(
         _('has failed'),
         default=False,
@@ -251,6 +295,11 @@ class Source(models.Model):
     def icon(self):
         return self.ICONS.get(self.source_type)
 
+    @property
+    def slugname(self):
+        replaced = self.name.replace('_', '-').replace('&', 'and').replace('+', 'and')
+        return slugify(replaced)[:80]
+
     @property
     def is_audio(self):
         return self.source_resolution == self.SOURCE_RESOLUTION_AUDIO
@@ -259,6 +308,14 @@ class Source(models.Model):
     def is_video(self):
         return not self.is_audio
 
+    @property
+    def download_cap_date(self):
+        delta = self.download_cap
+        if delta > 0:
+            return timezone.now() - timedelta(seconds=delta)
+        else:
+            return False
+
     @property
     def extension(self):
         '''
@@ -325,6 +382,53 @@ class Source(models.Model):
     def can_fallback(self):
         return self.fallback != self.FALLBACK_FAIL
 
+    @property
+    def example_media_format_dict(self):
+        '''
+            Populates a dict with real-ish and some placeholder data for media name
+            format strings. Used for example filenames and media_format validation.
+        '''
+        fmt = []
+        if self.source_resolution:
+            fmt.append(self.source_resolution)
+        if self.source_vcodec:
+            fmt.append(self.source_vcodec.lower())
+        if self.source_acodec:
+            fmt.append(self.source_acodec.lower())
+        if self.prefer_60fps:
+            fmt.append('60fps')
+        if self.prefer_hdr:
+            fmt.append('hdr')
+        return {
+            'yyyymmdd': timezone.now().strftime('%Y%m%d'),
+            'yyyy_mm_dd': timezone.now().strftime('%Y-%m-%d'),
+            'yyyy': timezone.now().strftime('%Y'),
+            'mm': timezone.now().strftime('%m'),
+            'dd': timezone.now().strftime('%d'),
+            'source': self.slugname,
+            'source_full': self.name,
+            'title': 'some-media-title-name',
+            'title_full': 'Some Media Title Name',
+            'key': 'SoMeUnIqUiD',
+            'format': '-'.join(fmt),
+            'playlist_index': 1,
+            'playlist_title': 'Some Playlist Title',
+            'ext': self.extension,
+            'resolution': self.source_resolution if self.source_resolution else '',
+            'height': '720' if self.source_resolution else '',
+            'width': '1280' if self.source_resolution else '',
+            'vcodec': self.source_vcodec.lower() if self.source_vcodec else '',
+            'acodec': self.source_acodec.lower(),
+            'fps': '24' if self.source_resolution else '',
+            'hdr': 'hdr' if self.source_resolution else ''
+        }
+
+    def get_example_media_format(self):
+        try:
+            return self.media_format.format(**self.example_media_format_dict)
+        except Exception as e:
+            return ''
+
     def index_media(self):
         '''
             Index the media source returning a list of media metadata as dicts.
@@ -373,34 +477,81 @@ class Media(models.Model):
     # Format to use to display a URL for the media
     URLS = {
         Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'https://www.youtube.com/watch?v={key}',
+        Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'https://www.youtube.com/watch?v={key}',
         Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'https://www.youtube.com/watch?v={key}',
     }
     # Maps standardised names to names used in source metdata
     METADATA_FIELDS = {
         'upload_date': {
             Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'upload_date',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'upload_date',
             Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'upload_date',
         },
         'title': {
             Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'title',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'title',
             Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'title',
         },
         'thumbnail': {
             Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'thumbnail',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'thumbnail',
             Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'thumbnail',
         },
         'description': {
             Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'description',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'description',
             Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'description',
         },
         'duration': {
             Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'duration',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'duration',
             Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'duration',
         },
         'formats': {
             Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'formats',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'formats',
             Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'formats',
-        }
+        },
+        'categories': {
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'categories',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'categories',
+            Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'categories',
+        },
+        'rating': {
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'average_rating',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'average_rating',
+            Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'average_rating',
+        },
+        'age_limit': {
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'age_limit',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'age_limit',
+            Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'age_limit',
+        },
+        'uploader': {
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'uploader',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'uploader',
+            Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'uploader',
+        },
+        'upvotes': {
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'like_count',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'like_count',
+            Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'like_count',
+        },
+        'downvotes': {
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'dislike_count',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'dislike_count',
+            Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'dislike_count',
+        },
+        'playlist_index': {
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'playlist_index',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'playlist_index',
+            Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'playlist_index',
+        },
+        'playlist_title': {
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'playlist_title',
+            Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: 'playlist_title',
+            Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: 'playlist_title',
+        },
     }
     STATE_UNKNOWN = 'unknown'
     STATE_SCHEDULED = 'scheduled'
@@ -634,16 +785,39 @@ class Media(models.Model):
                 ('720p', 'avc1', 'mp4a', '60fps', 'hdr')  
         '''
         fmt = []
+        resolution = ''
+        vcodec = ''
+        acodec = ''
+        height = '0'
+        width = '0'
+        fps = ''
+        hdr = ''
         # If the download has completed use existing values
         if self.downloaded:
+            resolution = f'{self.downloaded_height}p'
             if self.downloaded_format != 'audio':
-                fmt.append(self.downloaded_video_codec.lower())
+                vcodec = self.downloaded_video_codec.lower()
-            fmt.append(self.downloaded_audio_codec.lower())
+                fmt.append(vcodec)
+            acodec = self.downloaded_audio_codec.lower()
+            fmt.append(acodec)
             if self.downloaded_format != 'audio':
-                fmt.append(str(self.downloaded_fps))
+                fps = str(self.downloaded_fps)
+                fmt.append(f'{fps}fps')
                 if self.downloaded_hdr:
-                    fmt.append('hdr')
+                    hdr = 'hdr'
-            return fmt
+                    fmt.append(hdr)
+                height = str(self.downloaded_height)
+                width = str(self.downloaded_width)
+            return {
+                'resolution': resolution,
+                'height': height,
+                'width': width,
+                'vcodec': vcodec,
+                'acodec': acodec,
+                'fps': fps,
+                'hdr': hdr,
+                'format': tuple(fmt),
+            }
         # Otherwise, calculate from matched format codes
         vformat = None
         aformat = None
@@ -660,15 +834,31 @@ class Media(models.Model):
                 # Combined
                 vformat = cformat
         if vformat:
-            fmt.append(vformat['format'].lower())
+            resolution = vformat['format'].lower()
-            fmt.append(vformat['vcodec'].lower())
+            fmt.append(resolution)
-        fmt.append(aformat['acodec'].lower())
+            vcodec = vformat['vcodec'].lower()
+            fmt.append(vcodec)
+        acodec = aformat['acodec'].lower()
+        fmt.append(acodec)
         if vformat:
             if vformat['is_60fps']:
-                fmt.append('60fps')
+                fps = '60fps'
+                fmt.append(fps)
             if vformat['is_hdr']:
-                fmt.append('hdr')
+                hdr = 'hdr'
-        return tuple(fmt)
+                fmt.append(hdr)
+            height = str(vformat['height'])
+            width = str(vformat['width'])
+        return {
+            'resolution': resolution,
+            'height': height,
+            'width': width,
+            'vcodec': vcodec,
+            'acodec': acodec,
+            'fps': fps,
+            'hdr': hdr,
+            'format': tuple(fmt),
+        }
 
     def get_format_by_code(self, format_code):
         '''
@@ -679,6 +869,39 @@ class Media(models.Model):
                 return fmt
         return False
 
+    @property
+    def format_dict(self):
+        '''
+            Returns a dict matching the media_format key requirements for this item
+            of media.
+        '''
+        format_str = self.get_format_str()
+        display_format = self.get_display_format(format_str)
+        dateobj = self.upload_date if self.upload_date else self.created
+        return {
+            'yyyymmdd': dateobj.strftime('%Y%m%d'),
+            'yyyy_mm_dd': dateobj.strftime('%Y-%m-%d'),
+            'yyyy': dateobj.strftime('%Y'),
+            'mm': dateobj.strftime('%m'),
+            'dd': dateobj.strftime('%d'),
+            'source': self.source.slugname,
+            'source_full': self.source.name,
+            'title': self.slugtitle,
+            'title_full': self.title,
+            'key': self.key,
+            'format': '-'.join(display_format['format']),
+            'playlist_index': self.playlist_index,
+            'playlist_title': self.playlist_title,
+            'ext': self.source.extension,
+            'resolution': display_format['resolution'],
+            'height': display_format['height'],
+            'width': display_format['width'],
+            'vcodec': display_format['vcodec'],
+            'acodec': display_format['acodec'],
+            'fps': display_format['fps'],
+            'hdr': display_format['hdr'],
+        }
+
     @property
     def loaded_metadata(self):
         try:
@@ -701,6 +924,11 @@ class Media(models.Model):
         field = self.get_metadata_field('title')
         return self.loaded_metadata.get(field, '').strip()
 
+    @property
+    def slugtitle(self):
+        replaced = self.title.replace('_', '-').replace('&', 'and').replace('+', 'and')
+        return slugify(replaced)[:80]
+
     @property
     def thumbnail(self):
         field = self.get_metadata_field('thumbnail')
@@ -732,27 +960,83 @@ class Media(models.Model):
             return seconds_to_timestr(duration)
         return '??:??:??'
 
+    @property
+    def categories(self):
+        field = self.get_metadata_field('categories')
+        return self.loaded_metadata.get(field, [])
+
+    @property
+    def rating(self):
+        field = self.get_metadata_field('rating')
+        return self.loaded_metadata.get(field, 0)
+
+    @property
+    def votes(self):
+        field = self.get_metadata_field('upvotes')
+        upvotes = self.loaded_metadata.get(field, 0)
+        field = self.get_metadata_field('downvotes')
+        downvotes = self.loaded_metadata.get(field, 0)
+        return upvotes + downvotes
+
+    @property
+    def age_limit(self):
+        field = self.get_metadata_field('age_limit')
+        return self.loaded_metadata.get(field, 0)
+
+    @property
+    def uploader(self):
+        field = self.get_metadata_field('uploader')
+        return self.loaded_metadata.get(field, '')
+
     @property
     def formats(self):
         field = self.get_metadata_field('formats')
         return self.loaded_metadata.get(field, [])
 
+    @property
+    def playlist_index(self):
+        field = self.get_metadata_field('playlist_index')
+        return self.loaded_metadata.get(field, 0)
+
+    @property
+    def playlist_title(self):
+        field = self.get_metadata_field('playlist_title')
+        return self.loaded_metadata.get(field, '')
+
     @property
     def filename(self):
-        if self.media_file:
+        # Otherwise, create a suitable filename from the source media_format
-            return os.path.basename(self.media_file.name)
+        media_format = str(self.source.media_format)
-        upload_date = self.upload_date
+        media_details = self.format_dict
-        dateobj = upload_date if upload_date else self.created
+        return media_format.format(**media_details)
-        datestr = dateobj.strftime('%Y-%m-%d')
+
-        source_name = slugify(self.source.name).replace('_', '-')
+    @property
-        name = slugify(self.name.replace('&', 'and').replace('+', 'and'))
+    def thumbname(self):
-        name = name.replace('_', '-')[:80]
+        filename = self.filename
-        key = self.key.strip().replace('_', '-')[:20]
+        prefix, ext = os.path.splitext(filename)
-        format_str = self.get_format_str()
+        return f'{prefix}.jpg'
-        format_tuple = self.get_display_format(format_str)
+
-        fmt = '-'.join(format_tuple)
+    @property
-        ext = self.source.extension
+    def thumbpath(self):
-        return f'{datestr}_{source_name}_{name}_{key}_{fmt}.{ext}'
+        return self.source.directory_path / self.thumbname
+
+    @property
+    def nfoname(self):
+        filename = self.filename
+        prefix, ext = os.path.splitext(filename)
+        return f'{prefix}.nfo'
+    
+    @property
+    def nfopath(self):
+        return self.source.directory_path / self.nfoname
+
+    @property
+    def directory_path(self):
+        # Otherwise, create a suitable filename from the source media_format
+        media_format = str(self.source.media_format)
+        media_details = self.format_dict
+        dirname = self.source.directory_path / media_format.format(**media_details)
+        return os.path.dirname(str(dirname))
 
     @property
     def filepath(self):
@@ -770,6 +1054,103 @@ class Media(models.Model):
             return False
         return os.path.exists(self.media_file.path)
 
+    @property
+    def nfoxml(self):
+        '''
+            Returns an NFO formatted (prettified) XML string.
+        '''
+        nfo = ElementTree.Element('episodedetails')
+        nfo.text = '\n  '
+        # title = media metadata title
+        title = nfo.makeelement('title', {})
+        title.text = str(self.name).strip()
+        title.tail = '\n  '
+        nfo.append(title)
+        # showtitle = source name
+        showtitle = nfo.makeelement('showtitle', {})
+        showtitle.text = str(self.source.name).strip()
+        showtitle.tail = '\n  '
+        nfo.append(showtitle)
+        # ratings = media metadata youtube rating
+        value = nfo.makeelement('value', {})
+        value.text = str(self.rating)
+        value.tail = '\n      '
+        votes = nfo.makeelement('votes', {})
+        votes.text = str(self.votes)
+        votes.tail = '\n    '
+        rating_attrs = OrderedDict()
+        rating_attrs['name'] = 'youtube'
+        rating_attrs['max'] = '5'
+        rating_attrs['default'] = 'True'
+        rating = nfo.makeelement('rating', rating_attrs)
+        rating.text = '\n      '
+        rating.append(value)
+        rating.append(votes)
+        rating.tail = '\n  '
+        ratings = nfo.makeelement('ratings', {})
+        ratings.text = '\n    '
+        ratings.append(rating)
+        ratings.tail = '\n  '
+        nfo.append(ratings)
+        # plot = media metadata description
+        plot = nfo.makeelement('plot', {})
+        plot.text = str(self.description).strip()
+        plot.tail = '\n  '
+        nfo.append(plot)
+        # thumb = local path to media thumbnail
+        thumb = nfo.makeelement('thumb', {})
+        thumb.text = self.thumbname if self.source.copy_thumbnails else ''
+        thumb.tail = '\n  '
+        nfo.append(thumb)
+        # mpaa = media metadata age requirement
+        mpaa = nfo.makeelement('mpaa', {})
+        mpaa.text = str(self.age_limit)
+        mpaa.tail = '\n  '
+        nfo.append(mpaa)
+        # runtime = media metadata duration in seconds
+        runtime = nfo.makeelement('runtime', {})
+        runtime.text = str(self.duration)
+        runtime.tail = '\n  '
+        nfo.append(runtime)
+        # id = media key
+        idn = nfo.makeelement('id', {})
+        idn.text = str(self.key).strip()
+        idn.tail = '\n  '
+        nfo.append(idn)
+        # uniqueid = media key
+        uniqueid_attrs = OrderedDict()
+        uniqueid_attrs['type'] = 'youtube'
+        uniqueid_attrs['default'] = 'True'
+        uniqueid = nfo.makeelement('uniqueid', uniqueid_attrs)
+        uniqueid.text = str(self.key).strip()
+        uniqueid.tail = '\n  '
+        nfo.append(uniqueid)
+        # studio = media metadata uploader
+        studio = nfo.makeelement('studio', {})
+        studio.text = str(self.uploader).strip()
+        studio.tail = '\n  '
+        nfo.append(studio)
+        # aired = media metadata uploaded date
+        aired = nfo.makeelement('aired', {})
+        upload_date = self.upload_date
+        aired.text = upload_date.strftime('%Y-%m-%d') if upload_date else ''
+        aired.tail = '\n  '
+        nfo.append(aired)
+        # dateadded = date and time media was created in tubesync
+        dateadded = nfo.makeelement('dateadded', {})
+        dateadded.text = self.created.strftime('%Y-%m-%d %H:%M:%S')
+        dateadded.tail = '\n  '
+        nfo.append(dateadded)
+        # genre = any media metadata categories if they exist
+        for category_str in self.categories:
+            genre = nfo.makeelement('genre', {})
+            genre.text = str(category_str).strip()
+            genre.tail = '\n  '
+            nfo.append(genre)
+        nfo[-1].tail = '\n'
+        # Return XML tree as a prettified string
+        return ElementTree.tostring(nfo, encoding='utf8', method='xml').decode('utf8')
+
     def get_download_state(self, task=None):
         if self.downloaded:
             return self.STATE_DOWNLOADED

tubesync/sync/signals.py

@@ -1,3 +1,4 @@
+import os
 from django.conf import settings
 from django.db.models.signals import pre_save, post_save, pre_delete, post_delete
 from django.dispatch import receiver
@@ -144,14 +145,7 @@ def media_pre_delete(sender, instance, **kwargs):
     if thumbnail_url:
         delete_task_by_media('sync.tasks.download_media_thumbnail',
                              (str(instance.pk), thumbnail_url))
-    # Delete media thumbnail if it exists
+
-    if instance.thumb:
-        log.info(f'Deleting thumbnail for: {instance} path: {instance.thumb.path}')
-        delete_file(instance.thumb.path)
-    # Delete the media file if it exists
-    if instance.media_file:
-        log.info(f'Deleting media for: {instance} path: {instance.media_file.path}')
-        delete_file(instance.media_file.path)
 
 @receiver(post_delete, sender=Media)
 def media_post_delete(sender, instance, **kwargs):

tubesync/sync/tasks.py

@@ -11,6 +11,7 @@ import uuid
 from io import BytesIO
 from hashlib import sha1
 from datetime import timedelta
+from shutil import copyfile
 from PIL import Image
 from django.conf import settings
 from django.core.files.uploadedfile import SimpleUploadedFile
@@ -22,7 +23,8 @@ from background_task.models import Task, CompletedTask
 from common.logger import log
 from common.errors import NoMediaException, DownloadFailedException
 from .models import Source, Media, MediaServer
-from .utils import get_remote_image, resize_image_to_height, delete_file
+from .utils import (get_remote_image, resize_image_to_height, delete_file,
+                    write_text_file)
 
 
 def get_hash(task_name, pk):
@@ -185,6 +187,14 @@ def index_source_task(source_id):
         else:
             log.error(f'Media has no upload date, skipping: {source} / {media}')
             continue
+        # If the source has a download cap date check the upload date is allowed
+        max_cap_age = source.download_cap_date
+        if max_cap_age:
+            if media.published < max_cap_age:
+                # Media was published after the cap date, skip it
+                log.warn(f'Media: {source} / {media} is older than cap age '
+                         f'{max_cap_age}, skipping')
+                continue
         # If the source has a cut-off check the upload date is within the allowed delta
         if source.delete_old_media and source.days_to_keep > 0:
             delta = timezone.now() - timedelta(days=source.days_to_keep)
@@ -242,7 +252,7 @@ def download_media_thumbnail(media_id, url):
              f'{width}x{height}: {url}')
     i = resize_image_to_height(i, width, height)
     image_file = BytesIO()
-    i.save(image_file, 'JPEG', quality=80, optimize=True, progressive=True)
+    i.save(image_file, 'JPEG', quality=85, optimize=True, progressive=True)
     image_file.seek(0)
     media.thumb.save(
         'thumb',
@@ -272,17 +282,18 @@ def download_media(media_id):
         log.warn(f'Download task triggeredd media: {media} (UUID: {media.pk}) but it '
                  f'is now marked to be skipped, not downloading')
         return
-    log.info(f'Downloading media: {media} (UUID: {media.pk}) to: "{media.filepath}"')
+    filepath = media.filepath
+    log.info(f'Downloading media: {media} (UUID: {media.pk}) to: "{filepath}"')
     format_str, container = media.download_media()
-    if os.path.exists(media.filepath):
+    if os.path.exists(filepath):
         # Media has been downloaded successfully
         log.info(f'Successfully downloaded media: {media} (UUID: {media.pk}) to: '
-                 f'"{media.filepath}"')
+                 f'"{filepath}"')
         # Link the media file to the object and update info about the download
-        media.media_file.name = str(media.filepath)
+        media.media_file.name = str(filepath)
         media.downloaded = True
         media.download_date = timezone.now()
-        media.downloaded_filesize = os.path.getsize(media.filepath)
+        media.downloaded_filesize = os.path.getsize(filepath)
         media.downloaded_container = container
         if '+' in format_str:
             # Seperate audio and video streams
@@ -313,6 +324,15 @@ def download_media(media_id):
             else:
                 media.downloaded_format = 'audio'
         media.save()
+        # If selected, copy the thumbnail over as well
+        if media.source.copy_thumbnails and media.thumb:
+            log.info(f'Copying media thumbnail from: {media.thumb.path} '
+                     f'to: {media.thumbpath}')
+            copyfile(media.thumb.path, media.thumbpath)
+        # If selected, write an NFO file
+        if media.source.write_nfo:
+            log.info(f'Writing media NFO file to: to: {media.nfopath}')
+            write_text_file(media.nfopath, media.nfoxml)
         # Schedule a task to update media servers
         for mediaserver in MediaServer.objects.all():
             log.info(f'Scheduling media server updates')

tubesync/sync/templates/sync/_mediaformatvars.html

@@ -0,0 +1,117 @@
+<h2>Available media name variables</h2>
+<table class="striped">
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Description</th>
+      <th>Output example</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>{yyyymmdd}</td>
+      <td>Media publish date in YYYYMMDD</td>
+      <td>20210131</td>
+    </tr>
+    <tr>
+      <td>{yyyy_mm_dd}</td>
+      <td>Media publish date in YYYY-MM-DD</td>
+      <td>2021-01-31</td>
+    </tr>
+    <tr>
+      <td>{yyyy}</td>
+      <td>Media publish year in YYYY</td>
+      <td>2021</td>
+    </tr>
+    <tr>
+      <td>{mm}</td>
+      <td>Media publish year in MM</td>
+      <td>01</td>
+    </tr>
+    <tr>
+      <td>{dd}</td>
+      <td>Media publish year in DD</td>
+      <td>31</td>
+    </tr>
+    <tr>
+      <td>{source}</td>
+      <td>Lower case source name, max 80 chars</td>
+      <td>my-source</td>
+    </tr>
+    <tr>
+      <td>{source_full}</td>
+      <td>Full source name</td>
+      <td>My Source</td>
+    </tr>
+    <tr>
+      <td>{title}</td>
+      <td>Lower case media title, max 80 chars</td>
+      <td>my-video</td>
+    </tr>
+    <tr>
+      <td>{title_full}</td>
+      <td>Full media title</td>
+      <td>My Video</td>
+    </tr>
+    <tr>
+      <td>{key}</td>
+      <td>Media unique key or video ID</td>
+      <td>SoMeUnIqUeId</td>
+    </tr>
+    <tr>
+      <td>{format}</td>
+      <td>Media format string</td>
+      <td>720p-avc1-mp4a</td>
+    </tr>
+    <tr>
+      <td>{playlist_index}</td>
+      <td>Playlist index of media, if it's in a playlist</td>
+      <td>12</td>
+    </tr>
+    <tr>
+      <td>{playlist_title}</td>
+      <td>Playlist title of media, if it's in a playlist</td>
+      <td>Some Playlist</td>
+    </tr>
+    <tr>
+      <td>{ext}</td>
+      <td>File extension</td>
+      <td>mkv</td>
+    </tr>
+    <tr>
+      <td>{resolution}</td>
+      <td>Resolution</td>
+      <td>720p</td>
+    </tr>
+    <tr>
+      <td>{height}</td>
+      <td>Media height in pixels</td>
+      <td>720</td>
+    </tr>
+    <tr>
+      <td>{width}</td>
+      <td>Media width in pixels</td>
+      <td>1280</td>
+    </tr>
+    <tr>
+      <td>{vcodec}</td>
+      <td>Media video codec</td>
+      <td>avc1</td>
+    </tr>
+    <tr>
+      <td>{acodec}</td>
+      <td>Media audio codec</td>
+      <td>opus</td>
+    </tr>
+    <tr>
+      <td>{fps}</td>
+      <td>Media fps</td>
+      <td>60fps</td>
+    </tr>
+    <tr>
+      <td>{flag_hdr}</td>
+      <td>Media has HDR flag</td>
+      <td>hdr</td>
+    </tr>
+  </tbody>
+</table>

tubesync/sync/templates/sync/dashboard.html

@@ -71,7 +71,7 @@
         <div class="collection">
         {% for media in latest_downloads %}
           <a href="{% url 'sync:media-item' pk=media.pk %}" class="collection-item">
-            <div class="truncate"><strong>{{ media.name }}</strong> ({{ media.source }})</div>
+            <div class="truncate"><strong>{{ media.name }}</strong></div>
             <div class="truncate"><strong>{{ media.download_date|timesince:now }}</strong> ago from &quot;{{ media.source.name }}&quot;</div>
           </a>
         {% empty %}
@@ -89,7 +89,7 @@
           {% for media in largest_downloads %}
             <a href="{% url 'sync:media-item' pk=media.pk %}" class="collection-item">
               <div class="truncate">{{ media.name }}</div>
-              <div class="truncate"><strong>{{ media.downloaded_filesize|filesizeformat }}</strong>{% if media.downloaded_format %} in {{ media.downloaded_format }}{% endif %}</div>
+              <div class="truncate"><strong>{{ media.downloaded_filesize|filesizeformat }}</strong>{% if media.downloaded_format %} in {{ media.downloaded_format }}{% endif %} from &quot;{{ media.source.name }}&quot;</div>
             </a>
           {% empty %}
             <span class="collection-item">No media has been downloaded.</span>

tubesync/sync/templates/sync/media-item.html

@@ -80,6 +80,10 @@
         <td class="hide-on-small-only">Filename</td>
         <td><span class="hide-on-med-and-up">Filename<br></span><strong>{{ media.filename }}</strong></td>
       </tr>
+      <tr title="The filename the media will be downloaded as">
+        <td class="hide-on-small-only">Directory</td>
+        <td><span class="hide-on-med-and-up">Directory<br></span><strong>{{ media.directory_path }}</strong></td>
+      </tr>
       <tr title="Size of the file on disk">
         <td class="hide-on-small-only">File size</td>
         <td><span class="hide-on-med-and-up">File size<br></span><strong>{{ media.downloaded_filesize|filesizeformat }}</strong></td>

tubesync/sync/templates/sync/source-add.html

@@ -23,4 +23,9 @@
     </div>
   </form>
 </div>
+<div class="row">
+  <div class="col s12">
+{% include 'sync/_mediaformatvars.html' %}
+  </div>
+</div>
 {% endblock %}

tubesync/sync/templates/sync/source-update.html

@@ -25,4 +25,9 @@
     </div>
   </form>
 </div>
+<div class="row">
+  <div class="col s12">
+{% include 'sync/_mediaformatvars.html' %}
+  </div>
+</div>
 {% endblock %}

tubesync/sync/templates/sync/source.html

@@ -43,6 +43,20 @@
         <td class="hide-on-small-only">Directory</td>
         <td><span class="hide-on-med-and-up">Directory<br></span><strong>{{ source.directory }}</strong></td>
       </tr>
+      <tr title="Media file name format to use for saving files">
+        <td class="hide-on-small-only">Media format</td>
+        <td><span class="hide-on-med-and-up">Media format<br></span><strong>{{ source.media_format }}</strong></td>
+      </tr>
+      <tr title="Example file name for media format">
+        <td class="hide-on-small-only">Example filename</td>
+        <td><span class="hide-on-med-and-up">Example filename<br></span><strong>{{ source.get_example_media_format }}</strong></td>
+      </tr>
+      {% if source.download_cap > 0 %}
+      <tr title="Do not download videos older than this cap">
+        <td class="hide-on-small-only">Download cap</td>
+        <td><span class="hide-on-med-and-up">Download cap<br></span><strong>{{ source.get_download_cap_display }}</strong></td>
+      </tr>
+      {% endif %}
       <tr title="Schedule of how often to index the source for new media">
         <td class="hide-on-small-only">Index schedule</td>
         <td><span class="hide-on-med-and-up">Index schedule<br></span><strong>{{ source.get_index_schedule_display }}</strong></td>
@@ -85,6 +99,14 @@
         <td class="hide-on-small-only">Fallback</td>
         <td><span class="hide-on-med-and-up">Fallback<br></span><strong>{{ source.get_fallback_display }}</strong></td>
       </tr>
+      <tr title="Should media thumbnails be copied over with the media?">
+        <td class="hide-on-small-only">Copy thumbnails?</td>
+        <td><span class="hide-on-med-and-up">Copy thumbnails?<br></span><strong>{% if source.copy_thumbnails %}<i class="fas fa-check"></i>{% else %}<i class="fas fa-times"></i>{% endif %}</strong></td>
+      </tr>
+      <tr title="Should an NFO file be written with the media?">
+        <td class="hide-on-small-only">Write NFO?</td>
+        <td><span class="hide-on-med-and-up">Write NFO?<br></span><strong>{% if source.write_nfo %}<i class="fas fa-check"></i>{% else %}<i class="fas fa-times"></i>{% endif %}</strong></td>
+      </tr>
       {% if source.delete_old_media and source.days_to_keep > 0 %}
       <tr title="Days after which your media from this source will be locally deleted">
         <td class="hide-on-small-only">Delete old media</td>

tubesync/sync/templates/sync/sources.html

@@ -10,10 +10,13 @@
 </div>
 {% include 'infobox.html' with message=message %}
 <div class="row">
-  <div class="col s12 l6 margin-bottom">
+  <div class="col m12 xl4 margin-bottom">
     <a href="{% url 'sync:validate-source' source_type='youtube-channel' %}" class="btn">Add a YouTube channel <i class="fab fa-youtube"></i></a>
   </div>
-  <div class="col s12 l6 margin-bottom">
+  <div class="col m12 xl4 margin-bottom">
+    <a href="{% url 'sync:validate-source' source_type='youtube-channel-id' %}" class="btn">Add a YouTube channel by ID <i class="fab fa-youtube"></i></a>
+  </div>
+  <div class="col m12 xl4 margin-bottom">
     <a href="{% url 'sync:validate-source' source_type='youtube-playlist' %}" class="btn">Add a YouTube playlist <i class="fab fa-youtube"></i></a>
   </div>
 </div>

tubesync/sync/testdata/metadata.json

@@ -3,15 +3,24 @@
     "upload_date":"20170911",
     "license":null,
     "creator":null,
-    "title":"no fancy stuff",
+    "title":"no fancy stuff title",
     "alt_title":null,
-    "description":"no fancy stuff",
+    "description":"no fancy stuff desc",
-    "categories":[],
+    "average_rating": 1.2345,
+    "dislike_count": 123,
+    "like_count": 456,
+    "playlist_index": 789,
+    "playlist_title": "test playlist",
+    "uploader": "test uploader",
+    "categories":[
+        "test category 1",
+        "test category 2"
+    ],
     "tags":[],
     "subtitles":{},
     "automatic_captions":{},
     "duration":401.0,
-    "age_limit":0,
+    "age_limit":50,
     "annotations":null,
     "chapters":null,
     "formats":[

tubesync/sync/tests.py

@@ -6,7 +6,9 @@
 
 
 import logging
+from datetime import datetime
 from urllib.parse import urlsplit
+from xml.etree import ElementTree
 from django.conf import settings
 from django.test import TestCase, Client
 from django.utils import timezone
@@ -28,6 +30,7 @@ class FrontEndTestCase(TestCase):
     def test_validate_source(self):
         test_source_types = {
             'youtube-channel': Source.SOURCE_TYPE_YOUTUBE_CHANNEL,
+            'youtube-channel-id': Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID,
             'youtube-playlist': Source.SOURCE_TYPE_YOUTUBE_PLAYLIST,
         }
         test_sources = {
@@ -35,6 +38,7 @@ class FrontEndTestCase(TestCase):
                 'valid': (
                     'https://www.youtube.com/testchannel',
                     'https://www.youtube.com/c/testchannel',
+                    'https://www.youtube.com/c/testchannel/videos',
                 ),
                 'invalid_schema': (
                     'http://www.youtube.com/c/playlist',
@@ -50,13 +54,37 @@ class FrontEndTestCase(TestCase):
                 ),
                 'invalid_is_playlist': (
                     'https://www.youtube.com/c/playlist',
-                    'https://www.youtube.com/c/playlist',
+                ),
+                'invalid_channel_with_id': (
+                    'https://www.youtube.com/channel/channelid',
+                    'https://www.youtube.com/channel/channelid/videos',
+                ),
+            },
+            'youtube-channel-id': {
+                'valid': (
+                    'https://www.youtube.com/channel/channelid',
+                    'https://www.youtube.com/channel/channelid/videos',
+                ),
+                'invalid_schema': (
+                    'http://www.youtube.com/channel/channelid',
+                    'ftp://www.youtube.com/channel/channelid',
+                ),
+                'invalid_domain': (
+                    'https://www.test.com/channel/channelid',
+                    'https://www.example.com/channel/channelid',
+                ),
+                'invalid_path': (
+                    'https://www.youtube.com/test/invalid',
+                    'https://www.youtube.com/channel/test/invalid',
+                ),
+                'invalid_is_named_channel': (
+                    'https://www.youtube.com/c/testname',
                 ),
             },
             'youtube-playlist': {
                 'valid': (
-                    'https://www.youtube.com/playlist?list=testplaylist'
+                    'https://www.youtube.com/playlist?list=testplaylist',
-                    'https://www.youtube.com/watch?v=testvideo&list=testplaylist'
+                    'https://www.youtube.com/watch?v=testvideo&list=testplaylist',
                 ),
                 'invalid_schema': (
                     'http://www.youtube.com/playlist?list=testplaylist',
@@ -73,6 +101,7 @@ class FrontEndTestCase(TestCase):
                 'invalid_is_channel': (
                     'https://www.youtube.com/testchannel',
                     'https://www.youtube.com/c/testchannel',
+                    'https://www.youtube.com/channel/testchannel',
                 ),
             }
         }
@@ -83,19 +112,21 @@ class FrontEndTestCase(TestCase):
         response = c.get('/source-validate/invalid')
         self.assertEqual(response.status_code, 404)
         for (source_type, tests) in test_sources.items():
-            for test, field in tests.items():
+            for test, urls in tests.items():
-                source_type_char = test_source_types.get(source_type)
+                for url in urls:
-                data = {'source_url': field, 'source_type': source_type_char}
+                    source_type_char = test_source_types.get(source_type)
-                response = c.post(f'/source-validate/{source_type}', data)
+                    data = {'source_url': url, 'source_type': source_type_char}
-                if test == 'valid':
+                    response = c.post(f'/source-validate/{source_type}', data)
-                    # Valid source tests should bounce to /source-add
+                    if test == 'valid':
-                    self.assertEqual(response.status_code, 302)
+                        # Valid source tests should bounce to /source-add
-                    url_parts = urlsplit(response.url)
+                        self.assertEqual(response.status_code, 302)
-                    self.assertEqual(url_parts.path, '/source-add')
+                        url_parts = urlsplit(response.url)
-                else:
+                        self.assertEqual(url_parts.path, '/source-add')
-                    # Invalid source tests should reload the page with an error message
+                    else:
-                    self.assertEqual(response.status_code, 200)
+                        # Invalid source tests should reload the page with an error
-                    self.assertIn('<ul class="errorlist">', response.content.decode())
+                        self.assertEqual(response.status_code, 200)
+                        self.assertIn('<ul class="errorlist">',
+                                      response.content.decode())
 
     def test_add_source_prepopulation(self):
         c = Client()
@@ -131,6 +162,8 @@ class FrontEndTestCase(TestCase):
             'key': 'testkey',
             'name': 'testname',
             'directory': 'testdirectory',
+            'media_format': settings.MEDIA_FORMATSTR_DEFAULT,
+            'download_cap': 0,
             'index_schedule': 3600,
             'delete_old_media': False,
             'days_to_keep': 14,
@@ -170,6 +203,8 @@ class FrontEndTestCase(TestCase):
             'key': 'updatedkey',  # changed
             'name': 'testname',
             'directory': 'testdirectory',
+            'media_format': settings.MEDIA_FORMATSTR_DEFAULT,
+            'download_cap': 0,
             'index_schedule': Source.IndexSchedule.EVERY_HOUR,
             'delete_old_media': False,
             'days_to_keep': 14,
@@ -197,6 +232,8 @@ class FrontEndTestCase(TestCase):
             'key': 'updatedkey',
             'name': 'testname',
             'directory': 'testdirectory',
+            'media_format': settings.MEDIA_FORMATSTR_DEFAULT,
+            'download_cap': 0,
             'index_schedule': Source.IndexSchedule.EVERY_2_HOURS,  # changed
             'delete_old_media': False,
             'days_to_keep': 14,
@@ -398,7 +435,6 @@ class FrontEndTestCase(TestCase):
         response = c.get('/tasks-completed')
         self.assertEqual(response.status_code, 200)
 
-
     def test_mediasevrers(self):
         # Media servers overview page
         c = Client()
@@ -422,6 +458,221 @@ all_test_metadata = {
 }
 
 
+class FilepathTestCase(TestCase):
+
+    def setUp(self):
+        # Disable general logging for test case
+        logging.disable(logging.CRITICAL)
+        # Add a test source
+        self.source = Source.objects.create(
+            source_type=Source.SOURCE_TYPE_YOUTUBE_CHANNEL,
+            key='testkey',
+            name='testname',
+            directory='testdirectory',
+            media_format=settings.MEDIA_FORMATSTR_DEFAULT,
+            index_schedule=3600,
+            delete_old_media=False,
+            days_to_keep=14,
+            source_resolution=Source.SOURCE_RESOLUTION_1080P,
+            source_vcodec=Source.SOURCE_VCODEC_VP9,
+            source_acodec=Source.SOURCE_ACODEC_OPUS,
+            prefer_60fps=False,
+            prefer_hdr=False,
+            fallback=Source.FALLBACK_FAIL
+        )
+        # Add some test media
+        self.media = Media.objects.create(
+            key='mediakey',
+            source=self.source,
+            metadata=metadata,
+        )
+
+    def test_source_dirname(self):
+        # Check media format validation is working
+        # Empty
+        self.source.media_format = ''
+        self.assertEqual(self.source.get_example_media_format(), '')
+        # Invalid, bad key
+        self.source.media_format = '{test}'
+        self.assertEqual(self.source.get_example_media_format(), '')
+        # Invalid, extra brackets
+        self.source.media_format = '{key}}'
+        self.assertEqual(self.source.get_example_media_format(), '')
+        # Invalid, not a string
+        self.source.media_format = 1
+        self.assertEqual(self.source.get_example_media_format(), '')
+        # Check all expected keys validate
+        self.source.media_format = 'test-{yyyymmdd}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + timezone.now().strftime('%Y%m%d'))
+        self.source.media_format = 'test-{yyyy_mm_dd}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + timezone.now().strftime('%Y-%m-%d'))
+        self.source.media_format = 'test-{yyyy}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + timezone.now().strftime('%Y'))
+        self.source.media_format = 'test-{mm}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + timezone.now().strftime('%m'))
+        self.source.media_format = 'test-{dd}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + timezone.now().strftime('%d'))
+        self.source.media_format = 'test-{source}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + self.source.slugname)
+        self.source.media_format = 'test-{source_full}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + self.source.name)
+        self.source.media_format = 'test-{title}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-some-media-title-name')
+        self.source.media_format = 'test-{title_full}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-Some Media Title Name')
+        self.source.media_format = 'test-{key}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-SoMeUnIqUiD')
+        self.source.media_format = 'test-{format}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-1080p-vp9-opus')
+        self.source.media_format = 'test-{playlist_index}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-1')
+        self.source.media_format = 'test-{playlist_title}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-Some Playlist Title')
+        self.source.media_format = 'test-{ext}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + self.source.extension)
+        self.source.media_format = 'test-{resolution}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + self.source.source_resolution)
+        self.source.media_format = 'test-{height}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-720')
+        self.source.media_format = 'test-{width}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-1280')
+        self.source.media_format = 'test-{vcodec}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + self.source.source_vcodec.lower())
+        self.source.media_format = 'test-{acodec}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-' + self.source.source_acodec.lower())
+        self.source.media_format = 'test-{fps}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-24')
+        self.source.media_format = 'test-{hdr}'
+        self.assertEqual(self.source.get_example_media_format(),
+                         'test-hdr')
+
+    def test_media_filename(self):
+        # Check child directories work
+        self.source.media_format = '{yyyy}/{key}.{ext}'
+        self.assertEqual(self.media.directory_path,
+                         str(self.source.directory_path / '2017'))
+        self.assertEqual(self.media.filename, '2017/mediakey.mkv')
+        self.source.media_format = '{yyyy}/{yyyy_mm_dd}/{key}.{ext}'
+        self.assertEqual(self.media.directory_path,
+                         str(self.source.directory_path / '2017/2017-09-11'))
+        self.assertEqual(self.media.filename, '2017/2017-09-11/mediakey.mkv')
+        # Check media specific media format keys work
+        test_media = Media.objects.create(
+            key='test',
+            source=self.source,
+            metadata=metadata,
+            downloaded=True,
+            download_date=timezone.now(),
+            downloaded_format='720p',
+            downloaded_height=720,
+            downloaded_width=1280,
+            downloaded_audio_codec='opus',
+            downloaded_video_codec='vp9',
+            downloaded_container='mkv',
+            downloaded_fps=30,
+            downloaded_hdr=True,
+            downloaded_filesize=12345
+        )
+        # Bypass media-file-exists on-save signal
+        test_media.downloaded = True
+        self.source.media_format = ('{title}_{key}_{resolution}-{height}x{width}-'
+                                    '{acodec}-{vcodec}-{fps}fps-{hdr}.{ext}')
+        self.assertEqual(test_media.filename,
+                         ('no-fancy-stuff-title_test_720p-720x1280-opus'
+                          '-vp9-30fps-hdr.mkv'))
+
+
+class MediaTestCase(TestCase):
+
+    def setUp(self):
+        # Disable general logging for test case
+        logging.disable(logging.CRITICAL)
+        # Add a test source
+        self.source = Source.objects.create(
+            source_type=Source.SOURCE_TYPE_YOUTUBE_CHANNEL,
+            key='testkey',
+            name='testname',
+            directory='testdirectory',
+            media_format=settings.MEDIA_FORMATSTR_DEFAULT,
+            index_schedule=3600,
+            delete_old_media=False,
+            days_to_keep=14,
+            source_resolution=Source.SOURCE_RESOLUTION_1080P,
+            source_vcodec=Source.SOURCE_VCODEC_VP9,
+            source_acodec=Source.SOURCE_ACODEC_OPUS,
+            prefer_60fps=False,
+            prefer_hdr=False,
+            fallback=Source.FALLBACK_FAIL
+        )
+        # Add some test media
+        self.media = Media.objects.create(
+            key='mediakey',
+            source=self.source,
+            metadata=metadata,
+        )
+        # Fix a created datetime for predictable testing
+        self.media.created = datetime(year=2020, month=1, day=1, hour=1,
+                                      minute=1, second=1)
+
+    def test_nfo(self):
+        expected_nfo = [
+            "<?xml version='1.0' encoding='utf8'?>",
+            '<episodedetails>',
+            '  <title>no fancy stuff title</title>',
+            '  <showtitle>testname</showtitle>',
+            '  <ratings>',
+            '    <rating default="True" max="5" name="youtube">',
+            '      <value>1.2345</value>',
+            '      <votes>579</votes>',
+            '    </rating>',
+            '  </ratings>',
+            '  <plot>no fancy stuff desc</plot>',
+            '  <thumb />',  # media.thumbfile is empty without media existing
+            '  <mpaa>50</mpaa>',
+            '  <runtime>401</runtime>',
+            '  <id>mediakey</id>',
+            '  <uniqueid default="True" type="youtube">mediakey</uniqueid>',
+            '  <studio>test uploader</studio>',
+            '  <aired>2017-09-11</aired>',
+            '  <dateadded>2020-01-01 01:01:01</dateadded>',
+            '  <genre>test category 1</genre>',
+            '  <genre>test category 2</genre>',
+            '</episodedetails>',
+        ]
+        expected_tree = ElementTree.fromstring('\n'.join(expected_nfo))
+        nfo_tree = ElementTree.fromstring(self.media.nfoxml)
+        # Check each node with attribs in expected_tree is present in test_nfo
+        for expected_node in expected_tree:
+            # Ignore checking <genre>, only tag we may have multiple of
+            if expected_node.tag == 'genre':
+                continue
+            # Find the same node in the NFO XML tree
+            nfo_node = nfo_tree.find(expected_node.tag)
+            self.assertEqual(expected_node.attrib, nfo_node.attrib)
+            self.assertEqual(expected_node.tag, nfo_node.tag)
+            self.assertEqual(expected_node.text, nfo_node.text)
+
+
 class FormatMatchingTestCase(TestCase):
 
     def setUp(self):

tubesync/sync/utils.py

@@ -108,6 +108,14 @@ def file_is_editable(filepath):
     return False
 
 
+def write_text_file(filepath, filedata):
+    if not isinstance(filedata, str):
+        raise ValueError(f'filedata must be a str, got "{type(filedata)}"')
+    with open(filepath, 'wt') as f:
+        bytes_written = f.write(filedata)
+    return bytes_written
+
+
 def delete_file(filepath):
     if file_is_editable(filepath):
         return os.remove(filepath)

tubesync/sync/views.py

@@ -128,10 +128,12 @@ class ValidateSourceView(FormView):
     }
     source_types = {
         'youtube-channel': Source.SOURCE_TYPE_YOUTUBE_CHANNEL,
+        'youtube-channel-id': Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID,
         'youtube-playlist': Source.SOURCE_TYPE_YOUTUBE_PLAYLIST,
     }
     help_item = {
         Source.SOURCE_TYPE_YOUTUBE_CHANNEL: _('YouTube channel'),
+        Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: _('YouTube channel ID'),
         Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: _('YouTube playlist'),
     }
     help_texts = {
@@ -141,6 +143,13 @@ class ValidateSourceView(FormView):
             'where <strong>CHANNELNAME</strong> is the name of the channel you want '
             'to add.'
         ),
+        Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: _(
+            'Enter a YouTube channel URL by channel ID into the box below. A channel '
+            'URL by channel ID will be in the format of <strong>'
+            'https://www.youtube.com/channel/BiGLoNgUnIqUeId</strong> '
+            'where <strong>BiGLoNgUnIqUeId</strong> is the ID of the channel you want '
+            'to add.'
+        ),
         Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: _(
             'Enter a YouTube playlist URL into the box below. A playlist URL will be '
             'in the format of <strong>https://www.youtube.com/playlist?list='
@@ -150,6 +159,8 @@ class ValidateSourceView(FormView):
     }
     help_examples = {
         Source.SOURCE_TYPE_YOUTUBE_CHANNEL: 'https://www.youtube.com/google',
+        Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: ('https://www.youtube.com/channel/'
+                                                'UCK8sQmJBp8GCxrOtXWBpyEA'),
         Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: ('https://www.youtube.com/playlist?list='
                                               'PL590L5WQmH8dpP0RyH5pCfIaDEdt9nk7r')
     }
@@ -157,12 +168,21 @@ class ValidateSourceView(FormView):
         Source.SOURCE_TYPE_YOUTUBE_CHANNEL: {
             'scheme': 'https',
             'domain': 'www.youtube.com',
-            'path_regex': '^\/(c\/)?([^\/]+)$',
+            'path_regex': '^\/(c\/)?([^\/]+)(\/videos)?$',
             'path_must_not_match': ('/playlist', '/c/playlist'),
             'qs_args': [],
             'extract_key': ('path_regex', 1),
             'example': 'https://www.youtube.com/SOMECHANNEL'
         },
+        Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: {
+            'scheme': 'https',
+            'domain': 'www.youtube.com',
+            'path_regex': '^\/channel\/([^\/]+)(\/videos)?$',
+            'path_must_not_match': ('/playlist', '/c/playlist'),
+            'qs_args': [],
+            'extract_key': ('path_regex', 0),
+            'example': 'https://www.youtube.com/channel/CHANNELID'
+        },
         Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: {
             'scheme': 'https',
             'domain': 'www.youtube.com',
@@ -175,6 +195,7 @@ class ValidateSourceView(FormView):
     }
     prepopulate_fields = {
         Source.SOURCE_TYPE_YOUTUBE_CHANNEL: ('source_type', 'key', 'name', 'directory'),
+        Source.SOURCE_TYPE_YOUTUBE_CHANNEL_ID: ('source_type', 'key'),
         Source.SOURCE_TYPE_YOUTUBE_PLAYLIST: ('source_type', 'key'),
     }
 
@@ -252,9 +273,15 @@ class AddSourceView(CreateView):
 
     template_name = 'sync/source-add.html'
     model = Source
-    fields = ('source_type', 'key', 'name', 'directory', 'index_schedule',
+    fields = ('source_type', 'key', 'name', 'directory', 'media_format',
-              'delete_old_media', 'days_to_keep', 'source_resolution', 'source_vcodec',
+              'index_schedule', 'download_cap', 'delete_old_media', 'days_to_keep',
-              'source_acodec', 'prefer_60fps', 'prefer_hdr', 'fallback')
+              'source_resolution', 'source_vcodec', 'source_acodec', 'prefer_60fps',
+              'prefer_hdr', 'fallback', 'copy_thumbnails', 'write_nfo')
+    errors = {
+        'invalid_media_format': _('Invalid media format, the media format contains '
+                                  'errors or is empty. Check the table at the end of '
+                                  'this page for valid media name variables'),
+    }
 
     def __init__(self, *args, **kwargs):
         self.prepopulated_data = {}
@@ -281,6 +308,20 @@ class AddSourceView(CreateView):
             initial[k] = v
         return initial
 
+    def form_valid(self, form):
+        # Perform extra validation to make sure the media_format is valid
+        obj = form.save(commit=False)
+        source_type = form.cleaned_data['media_format']
+        example_media_file = obj.get_example_media_format()
+        if example_media_file == '':
+            form.add_error(
+                'media_format',
+                ValidationError(self.errors['invalid_media_format'])
+            )
+        if form.errors:
+            return super().form_invalid(form)
+        return super().form_valid(form)
+
     def get_success_url(self):
         url = reverse_lazy('sync:source', kwargs={'pk': self.object.pk})
         return append_uri_params(url, {'message': 'source-created'})
@@ -293,8 +334,8 @@ class SourceView(DetailView):
     messages = {
         'source-created': _('Your new source has been created. If you have added a '
                             'very large source such as a channel with hundreds of '
-                            'videos it can take several minutes for media to start '
+                            'videos it can take several minutes or up to an hour '
-                            'to appear.'),
+                            'for media to start to appear.'),
         'source-updated': _('Your source has been updated.'),
     }
 
@@ -323,9 +364,29 @@ class UpdateSourceView(UpdateView):
 
     template_name = 'sync/source-update.html'
     model = Source
-    fields = ('source_type', 'key', 'name', 'directory', 'index_schedule',
+    fields = ('source_type', 'key', 'name', 'directory', 'media_format',
-              'delete_old_media', 'days_to_keep', 'source_resolution', 'source_vcodec',
+              'index_schedule', 'download_cap', 'delete_old_media', 'days_to_keep',
-              'source_acodec', 'prefer_60fps', 'prefer_hdr', 'fallback')
+              'source_resolution', 'source_vcodec', 'source_acodec', 'prefer_60fps',
+              'prefer_hdr', 'fallback', 'copy_thumbnails', 'write_nfo')
+    errors = {
+        'invalid_media_format': _('Invalid media format, the media format contains '
+                                  'errors or is empty. Check the table at the end of '
+                                  'this page for valid media name variables'),
+    }
+
+    def form_valid(self, form):
+        # Perform extra validation to make sure the media_format is valid
+        obj = form.save(commit=False)
+        source_type = form.cleaned_data['media_format']
+        example_media_file = obj.get_example_media_format()
+        if example_media_file == '':
+            form.add_error(
+                'media_format',
+                ValidationError(self.errors['invalid_media_format'])
+            )
+        if form.errors:
+            return super().form_invalid(form)
+        return super().form_valid(form)
 
     def get_success_url(self):
         url = reverse_lazy('sync:source', kwargs={'pk': self.object.pk})
@@ -350,7 +411,12 @@ class DeleteSourceView(DeleteView, FormMixin):
             source = self.get_object()
             for media in Media.objects.filter(source=source):
                 if media.media_file:
+                    # Delete the media file
                     delete_file(media.media_file.name)
+                    # Delete thumbnail copy if it exists
+                    delete_file(media.thumbpath)
+                    # Delete NFO file if it exists
+                    delete_file(media.nfopath)
         return super().post(request, *args, **kwargs)
 
     def get_success_url(self):
@@ -497,6 +563,10 @@ class MediaRedownloadView(FormView, SingleObjectMixin):
         if self.object.media_file_exists:
             delete_file(self.object.media_file.path)
             self.object.media_file = None
+            # If the media has an associated thumbnail copied, also delete it
+            delete_file(self.object.thumbpath)
+            # If the media has an associated NFO file with it, also delete it
+            delete_file(self.object.nfopath)
         # Reset all download data
         self.object.downloaded = False
         self.object.downloaded_audio_codec = None
@@ -538,6 +608,10 @@ class MediaSkipView(FormView, SingleObjectMixin):
         if self.object.media_file_exists:
             delete_file(self.object.media_file.path)
             self.object.media_file = None
+            # If the media has an associated thumbnail copied, also delete it
+            delete_file(self.object.thumbpath)
+            # If the media has an associated NFO file with it, also delete it
+            delete_file(self.object.nfopath)
         # Reset all download data
         self.object.downloaded = False
         self.object.downloaded_audio_codec = None

tubesync/tubesync/local_settings.py.container

@@ -15,6 +15,7 @@ SECRET_KEY = str(os.getenv('DJANGO_SECRET_KEY', 'tubesync-django-secret'))
 ALLOWED_HOSTS_STR = str(os.getenv('TUBESYNC_HOSTS', '127.0.0.1,localhost'))
 ALLOWED_HOSTS = ALLOWED_HOSTS_STR.split(',')
 DEBUG = True if os.getenv('TUBESYNC_DEBUG', False) else False
+FORCE_SCRIPT_NAME = os.getenv('DJANGO_FORCE_SCRIPT_NAME', None)
 
 
 TIME_ZONE = os.getenv('TZ', 'UTC')

tubesync/tubesync/settings.py

@@ -6,7 +6,7 @@ CONFIG_BASE_DIR = BASE_DIR
 DOWNLOADS_BASE_DIR = BASE_DIR
 
 
-VERSION = 0.3
+VERSION = 0.6
 SECRET_KEY = ''
 DEBUG = False
 ALLOWED_HOSTS = []
@@ -41,6 +41,7 @@ MIDDLEWARE = [
 
 
 ROOT_URLCONF = 'tubesync.urls'
+FORCE_SCRIPT_NAME = None
 
 
 TEMPLATES = [
@@ -147,6 +148,9 @@ YOUTUBE_DEFAULTS = {
 }
 
 
+MEDIA_FORMATSTR_DEFAULT = '{yyyymmdd}_{source}_{title}_{key}_{format}.{ext}'
+
+
 try:
     from .local_settings import *
 except ImportError as e: