chibicitiberiu/ytsm
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/ytsm.git synced 2024-02-24 05:43:31 +00:00
Code Issues Releases Wiki Activity

Fixed multiple problems related to migration to django-preferences.

Browse Source
This commit is contained in:
Tiberiu Chibici
2018-12-29 23:16:04 +02:00
parent 10fced57e1
commit 2c93e50406
12 changed files with 77 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/YtManager/settings.py
View File

@@ -153,17 +153,23 @@ _DEFAULT_DATABASE = {
CONFIG_ERRORS = []
CONFIG_WARNINGS = []
# These are just to make inspector happy, they will be set in the load_config_ini() method
DEBUG = None
SECRET_KEY = None
DATABASES = None
LOG_LEVEL = None
#
# Config parser options
#
CFG_PARSER_OPTS = {
'PROJECT_ROOT' : PROJECT_ROOT,
'BASE_DIR' : BASE_DIR,
'CONFIG_DIR' : CONFIG_DIR,
'DATA_DIR' : DATA_DIR,
'PROJECT_ROOT': PROJECT_ROOT,
'BASE_DIR': BASE_DIR,
'CONFIG_DIR': CONFIG_DIR,
'DATA_DIR': DATA_DIR,
}
#
# Load globals from config.ini
#
@@ -225,7 +231,7 @@ def load_config_ini():
logging.info(f"Using data directory {DATA_DIR}")
except OSError as e:
print(f'CRITICAL ERROR! Cannot create data directory {DATA_DIR}! {e}', file=sys.stderr)
return;
return
cfg = ConfigParser(allow_no_value=True, interpolation=ExtendedInterpolatorWithEnv())
@@ -252,7 +258,8 @@ def load_config_ini():
}
if cfg.has_option('global', 'DatabaseURL'):
DATABASES['default'] = dj_database_url.parse(cfg.get('global', 'DatabaseURL', vars=CFG_PARSER_OPTS), conn_max_age=600)
DATABASES['default'] = dj_database_url.parse(cfg.get('global', 'DatabaseURL', vars=CFG_PARSER_OPTS),
conn_max_age=600)
else:
DATABASES['default'] = {

7
app/YtManagerApp/management/appconfig.py
View File

@@ -29,6 +29,13 @@ class AppConfig(object):
else:
super().__setattr__(key, value)
def for_sub(self, subscription, pref: str):
value = getattr(subscription, pref)
if value is None:
value = subscription.user.preferences[pref]
return value
global_prefs = global_preferences_registry.manager()
appconfig = AppConfig(global_prefs)

25
app/YtManagerApp/migrations/0008_auto_20181229_2035.py Normal file
View File

@@ -0,0 +1,25 @@
# Generated by Django 2.1.2 on 2018-12-29 20:35
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('YtManagerApp', '0007_auto_20181029_1638'),
]
operations = [
migrations.RemoveField(
model_name='usersettings',
name='user',
),
migrations.RenameField(
model_name='subscription',
old_name='delete_after_watched',
new_name='automatically_delete_watched',
),
migrations.DeleteModel(
name='UserSettings',
),
]

22
app/YtManagerApp/models.py
View File

@@ -116,7 +116,7 @@ class Subscription(models.Model):
null=True, blank=True,
max_length=128,
choices=VIDEO_ORDER_CHOICES)
delete_after_watched = models.BooleanField(null=True, blank=True)
automatically_delete_watched = models.BooleanField(null=True, blank=True)
def __str__(self):
return self.name
@@ -161,18 +161,6 @@ class Subscription(models.Model):
def delete_subscription(self, keep_downloaded_videos: bool):
self.delete()
def get_overloads_dict(self) -> dict:
d = {}
if self.auto_download is not None:
d['AutoDownload'] = self.auto_download
if self.download_limit is not None:
d['DownloadSubscriptionLimit'] = self.download_limit
if self.download_order is not None:
d['DownloadOrder'] = self.download_order
if self.delete_after_watched is not None:
d['DeleteWatched'] = self.delete_after_watched
return d
class Video(models.Model):
video_id = models.TextField(null=False)
@@ -209,11 +197,11 @@ class Video(models.Model):
self.watched = True
self.save()
if self.downloaded_path is not None:
from YtManagerApp.appconfig import settings
from YtManagerApp.management.appconfig import appconfig
from YtManagerApp.management.jobs.delete_video import schedule_delete_video
from YtManagerApp.management.jobs.synchronize import schedule_synchronize_now_subscription
if settings.getboolean_sub(self.subscription, 'user', 'DeleteWatched'):
if appconfig.for_sub(self.subscription, 'automatically_delete_watched'):
schedule_delete_video(self)
schedule_synchronize_now_subscription(self.subscription)
@@ -233,13 +221,13 @@ class Video(models.Model):
def delete_files(self):
if self.downloaded_path is not None:
from YtManagerApp.management.jobs.delete_video import schedule_delete_video
from YtManagerApp.appconfig import settings
from YtManagerApp.management.appconfig import appconfig
from YtManagerApp.management.jobs.synchronize import schedule_synchronize_now_subscription
schedule_delete_video(self)
# Mark watched?
if settings.getboolean_sub(self, 'user', 'MarkDeletedAsWatched'):
if appconfig.mark_deleted_as_watched:
self.watched = True
schedule_synchronize_now_subscription(self.subscription)

