stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix Autoplay

Browse Source
This commit is contained in:
Alhaziel01
2021-06-16 09:39:05 +02:00
parent cf125d1e2b
commit 8e020bb605
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/autoplay.py
+15 -8
View File
@@ -49,16 +49,22 @@ def start(itemlist, item):
if not blacklisted_servers: blacklisted_servers = [] if not blacklisted_servers: blacklisted_servers = []
from core import servertools from core import servertools
favorite_servers = config.get_setting('favorites_servers_list', server='servers')
servers_list = list(servertools.get_servers_list().items()) servers_list = list(servertools.get_servers_list().items())
for server, server_parameters in servers_list: for server, server_parameters in servers_list:
if config.get_setting('favorites_servers_list', server=server): if config.get_setting('favorites_servers_list', server=server) and server.lower() not in favorite_servers:
favorite_servers.append(server.lower()) favorite_servers.append(server.lower())
if not favorite_servers: if not favorite_servers:
config.set_setting('favorites_servers_list', [], server='servers') config.set_setting('favorites_servers_list', [], server='servers')
favorite_servers = [] favorite_servers = []
else: else:
favorite_servers = list(set(favorite_servers) - set(blacklisted_servers)) s_list = []
for s in favorite_servers:
if s not in blacklisted_servers:
s_list.append(s)
favorite_servers = s_list
# Save the current value of "Action and Player Mode" in preferences # Save the current value of "Action and Player Mode" in preferences
user_config_setting_action = config.get_setting("default_action") user_config_setting_action = config.get_setting("default_action")
@@ -75,6 +81,7 @@ def start(itemlist, item):
# 2: Servers only # 2: Servers only
# 3: Only qualities # 3: Only qualities
# 4: Do not order # 4: Do not order
if config.get_setting('favorites_servers') and favorite_servers and config.get_setting('default_action'): if config.get_setting('favorites_servers') and favorite_servers and config.get_setting('default_action'):
priority = 0 # 0: Servers and qualities or 1: Qualities and servers priority = 0 # 0: Servers and qualities or 1: Qualities and servers
elif config.get_setting('favorites_servers') and favorite_servers: elif config.get_setting('favorites_servers') and favorite_servers:
@@ -87,7 +94,6 @@ def start(itemlist, item):
if config.get_setting('default_action') == 1: if config.get_setting('default_action') == 1:
quality_list.reverse() quality_list.reverse()
favorite_quality = quality_list favorite_quality = quality_list
for item in itemlist: for item in itemlist:
autoplay_elem = dict() autoplay_elem = dict()
b_dict = dict() b_dict = dict()
@@ -109,7 +115,7 @@ def start(itemlist, item):
# if the server and the quality are not in the favorites lists or the url is repeated, we discard the item # if the server and the quality are not in the favorites lists or the url is repeated, we discard the item
if item.server.lower() not in favorite_servers or item.quality.lower() not in favorite_quality or item.url in url_list_valid: if item.server.lower() not in favorite_servers or item.quality.lower() not in favorite_quality or item.url in url_list_valid:
item.type_b = True item.type_b = True
item.play_from = base_item.play_from item.window = base_item.window
b_dict['videoitem']= item b_dict['videoitem']= item
autoplay_b.append(b_dict) autoplay_b.append(b_dict)
continue continue
@@ -121,7 +127,7 @@ def start(itemlist, item):
# if the server is not in the favorites list or the url is repeated, we discard the item # if the server is not in the favorites list or the url is repeated, we discard the item
if item.server.lower() not in favorite_servers or item.url in url_list_valid: if item.server.lower() not in favorite_servers or item.url in url_list_valid:
item.type_b = True item.type_b = True
item.play_from = base_item.play_from item.window = base_item.window
b_dict['videoitem'] = item b_dict['videoitem'] = item
autoplay_b.append(b_dict) autoplay_b.append(b_dict)
continue continue
@@ -132,7 +138,7 @@ def start(itemlist, item):
# if the quality is not in the favorites list or the url is repeated, we discard the item # if the quality is not in the favorites list or the url is repeated, we discard the item
if item.quality.lower() not in favorite_quality or item.url in url_list_valid: if item.quality.lower() not in favorite_quality or item.url in url_list_valid:
item.type_b = True item.type_b = True
item.play_from = base_item.play_from item.window = base_item.window
b_dict['videoitem'] = item b_dict['videoitem'] = item
autoplay_b.append(b_dict) autoplay_b.append(b_dict)
continue continue
@@ -141,14 +147,14 @@ def start(itemlist, item):
else: # Do not order else: # Do not order
# if the url is repeated, we discard the item # if the url is repeated, we discard the item
item.play_from = base_item.play_from item.window = base_item.window
if item.url in url_list_valid: if item.url in url_list_valid:
continue continue
# If the item reaches here we add it to the list of valid urls and to autoplay_list # If the item reaches here we add it to the list of valid urls and to autoplay_list
url_list_valid.append(item.url) url_list_valid.append(item.url)
item.plan_b=True item.plan_b=True
item.play_from = base_item.play_from item.window = base_item.window
autoplay_elem['videoitem'] = item autoplay_elem['videoitem'] = item
autoplay_list.append(autoplay_elem) autoplay_list.append(autoplay_elem)
@@ -241,6 +247,7 @@ def start(itemlist, item):
play_item = base_item.clone(**videoitem.__dict__) play_item = base_item.clone(**videoitem.__dict__)
platformtools.play_video(play_item, autoplay=True) platformtools.play_video(play_item, autoplay=True)
else: else:
videoitem.window = base_item.window
# If it doesn't come from the video library, just play # If it doesn't come from the video library, just play
platformtools.play_video(videoitem, autoplay=True) platformtools.play_video(videoitem, autoplay=True)
except: except: