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

Fix Download e Speedvideo

Browse Source
This commit is contained in:
Alhaziel01
2019-11-16 13:40:00 +01:00
parent d8a038921f
commit b583d6ecd5
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformcode/platformtools.py
+1 -1
View File
@@ -622,7 +622,7 @@ def set_context_commands(item, parent_item):
download='season').tourl()))) download='season').tourl())))
# Descargar episodio # Descargar episodio
elif item.contentType == 'episode' and item.action in ["findvideos"]: elif item.contentType == 'episode' and item.action in ["findvideos", "play"]:
item.contentType == "episode" item.contentType == "episode"
context_commands.append((config.get_localized_string(60356), "XBMC.RunPlugin(%s?%s)" % context_commands.append((config.get_localized_string(60356), "XBMC.RunPlugin(%s?%s)" %
(sys.argv[0], item.clone(channel="downloads", action="save_download", (sys.argv[0], item.clone(channel="downloads", action="save_download",
servers/speedvideo.py
+7 -3
View File
@@ -17,8 +17,11 @@ def test_video_exists(page_url):
def get_video_url(page_url, premium=False, user="", password="", video_password=""): def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("url=" + page_url) logger.info("url=" + page_url)
video_urls = [] video_urls = []
quality ={'MOBILE':1,
'NORMAL':2,
'HD':3}
data = httptools.downloadpage(page_url).data data = httptools.downloadpage(page_url).data
logger.info('SPEEDVIDEO DATA '+ data)
media_urls = scrapertools.find_multiple_matches(data, r"file:[^']'([^']+)',\s*label:[^\"]\"([^\"]+)\"") media_urls = scrapertools.find_multiple_matches(data, r"file:[^']'([^']+)',\s*label:[^\"]\"([^\"]+)\"")
logger.info("speed video - media urls: %s " % media_urls) logger.info("speed video - media urls: %s " % media_urls)
@@ -26,9 +29,10 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
media_url = httptools.downloadpage(media_url, only_headers=True, follow_redirects=False).headers.get("location", "") media_url = httptools.downloadpage(media_url, only_headers=True, follow_redirects=False).headers.get("location", "")
if media_url: if media_url:
video_urls.append([label + " " + media_url.rsplit('.', 1)[1] + ' [speedvideo]', media_url]) video_urls.append([media_url.split('.')[-1] + ' - ' + label + ' - ' + ' [Speedvideo]', media_url])
logger.info("speed video - media urls: %s " % video_urls) logger.info("speed video - media urls: %s " % video_urls)
return video_urls
return sorted(video_urls, key=lambda x: quality[x[0].split(' - ')[1]])
##, ##,
specials/downloads.py
+5 -4
View File
@@ -463,11 +463,11 @@ def sort_method(item):
order_list_calidad = ["BLURAY", "FULLHD", "HD", "480P", "360P", "240P"] order_list_calidad = ["BLURAY", "FULLHD", "HD", "480P", "360P", "240P"]
order_list_calidad = quality_orders[int(config.get_setting("quality", "downloads"))] order_list_calidad = quality_orders[int(config.get_setting("quality", "downloads"))]
match_list_calidad = {"BLURAY": ["BR", "BLURAY"], match_list_calidad = {"BLURAY": ["BR", "BLURAY", '4K'],
"FULLHD": ["FULLHD", "FULL HD", "1080", "HD1080", "HD 1080", "1080p"], "FULLHD": ["FULLHD", "FULL HD", "1080", "HD1080", "HD 1080", "1080p"],
"HD": ["HD", "HD REAL", "HD 720", "720", "HDTV", "720p"], "HD": ["HD", "HD REAL", "HD 720", "720", "HDTV", "720p"],
"480P": ["SD", "480P", '480'], "480P": ["SD", "480P", '480', 'NORMAL'],
"360P": ["360P", "360"], "360P": ["360P", "360", 'MOBILE'],
"240P": ["240P", "240"]} "240P": ["240P", "240"]}
value = (get_match_list(item.title, match_list_idimas, order_list_idiomas, ignorecase=True, only_ascii=True).index, \ value = (get_match_list(item.title, match_list_idimas, order_list_idiomas, ignorecase=True, only_ascii=True).index, \
@@ -627,7 +627,8 @@ def download_from_best_server(item):
progreso.update(100, config.get_localized_string(70183), config.get_localized_string(70181) % len(play_items), progreso.update(100, config.get_localized_string(70183), config.get_localized_string(70181) % len(play_items),
config.get_localized_string(70182)) config.get_localized_string(70182))
play_items.sort(key=sort_method) if config.get_setting("server_reorder", "downloads") == 1:
play_items.sort(key=sort_method)
if progreso.iscanceled(): if progreso.iscanceled():
return {"downloadStatus": STATUS_CODES.canceled} return {"downloadStatus": STATUS_CODES.canceled}