|
|
@@ -164,11 +164,10 @@ def update_subscriptions(subscriptions=None):
|
|
|
:type subscriptions: list
|
|
|
"""
|
|
|
database = Db.get_instance()
|
|
|
- conf = Conf.get_instance()
|
|
|
subscriptions_list = get_subscriptions(subscriptions)
|
|
|
for element in subscriptions_list:
|
|
|
LOGGER.debug(_("Updating subscription %s"), element.get_title())
|
|
|
- videos = database.get_videos(element.get_id(), conf)
|
|
|
+ videos = database.get_videos(element.get_id())
|
|
|
element.gather_videos(videos)
|
|
|
try:
|
|
|
element.update_data()
|
|
|
@@ -207,7 +206,7 @@ def download_videos(subscriptions=None):
|
|
|
videos_downloaded = 0
|
|
|
videos_failed = 0
|
|
|
for sub in subscriptions_list:
|
|
|
- videos = database.get_videos(sub.get_id(), conf)
|
|
|
+ videos = database.get_videos(sub.get_id())
|
|
|
sub.gather_videos(videos)
|
|
|
try:
|
|
|
sub.download_videos()
|
|
|
@@ -312,7 +311,6 @@ def list_videos(sub_id):
|
|
|
:type sub_id: int
|
|
|
"""
|
|
|
database = Db.get_instance()
|
|
|
- conf = Conf.get_instance()
|
|
|
try:
|
|
|
data = database.get_subscription(sub_id)
|
|
|
except stov_exceptions.DBWriteAccessFailedException as error:
|
|
|
@@ -326,7 +324,7 @@ def list_videos(sub_id):
|
|
|
subscription_id=data[0][0],
|
|
|
title=data[0][1], directory=data[0][5],
|
|
|
disabled=data[0][6])
|
|
|
- videos = database.get_videos(sub.get_id(), conf)
|
|
|
+ videos = database.get_videos(sub.get_id())
|
|
|
sub.gather_videos(videos)
|
|
|
videos_list = sub.print_videos()
|
|
|
for video in videos_list:
|
|
|
@@ -368,7 +366,7 @@ def clean_database():
|
|
|
"""
|
|
|
database = Db.get_instance()
|
|
|
conf = Conf.get_instance()
|
|
|
- subscription_list = database.get_subscriptions(conf)
|
|
|
+ subscription_list = database.get_subscriptions()
|
|
|
for element in subscription_list:
|
|
|
videos = database.get_videos(element.get_id(), conf)
|
|
|
element.check_and_delete(videos)
|
|
|
@@ -518,7 +516,6 @@ def get_subscriptions(subscriptions=None):
|
|
|
:rtype: list
|
|
|
"""
|
|
|
database = Db.get_instance()
|
|
|
- conf = Conf.get_instance()
|
|
|
if subscriptions:
|
|
|
subscriptions_list = []
|
|
|
for element in subscriptions:
|
|
|
@@ -536,5 +533,5 @@ def get_subscriptions(subscriptions=None):
|
|
|
_("Invalid subscription, please check the list and "
|
|
|
"try again."))
|
|
|
else:
|
|
|
- subscriptions_list = database.get_subscriptions(conf)
|
|
|
+ subscriptions_list = database.get_subscriptions()
|
|
|
return subscriptions_list
|