2
app/YtManagerApp/templates/YtManagerApp/index.html
View File

@@ -3,7 +3,7 @@
{% load crispy_forms_tags %}
{% block stylesheets %}
<link rel="stylesheet" href="{% static 'YtManagerApp/import/jstree/dist/themes/default/style.min.js' %}" />
<link rel="stylesheet" href="{% static 'YtManagerApp/import/jstree/dist/themes/default/style.min.css' %}" />
{% endblock %}
{% block scripts %}

2
app/YtManagerApp/tests.py
View File

@@ -1,3 +1 @@
from django.test import TestCase
# Create your tests here.

4
app/YtManagerApp/utils/__init__.py
View File

@@ -1,9 +1,9 @@
def first_non_null(*iterable):
'''
"""
Returns the first element from the iterable which is not None.
If all the elements are 'None', 'None' is returned.
:param iterable: Iterable containing list of elements.
:return: First non-null element, or None if all elements are 'None'.
'''
"""
return next((item for item in iterable if item is not None), None)

8
app/YtManagerApp/utils/subscription_file_parser.py
View File

@@ -1,4 +1,4 @@
from typing import Iterable
from typing import Iterable, Optional
from xml.etree import ElementTree
import re
@@ -12,7 +12,7 @@ class SubFileParser(object):
def probe(self, file_handle) -> bool:
"""
Tests if file matches file format.
:param file: File path
:param file_handle: File handle
:return: True if file matches, false otherwise
"""
return False
@@ -20,7 +20,7 @@ class SubFileParser(object):
def parse(self, file_handle) -> Iterable[str]:
"""
Parses file and returns a list of subscription URLs.
:param file:
:param file_handle:
:return:
"""
return []
@@ -63,7 +63,7 @@ class OPMLParser(SubFileParser):
"""
def __init__(self):
self.__cached_file = None
self.__cached_tree: ElementTree.ElementTree = None
self.__cached_tree: Optional[ElementTree.ElementTree] = None
def __parse(self, file_handle):
if file_handle == self.__cached_file:

4
app/YtManagerApp/utils/youtube.py
View File

@@ -7,8 +7,8 @@ class YoutubeAPI(YouTube):
@staticmethod
def build_public() -> 'YoutubeAPI':
from YtManagerApp.management.appconfig import youtube_api_key
return YoutubeAPI(key=youtube_api_key)
from YtManagerApp.management.appconfig import appconfig
return YoutubeAPI(key=appconfig.youtube_api_key)
# @staticmethod
# def build_oauth() -> 'YoutubeAPI':

4
app/YtManagerApp/views/controls/modal.py
View File

@@ -39,8 +39,8 @@ class ModalMixin(ContextMixin):
result = {'success': success}
if not success:
result['errors'] = form.errors.get_json_data(escape_html=True)
if error_msg is not None:
result['errors']['__all__'] = [{'message': error_msg}]
if error_msg is not None:
result['errors']['__all__'] = [{'message': error_msg}]
return JsonResponse(result)

6
app/YtManagerApp/views/first_time.py
View File

@@ -14,7 +14,11 @@ from YtManagerApp.views.forms.first_time import WelcomeForm, ApiKeyForm, PickAdm
logger = logging.getLogger("FirstTimeWizard")
class WizardStepMixin(object):
class WizardStepMixin:
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
def get(self, request, *args, **kwargs):
# Prevent access if application is already initialized

14
app/YtManagerApp/views/index.py
View File

@@ -227,6 +227,10 @@ class DeleteFolderModal(LoginRequiredMixin, ModalMixin, FormMixin, DeleteView):
model = SubscriptionFolder
form_class = DeleteFolderForm
def __init__(self, *args, **kwargs):
self.object = None
super().__init__(*args, **kwargs)
def delete(self, request, *args, **kwargs):
self.object = self.get_object()
form = self.get_form()
@@ -246,7 +250,7 @@ class CreateSubscriptionForm(forms.ModelForm):
class Meta:
model = Subscription
fields = ['parent_folder', 'auto_download',
'download_limit', 'download_order', 'delete_after_watched']
'download_limit', 'download_order', "automatically_delete_watched"]
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -313,7 +317,7 @@ class UpdateSubscriptionForm(forms.ModelForm):
class Meta:
model = Subscription
fields = ['name', 'parent_folder', 'auto_download',
'download_limit', 'download_order', 'delete_after_watched']
'download_limit', 'download_order', "automatically_delete_watched"]
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -346,6 +350,10 @@ class DeleteSubscriptionModal(LoginRequiredMixin, ModalMixin, FormMixin, DeleteV
model = Subscription
form_class = DeleteSubscriptionForm
def __init__(self, *args, **kwargs):
self.object = None
super().__init__(*args, **kwargs)
def delete(self, request, *args, **kwargs):
self.object = self.get_object()
form = self.get_form()
@@ -445,7 +453,7 @@ class ImportSubscriptionsModal(LoginRequiredMixin, ModalMixin, FormView):
sub.auto_download = form.cleaned_data['auto_download']
sub.download_limit = form.cleaned_data['download_limit']
sub.download_order = form.cleaned_data['download_order']
sub.delete_after_watched = form.cleaned_data['delete_after_watched']
sub.automatically_delete_watched = form.cleaned_data["automatically_delete_watched"]
try:
sub.fetch_from_url(url, api)
except Exception as e: