hoelee/tubesync
1
0
Fork 0
mirror of https://github.com/meeb/tubesync.git synced 2025-06-23 21:46:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Consistent formatting

Browse Source
This commit is contained in:
Tim 2024-07-12 16:18:37 +08:00
parent 9615aac8e9
commit 806e47de41
2 changed files with 67 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
tubesync/sync/filtering.py
View File

@ -1,12 +1,13 @@
''' """
All the logic for filtering media from channels to work out if we should skip downloading it or not All the logic for filtering media from channels to work out if we should skip downloading it or not
''' """
from common.logger import log from common.logger import log
from .models import Source, Media, MediaServer from .models import Media
from datetime import datetime, timedelta from datetime import datetime, timedelta
from django.utils import timezone from django.utils import timezone
# Check the filter conditions for instance, return is if the Skip property has changed so we can do other things # Check the filter conditions for instance, return is if the Skip property has changed so we can do other things
def filter_media(instance: Media): def filter_media(instance: Media):
# Assume we aren't skipping it, if any of these conditions are true, we skip it # Assume we aren't skipping it, if any of these conditions are true, we skip it
@ -24,7 +25,7 @@ def filter_media(instance: Media):
if filter_source_cutoff(instance): if filter_source_cutoff(instance):
skip = True skip = True
# Check if we have filter_text and filter text matches, set unskip # Check if we have filter_text and filter text matches
if filter_filter_text(instance): if filter_filter_text(instance):
skip = True skip = True
@ -35,7 +36,9 @@ def filter_media(instance: Media):
# Check if skipping # Check if skipping
if instance.skip != skip: if instance.skip != skip:
instance.skip = skip instance.skip = skip
log.info(f'Media: {instance.source} / {instance} has changed skip setting to {skip}') log.info(
f"Media: {instance.source} / {instance} has changed skip setting to {skip}"
)
return True return True
return False return False
@ -44,8 +47,10 @@ def filter_media(instance: Media):
def filter_published(instance: Media): def filter_published(instance: Media):
# Check if the instance is not published, we have to skip then # Check if the instance is not published, we have to skip then
if not isinstance(instance.published, datetime): if not isinstance(instance.published, datetime):
log.info(f'Media: {instance.source} / {instance} has no published date ' log.info(
f'set, marking to be skipped') f"Media: {instance.source} / {instance} has no published date "
f"set, marking to be skipped"
)
return True return True
return False return False
@ -59,12 +64,16 @@ def filter_filter_text(instance: Media):
# We match the filter text, so don't skip downloading this # We match the filter text, so don't skip downloading this
if instance.source.is_regex_match(instance.title): if instance.source.is_regex_match(instance.title):
log.info(f'Media: {instance.source} / {instance} has a valid ' log.info(
f'title filter, marking to be unskipped') f"Media: {instance.source} / {instance} has a valid "
f"title filter, not marking to be skipped"
)
return False return False
log.info(f'Media: {instance.source} / {instance} doesn\'t match ' log.info(
f'title filter, marking to be skipped') f"Media: {instance.source} / {instance} doesn't match "
f"title filter, marking to be skipped"
)
return True return True
@ -72,13 +81,17 @@ def filter_filter_text(instance: Media):
def filter_max_cap(instance: Media): def filter_max_cap(instance: Media):
max_cap_age = instance.source.download_cap_date max_cap_age = instance.source.download_cap_date
if not max_cap_age: if not max_cap_age:
log.debug(f'Media: {instance.source} / {instance} has not max_cap_age ' log.debug(
f'so not skipping based on max_cap_age') f"Media: {instance.source} / {instance} has not max_cap_age "
f"so not skipping based on max_cap_age"
)
return False return False
if instance.published <= max_cap_age: if instance.published <= max_cap_age:
log.info(f'Media: {instance.source} / {instance} is too old for ' log.info(
f'the download cap date, marking to be skipped') f"Media: {instance.source} / {instance} is too old for "
f"the download cap date, marking to be skipped"
)
return True return True
return False return False
@ -89,14 +102,18 @@ def filter_source_cutoff(instance: Media):
if instance.source.delete_old_media and instance.source.days_to_keep > 0: if instance.source.delete_old_media and instance.source.days_to_keep > 0:
if not isinstance(instance.published, datetime): if not isinstance(instance.published, datetime):
# Media has no known published date or incomplete metadata # Media has no known published date or incomplete metadata
log.info(f'Media: {instance.source} / {instance} has no published date, skipping') log.info(
f"Media: {instance.source} / {instance} has no published date, skipping"
)
return True return True
delta = timezone.now() - timedelta(days=instance.source.days_to_keep) delta = timezone.now() - timedelta(days=instance.source.days_to_keep)
if instance.published < delta: if instance.published < delta:
# Media was published after the cutoff date, skip it # Media was published after the cutoff date, skip it
log.info(f'Media: {instance.source} / {instance} is older than ' log.info(
f'{instance.source.days_to_keep} days, skipping') f"Media: {instance.source} / {instance} is older than "
f"{instance.source.days_to_keep} days, skipping"
)
return True return True
return False return False
@ -116,20 +133,26 @@ def filter_duration(instance: Media):
instance.duration = duration instance.duration = duration
instance.save() instance.save()
else: else:
log.info(f'Media: {instance.source} / {instance} has no duration stored, not skipping') log.info(
f"Media: {instance.source} / {instance} has no duration stored, not skipping"
)
return False return False
duration_limit = instance.source.filter_seconds duration_limit = instance.source.filter_seconds
if instance.source.filter_seconds_min and duration < duration_limit: if instance.source.filter_seconds_min and duration < duration_limit:
# Filter out videos that are shorter than the minimum # Filter out videos that are shorter than the minimum
log.info(f'Media: {instance.source} / {instance} is shorter ({duration}) than ' log.info(
f'the minimum duration ({duration_limit}), skipping') f"Media: {instance.source} / {instance} is shorter ({duration}) than "
f"the minimum duration ({duration_limit}), skipping"
)
return True return True
if not instance.source.filter_seconds_min and duration > duration_limit: if not instance.source.filter_seconds_min and duration > duration_limit:
# Filter out videos that are greater than the maximum # Filter out videos that are greater than the maximum
log.info(f'Media: {instance.source} / {instance} is longer ({duration}) than ' log.info(
f'the maximum duration ({duration_limit}), skipping') f"Media: {instance.source} / {instance} is longer ({duration}) than "
f"the maximum duration ({duration_limit}), skipping"
)
return True return True
return False return False

40
tubesync/sync/migrations/0023_media_duration_filter.py
View File

@ -3,51 +3,51 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('sync', '0022_add_delete_files_on_disk'), ("sync", "0022_add_delete_files_on_disk"),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='media', model_name="media",
name='title', name="title",
field=models.CharField( field=models.CharField(
verbose_name='title', verbose_name="title",
max_length=100, max_length=100,
blank=True, blank=True,
null=False, null=False,
default='', default="",
help_text='Video title' help_text="Video title",
), ),
), ),
migrations.AddField( migrations.AddField(
model_name='media', model_name="media",
name='duration', name="duration",
field=models.PositiveIntegerField( field=models.PositiveIntegerField(
verbose_name='duration', verbose_name="duration",
blank=True, blank=True,
null=True, null=True,
help_text='Duration of media in seconds' help_text="Duration of media in seconds",
), ),
), ),
migrations.AddField( migrations.AddField(
model_name='source', model_name="source",
name='filter_seconds', name="filter_seconds",
field=models.PositiveIntegerField( field=models.PositiveIntegerField(
verbose_name='filter seconds', verbose_name="filter seconds",
blank=True, blank=True,
null=True, null=True,
help_text='Filter Media based on Min/Max duration. Leave blank or 0 to disable filtering' help_text="Filter Media based on Min/Max duration. Leave blank or 0 to disable filtering",
), ),
), ),
migrations.AddField( migrations.AddField(
model_name='source', model_name="source",
name='filter_seconds_min', name="filter_seconds_min",
field=models.BooleanField( field=models.BooleanField(
verbose_name='filter seconds min/max', verbose_name="filter seconds min/max",
choices=[(True, 'Minimum Length'), (False, 'Maximum Length')], choices=[(True, "Minimum Length"), (False, "Maximum Length")],
default=True, default=True,
help_text='When Filter Seconds is > 0, do we skip on minimum (video shorter than limit) or maximum (' help_text="When Filter Seconds is > 0, do we skip on minimum (video shorter than limit) or maximum ("
'video greater than maximum) video duration' "video greater than maximum) video duration",
), ),
), ),
] ]