diff --git a/plugin.video.alfa/core/servertools.py b/plugin.video.alfa/core/servertools.py index 07812302..64b5030c 100644 --- a/plugin.video.alfa/core/servertools.py +++ b/plugin.video.alfa/core/servertools.py @@ -144,10 +144,9 @@ def findvideos(data, skip=False): for serverid in servers_list: if not is_server_enabled(serverid): continue - if config.get_setting("black_list", server=serverid): + if config.get_setting("filter_servers") == True and config.get_setting("black_list", server=serverid): is_filter_servers = True continue - devuelve.extend(findvideosbyserver(data, serverid)) if skip and len(devuelve) >= skip: devuelve = devuelve[:skip] @@ -166,7 +165,6 @@ def findvideosbyserver(data, serverid): server_parameters = get_server_parameters(serverid) devuelve = [] - if "find_videos" in server_parameters: # Recorre los patrones for pattern in server_parameters["find_videos"].get("patterns", []): diff --git a/plugin.video.alfa/resources/media/channels/banner/cinefoxtv.png b/plugin.video.alfa/resources/media/channels/banner/cinefoxtv.png deleted file mode 100755 index 2e3dbfa3..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/cinefoxtv.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/copiapop.png b/plugin.video.alfa/resources/media/channels/banner/copiapop.png deleted file mode 100755 index 5ed89106..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/copiapop.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/cuelgame.png b/plugin.video.alfa/resources/media/channels/banner/cuelgame.png deleted file mode 100755 index 1a912ee3..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/cuelgame.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/descargasmix.png b/plugin.video.alfa/resources/media/channels/banner/descargasmix.png deleted file mode 100755 index 45a2d21c..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/descargasmix.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/filesmonster_catalogue.png b/plugin.video.alfa/resources/media/channels/banner/filesmonster_catalogue.png deleted file mode 100755 index e5993bcf..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/filesmonster_catalogue.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/mundiseries.png b/plugin.video.alfa/resources/media/channels/banner/mundiseries.png deleted file mode 100644 index aa698e5b..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/mundiseries.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/mundoflv.png b/plugin.video.alfa/resources/media/channels/banner/mundoflv.png deleted file mode 100755 index a983d662..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/mundoflv.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/peliculasdk.png b/plugin.video.alfa/resources/media/channels/banner/peliculasdk.png deleted file mode 100755 index e861c509..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/peliculasdk.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/peliculasrey.png b/plugin.video.alfa/resources/media/channels/banner/peliculasrey.png deleted file mode 100755 index a78e2197..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/peliculasrey.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/pelispekes.png b/plugin.video.alfa/resources/media/channels/banner/pelispekes.png deleted file mode 100755 index 21eaca72..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/pelispekes.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/plusdede.png b/plugin.video.alfa/resources/media/channels/banner/plusdede.png deleted file mode 100644 index 2f9d37de..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/plusdede.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/pordede.png b/plugin.video.alfa/resources/media/channels/banner/pordede.png deleted file mode 100755 index 71aacd64..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/pordede.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/seriecanal.png b/plugin.video.alfa/resources/media/channels/banner/seriecanal.png deleted file mode 100755 index 6fbbb8d3..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/seriecanal.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/seriesmeme.png b/plugin.video.alfa/resources/media/channels/banner/seriesmeme.png deleted file mode 100755 index a314d492..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/seriesmeme.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/seriesyonkis.png b/plugin.video.alfa/resources/media/channels/banner/seriesyonkis.png deleted file mode 100755 index dbcf8236..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/seriesyonkis.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/tupornotv.png b/plugin.video.alfa/resources/media/channels/banner/tupornotv.png deleted file mode 100755 index 96c679ec..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/tupornotv.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/tvsinpagar.png b/plugin.video.alfa/resources/media/channels/banner/tvsinpagar.png deleted file mode 100644 index ea43d487..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/tvsinpagar.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/banner/zentorrents.png b/plugin.video.alfa/resources/media/channels/banner/zentorrents.png deleted file mode 100755 index 95971665..00000000 Binary files a/plugin.video.alfa/resources/media/channels/banner/zentorrents.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/fanart/seriesyonkis.jpg b/plugin.video.alfa/resources/media/channels/fanart/seriesyonkis.jpg deleted file mode 100755 index 8526a8bd..00000000 Binary files a/plugin.video.alfa/resources/media/channels/fanart/seriesyonkis.jpg and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/cuelgame.png b/plugin.video.alfa/resources/media/channels/thumb/cuelgame.png deleted file mode 100755 index bd92d915..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/cuelgame.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/descargasmix.png b/plugin.video.alfa/resources/media/channels/thumb/descargasmix.png deleted file mode 100755 index 9ba3b48e..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/descargasmix.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/filesmonster_catalogue.png b/plugin.video.alfa/resources/media/channels/thumb/filesmonster_catalogue.png deleted file mode 100755 index c917cb24..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/filesmonster_catalogue.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/mocosoftx.png b/plugin.video.alfa/resources/media/channels/thumb/mocosoftx.png deleted file mode 100755 index 8bed38e7..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/mocosoftx.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/mundiseries.png b/plugin.video.alfa/resources/media/channels/thumb/mundiseries.png deleted file mode 100644 index 5e051bf6..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/mundiseries.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/peliculasrey.png b/plugin.video.alfa/resources/media/channels/thumb/peliculasrey.png deleted file mode 100755 index ea01ae6c..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/peliculasrey.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/pelisadicto.png b/plugin.video.alfa/resources/media/channels/thumb/pelisadicto.png deleted file mode 100755 index 0d421a94..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/pelisadicto.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/pelispekes.png b/plugin.video.alfa/resources/media/channels/thumb/pelispekes.png deleted file mode 100755 index 7b2dedee..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/pelispekes.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/plusdede.png b/plugin.video.alfa/resources/media/channels/thumb/plusdede.png deleted file mode 100644 index 7cbf5259..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/plusdede.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/pordede.png b/plugin.video.alfa/resources/media/channels/thumb/pordede.png deleted file mode 100755 index 16d545de..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/pordede.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/seriesmeme.png b/plugin.video.alfa/resources/media/channels/thumb/seriesmeme.png deleted file mode 100755 index cfa593b8..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/seriesmeme.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/seriesyonkis.png b/plugin.video.alfa/resources/media/channels/thumb/seriesyonkis.png deleted file mode 100755 index 2cecf9c7..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/seriesyonkis.png and /dev/null differ diff --git a/plugin.video.alfa/resources/media/channels/thumb/tvsinpagar.png b/plugin.video.alfa/resources/media/channels/thumb/tvsinpagar.png deleted file mode 100644 index 103e4d8b..00000000 Binary files a/plugin.video.alfa/resources/media/channels/thumb/tvsinpagar.png and /dev/null differ diff --git a/plugin.video.alfa/servers/anonfile.json b/plugin.video.alfa/servers/anonfile.json new file mode 100644 index 00000000..4e18d4f5 --- /dev/null +++ b/plugin.video.alfa/servers/anonfile.json @@ -0,0 +1,42 @@ +{ + "active": true, + "find_videos": { + "ignore_urls": [], + "patterns": [ + { + "pattern": "(https://(?:anonfile|bayfiles).com/\\w+)", + "url": "\\1" + } + ] + }, + "free": true, + "id": "anonfile", + "name": "anonfile", + "settings": [ + { + "default": false, + "enabled": true, + "id": "black_list", + "label": "@60654", + "type": "bool", + "visible": true + }, + { + "default": 0, + "enabled": true, + "id": "favorites_servers_list", + "label": "@60655", + "lvalues": [ + "No", + "1", + "2", + "3", + "4", + "5" + ], + "type": "list", + "visible": false + } + ], + "thumbnail": "https://anonfile.com/img/logo/logo-anonfile.png" +} diff --git a/plugin.video.alfa/servers/anonfile.py b/plugin.video.alfa/servers/anonfile.py new file mode 100644 index 00000000..385e3cb0 --- /dev/null +++ b/plugin.video.alfa/servers/anonfile.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +# -------------------------------------------------------- +# Conector anonfile By Alfa development Group +# -------------------------------------------------------- + +from core import httptools +from core import scrapertools +from platformcode import logger + + +def test_video_exists(page_url): + logger.info("(page_url='%s')" % page_url) + response = httptools.downloadpage(page_url) + if not response.sucess or "Not Found" in response.data or "File was deleted" in response.data or "is no longer available" in response.data: + return False, "[anonfile] El fichero no existe o ha sido borrado" + return True, "" + + +def get_video_url(page_url, premium=False, user="", password="", video_password=""): + logger.info("(page_url='%s')" % page_url) + video_urls = [] + data = httptools.downloadpage(page_url).data + patron = 'id="download-quality-(\w+).*?href="([^"]+)"' + match = scrapertools.find_multiple_matches(data, patron) + for calidad, media_url in match: + title = "%s [anonfile]" % (calidad) + video_urls.append([title, media_url, int(calidad.replace("p", ""))]) + + video_urls.sort(key=lambda x: x[2]) + for video_url in video_urls: + video_url[2] = 0 + logger.info("%s - %s" % (video_url[0], video_url[1])) + + return video_urls diff --git a/plugin.video.alfa/servers/fembed.json b/plugin.video.alfa/servers/fembed.json index b3ebbfcc..e54d5ad3 100644 --- a/plugin.video.alfa/servers/fembed.json +++ b/plugin.video.alfa/servers/fembed.json @@ -4,7 +4,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "((?:fembed|divload).com/v/[A-z0-9]+)", + "pattern": "((?:fembed|divload).com/v/[A-z0-9_-]+)", "url": "https://www.\\1" } ] diff --git a/plugin.video.alfa/servers/filepup.json b/plugin.video.alfa/servers/filepup.json new file mode 100644 index 00000000..35f9e32a --- /dev/null +++ b/plugin.video.alfa/servers/filepup.json @@ -0,0 +1,42 @@ +{ + "active": true, + "find_videos": { + "ignore_urls": [], + "patterns": [ + { + "pattern": "(https://www.filepup.net/play/\\w+)", + "url": "\\1" + } + ] + }, + "free": true, + "id": "filepup", + "name": "filepup", + "settings": [ + { + "default": false, + "enabled": true, + "id": "black_list", + "label": "@60654", + "type": "bool", + "visible": true + }, + { + "default": 0, + "enabled": true, + "id": "favorites_servers_list", + "label": "@60655", + "lvalues": [ + "No", + "1", + "2", + "3", + "4", + "5" + ], + "type": "list", + "visible": false + } + ], + "thumbnail": "http://static.filepup.net/fplogoV2s.png" +} diff --git a/plugin.video.alfa/servers/filepup.py b/plugin.video.alfa/servers/filepup.py new file mode 100644 index 00000000..e016e107 --- /dev/null +++ b/plugin.video.alfa/servers/filepup.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# -------------------------------------------------------- +# Conector filepup By Alfa development Group +# -------------------------------------------------------- + +from core import httptools +from core import scrapertools +from platformcode import logger + + +def test_video_exists(page_url): + logger.info("(page_url='%s')" % page_url) + response = httptools.downloadpage(page_url) + if "File was deleted" in response.data or "is no longer available" in response.data: + return False, "[filepup] El fichero no existe o ha sido borrado" + return True, "" + + +def get_video_url(page_url, premium=False, user="", password="", video_password=""): + logger.info("(page_url='%s')" % page_url) + video_urls = [] + page_url = page_url.replace("https","http") + "?wmode=transparent" + data = httptools.downloadpage(page_url).data + media_url = scrapertools.find_single_match(data, 'src: "([^"]+)"') + qualities = scrapertools.find_single_match(data, 'qualities: (\[.*?\])') + qualities = scrapertools.find_multiple_matches(qualities, ' "([^"]+)') + for calidad in qualities: + media = media_url + title = "%s [filepup]" % (calidad) + if "480" not in calidad: + med = media_url.split(".mp4") + media = med[0] + "-%s.mp4" %calidad + med[1] + media += "|Referer=%s" %page_url + media += "&User-Agent=" + httptools.get_user_agent() + video_urls.append([title, media, int(calidad.replace("p", ""))]) + video_urls.sort(key=lambda x: x[2]) + for video_url in video_urls: + video_url[2] = 0 + logger.info("%s - %s" % (video_url[0], video_url[1])) + return video_urls diff --git a/plugin.video.alfa/servers/nofile.json b/plugin.video.alfa/servers/nofile.json new file mode 100644 index 00000000..ac6349b2 --- /dev/null +++ b/plugin.video.alfa/servers/nofile.json @@ -0,0 +1,42 @@ +{ + "active": true, + "find_videos": { + "ignore_urls": [], + "patterns": [ + { + "pattern": "(https://nofile.io/f/\\w+)", + "url": "\\1" + } + ] + }, + "free": true, + "id": "nofile", + "name": "nofile", + "settings": [ + { + "default": false, + "enabled": true, + "id": "black_list", + "label": "@60654", + "type": "bool", + "visible": true + }, + { + "default": 0, + "enabled": true, + "id": "favorites_servers_list", + "label": "@60655", + "lvalues": [ + "No", + "1", + "2", + "3", + "4", + "5" + ], + "type": "list", + "visible": false + } + ], + "thumbnail": "https://nofile.io/img/icons/icon-128.png" +} diff --git a/plugin.video.alfa/servers/nofile.py b/plugin.video.alfa/servers/nofile.py new file mode 100644 index 00000000..af3cae83 --- /dev/null +++ b/plugin.video.alfa/servers/nofile.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# -------------------------------------------------------- +# Conector nofile By Alfa development Group +# -------------------------------------------------------- + +from core import httptools +from core import scrapertools +from platformcode import logger + + +def test_video_exists(page_url): + logger.info("(page_url='%s')" % page_url) + response = httptools.downloadpage(page_url) + if not response.sucess or "Not Found" in response.data or "File was deleted" in response.data or "is no longer available" in response.data: + return False, "[nofile] El fichero no existe o ha sido borrado" + return True, "" + + +def get_video_url(page_url, premium=False, user="", password="", video_password=""): + logger.info("(page_url='%s')" % page_url) + video_urls = [] + data = httptools.downloadpage(page_url).data + url = scrapertools.find_single_match(data, 'en VK (ha sido borrado)" return True, "" @@ -19,17 +21,29 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) video_urls = [] - try: - oid, id = scrapertools.find_single_match(page_url, 'oid=([^&]+)&id=(\d+)') - except: - oid, id = scrapertools.find_single_match(page_url, 'video(\d+)_(\d+)') - headers = {'User-Agent': 'Mozilla/5.0'} - url = "http://vk.com/al_video.php?act=show_inline&al=1&video=%s_%s" % (oid, id) - data = httptools.downloadpage(url, headers=headers).data + data = httptools.downloadpage(page_url).data matches = scrapertools.find_multiple_matches(data, '[^\"']+)[^>]+label=[\"'](?P