diff --git a/servers/akvideo.json b/servers/akvideo.json index 1a75b82c..337ca196 100644 --- a/servers/akvideo.json +++ b/servers/akvideo.json @@ -46,6 +46,5 @@ "visible": false } ], - "thumbnail": "server_akvideo.png", "cloudflare": true } diff --git a/servers/anavids.json b/servers/anavids.json index 90ffd75f..bdc73b86 100644 --- a/servers/anavids.json +++ b/servers/anavids.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://supervideo.tv/images/logo-player.png" + ] } diff --git a/servers/animeid.json b/servers/animeid.json index 3c27c843..21086eba 100644 --- a/servers/animeid.json +++ b/servers/animeid.json @@ -11,7 +11,7 @@ }, "free": true, "id": "animeid", - "name": "animeid", + "name": "AnimeID", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/animeworld_server.json b/servers/animeworld_server.json index 5cd743d4..63aba311 100644 --- a/servers/animeworld_server.json +++ b/servers/animeworld_server.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/anonfile.json b/servers/anonfile.json index 4e18d4f5..5a7cd15a 100644 --- a/servers/anonfile.json +++ b/servers/anonfile.json @@ -11,7 +11,7 @@ }, "free": true, "id": "anonfile", - "name": "anonfile", + "name": "AnonFile", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://anonfile.com/img/logo/logo-anonfile.png" + ] } diff --git a/servers/archiveorg.json b/servers/archiveorg.json index 73f07ffa..ef60d243 100644 --- a/servers/archiveorg.json +++ b/servers/archiveorg.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://i.postimg.cc/P5ZYJM4L/archiveorg.png" + ] } diff --git a/servers/backin.json b/servers/backin.json index e61cc7bb..050a3e71 100644 --- a/servers/backin.json +++ b/servers/backin.json @@ -15,7 +15,7 @@ }, "free": true, "id": "backin", - "name": "backin", + "name": "Backin", "settings": [ { "default": false, diff --git a/servers/badshare.json b/servers/badshare.json index 78624986..ae4265e9 100644 --- a/servers/badshare.json +++ b/servers/badshare.json @@ -11,7 +11,7 @@ }, "free": true, "id": "badshare", - "name": "badshare", + "name": "BadShare", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://badshare.io/badshare_logo.png" + ] } diff --git a/servers/bdupload.json b/servers/bdupload.json index 8bb33b1b..c9708b6b 100644 --- a/servers/bdupload.json +++ b/servers/bdupload.json @@ -15,7 +15,7 @@ }, "free": true, "id": "bdupload", - "name": "bdupload", + "name": "BDUpload", "settings": [ { "default": false, @@ -42,6 +42,6 @@ "visible": false } ], - "thumbnail": "https://s18.postimg.cc/68colqvyx/logo-bdupload.png", + "version": 1 } diff --git a/servers/cinemaupload.json b/servers/cinemaupload.json index 34350d1e..448525a8 100644 --- a/servers/cinemaupload.json +++ b/servers/cinemaupload.json @@ -15,7 +15,7 @@ }, "free": true, "id": "cinemaupload", - "name": "cinemaupload", + "name": "CinemaUpload", "settings": [ { "default": false, @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://cinemaupload.com/static/img/logo1.png" + ] } diff --git a/servers/clicknupload.json b/servers/clicknupload.json index a3ccd30e..068bd3e5 100644 --- a/servers/clicknupload.json +++ b/servers/clicknupload.json @@ -11,7 +11,7 @@ }, "free": true, "id": "clicknupload", - "name": "clicknupload", + "name": "Clicknupload", "premium": [ "realdebrid", "alldebrid" diff --git a/servers/clipwatching.json b/servers/clipwatching.json index 4d455db9..87c03421 100644 --- a/servers/clipwatching.json +++ b/servers/clipwatching.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_clipwatching.png" + ] } diff --git a/servers/cloudvideo.json b/servers/cloudvideo.json index 974dea77..6016fbdd 100644 --- a/servers/cloudvideo.json +++ b/servers/cloudvideo.json @@ -11,7 +11,7 @@ }, "free": true, "id": "cloudvideo", - "name": "cloudvideo", + "name": "Cloudvideo", "settings": [ { "default": false, @@ -37,6 +37,6 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_cloudvideo.png" + ] } + diff --git a/servers/crunchyroll.json b/servers/crunchyroll.json index 330afc53..895e132e 100644 --- a/servers/crunchyroll.json +++ b/servers/crunchyroll.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://i.imgur.com/SglkLAb.png?1" + ] } \ No newline at end of file diff --git a/servers/dailymotion.json b/servers/dailymotion.json index a7b7c161..25e8b935 100644 --- a/servers/dailymotion.json +++ b/servers/dailymotion.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_dailymotion.png" + ] } \ No newline at end of file diff --git a/servers/deltabit.json b/servers/deltabit.json index f1f5a56d..f392a7d1 100644 --- a/servers/deltabit.json +++ b/servers/deltabit.json @@ -11,7 +11,7 @@ }, "free": true, "id": "deltabit", - "name": "deltabit", + "name": "Deltabit", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://deltabit.co/img/logo.png" + ] } diff --git a/servers/dostream.json b/servers/dostream.json index cab92b60..4c9745bd 100644 --- a/servers/dostream.json +++ b/servers/dostream.json @@ -11,7 +11,7 @@ }, "free": true, "id": "dostream", - "name": "dostream", + "name": "DoStream", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s14.postimg.cc/lczc08bsx/dostream.png" + ] } diff --git a/servers/downace.json b/servers/downace.json index 64795d93..721dd84e 100644 --- a/servers/downace.json +++ b/servers/downace.json @@ -11,7 +11,7 @@ }, "free": true, "id": "downace", - "name": "downace", + "name": "Downace", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s12.postimg.cc/4n9fmdy7x/logo-downace.png" + ] } diff --git a/servers/fastplay.json b/servers/fastplay.json index 274c91e6..411c2f40 100755 --- a/servers/fastplay.json +++ b/servers/fastplay.json @@ -11,7 +11,7 @@ }, "free": true, "id": "fastplay", - "name": "fastplay", + "name": "FastPlay", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://i.imgur.com/vHDcd6Y.png?1" + ] } \ No newline at end of file diff --git a/servers/fembed.json b/servers/fembed.json index 070ab7cd..918c62ed 100644 --- a/servers/fembed.json +++ b/servers/fembed.json @@ -38,6 +38,5 @@ "visible": false } ], - "thumbnail": "server_fembed.png", "version": 1 } diff --git a/servers/fex.json b/servers/fex.json index 936e48cc..a22348de 100644 --- a/servers/fex.json +++ b/servers/fex.json @@ -38,6 +38,6 @@ "visible": false } ], - "thumbnail": "https://i.postimg.cc/pdswzj8G/fex.png", + "version": 1 } diff --git a/servers/filefactory.json b/servers/filefactory.json index 277e1f52..99b7b565 100644 --- a/servers/filefactory.json +++ b/servers/filefactory.json @@ -11,7 +11,7 @@ }, "free": false, "id": "filefactory", - "name": "filefactory", + "name": "FileFactory", "premium": [ "realdebrid", "alldebrid" @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_filefactory.png" + ] } \ No newline at end of file diff --git a/servers/filepup.json b/servers/filepup.json index 35f9e32a..945f5994 100644 --- a/servers/filepup.json +++ b/servers/filepup.json @@ -11,7 +11,7 @@ }, "free": true, "id": "filepup", - "name": "filepup", + "name": "FilePup", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://static.filepup.net/fplogoV2s.png" + ] } diff --git a/servers/filescdn.json b/servers/filescdn.json index 273cd598..c1810508 100644 --- a/servers/filescdn.json +++ b/servers/filescdn.json @@ -11,7 +11,7 @@ }, "free": true, "id": "filescdn", - "name": "filescdn", + "name": "Files CDN", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s31.postimg.cc/ijne6piij/filescdn.png" + ] } \ No newline at end of file diff --git a/servers/flashx.json b/servers/flashx.json index ef08a819..b1a9e13d 100644 --- a/servers/flashx.json +++ b/servers/flashx.json @@ -15,7 +15,7 @@ }, "free": true, "id": "flashx", - "name": "flashx", + "name": "FlashX", "premium": [ "realdebrid" ], @@ -44,6 +44,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_flashx.png" + ] } diff --git a/servers/fourshared.json b/servers/fourshared.json index 2ae11d2b..4b60a6e5 100644 --- a/servers/fourshared.json +++ b/servers/fourshared.json @@ -21,7 +21,7 @@ }, "free": true, "id": "fourshared", - "name": "fourshared", + "name": "4shared", "premium": [ "realdebrid", "alldebrid" diff --git a/servers/gamovideo.json b/servers/gamovideo.json index 510e6307..5432f2fc 100755 --- a/servers/gamovideo.json +++ b/servers/gamovideo.json @@ -11,7 +11,7 @@ }, "free": true, "id": "gamovideo", - "name": "gamovideo", + "name": "GamoVideo", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_gamovideo.png" + ] } diff --git a/servers/gigasize.json b/servers/gigasize.json index 605c7826..0b2b0576 100644 --- a/servers/gigasize.json +++ b/servers/gigasize.json @@ -15,7 +15,7 @@ }, "free": false, "id": "gigasize", - "name": "gigasize", + "name": "GigaSize", "premium": [ "realdebrid", "alldebrid" diff --git a/servers/googlevideo.json b/servers/googlevideo.json index 8709259c..8886b7d5 100644 --- a/servers/googlevideo.json +++ b/servers/googlevideo.json @@ -11,7 +11,7 @@ }, "free": true, "id": "googlevideo", - "name": "googlevideo", + "name": "Google Video", "settings": [ { "default": false, diff --git a/servers/gounlimited.json b/servers/gounlimited.json index 704f516a..d2b5fec0 100644 --- a/servers/gounlimited.json +++ b/servers/gounlimited.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_gounlimited.png" + ] } \ No newline at end of file diff --git a/servers/gvideo.json b/servers/gvideo.json index 0ebb89cc..22fc4bb3 100644 --- a/servers/gvideo.json +++ b/servers/gvideo.json @@ -27,7 +27,7 @@ }, "free": true, "id": "gvideo", - "name": "gvideo", + "name": "G Video", "premium": [ "realdebrid", "alldebrid" @@ -57,6 +57,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s11.postimg.cc/giobzkprz/logo-google1.png" + ] } diff --git a/servers/hdload.json b/servers/hdload.json index cc927016..167caf95 100644 --- a/servers/hdload.json +++ b/servers/hdload.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_hdload" + ] } diff --git a/servers/hdmario.json b/servers/hdmario.json index c2f2c2ad..3fb9ec50 100644 --- a/servers/hdmario.json +++ b/servers/hdmario.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/hdplayer.json b/servers/hdplayer.json index 070aa43f..1353ffba 100644 --- a/servers/hdplayer.json +++ b/servers/hdplayer.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_hdload" + ] } diff --git a/servers/hugefiles.json b/servers/hugefiles.json index 4656c17e..6be802b5 100644 --- a/servers/hugefiles.json +++ b/servers/hugefiles.json @@ -11,7 +11,7 @@ }, "free": false, "id": "hugefiles", - "name": "hugefiles", + "name": "Huge Files", "premium": [ "realdebrid" ], @@ -40,6 +40,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_hugefiles.png" + ] } \ No newline at end of file diff --git a/servers/idtbox.json b/servers/idtbox.json index 53accbfe..0dea7d55 100644 --- a/servers/idtbox.json +++ b/servers/idtbox.json @@ -11,7 +11,7 @@ }, "free": true, "id": "idtbox", - "name": "idtbox", + "name": "ID Tbox", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://idtbox.com/img/idtbox.png" + ] } diff --git a/servers/jawcloud.json b/servers/jawcloud.json index 3214a828..975bc12e 100644 --- a/servers/jawcloud.json +++ b/servers/jawcloud.json @@ -11,7 +11,7 @@ }, "free": true, "id": "jawcloud", - "name": "jawcloud", + "name": "JawCloud", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s8.postimg.cc/b64mzlgxh/jawcloud1.png" + ] } diff --git a/servers/jetload.json b/servers/jetload.json index 9c480a48..447cbe94 100644 --- a/servers/jetload.json +++ b/servers/jetload.json @@ -11,7 +11,7 @@ }, "free": true, "id": "jetload", - "name": "jetload", + "name": "Jetload", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://jetload.net/jetlogo.png" + ] } diff --git a/servers/mailru.json b/servers/mailru.json index 655860c2..624d731d 100644 --- a/servers/mailru.json +++ b/servers/mailru.json @@ -15,7 +15,7 @@ }, "free": true, "id": "mailru", - "name": "mailru", + "name": "Mailru", "settings": [ { "default": false, @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s26.postimg.cc/6ebn509jd/mailru1.png" + ] } diff --git a/servers/mangoplay.json b/servers/mangoplay.json deleted file mode 100644 index 7951e921..00000000 --- a/servers/mangoplay.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "(mangoplay.net(?://|/)embed.php\\?data=[A-z0-9_-]+)", - "url": "https://\\1" - } - ] - }, - "free": true, - "id": "mangoplay", - "name": "mangoplay", - "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": "" -} diff --git a/servers/mangoplay.py b/servers/mangoplay.py deleted file mode 100644 index 1373175e..00000000 --- a/servers/mangoplay.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# -------------------------------------------------------- -# Conector mangoplay By Alfa development Group -# -------------------------------------------------------- -from core import httptools -from core import scrapertools -from platformcode import config -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url).data - if "no longer exists" in data or "to copyright issues" in data: - return False, config.get_localized_string(70449) % "mangoplay" - return True, "" - - -def get_video_url(page_url, 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, 'shareId = "([^"]+)') - url = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers.get("location", "") - url = url.replace(" ","%20") - video_urls.append([".MP4 [mangoplay]", url]) - - return video_urls diff --git a/servers/mediafire.json b/servers/mediafire.json index 0af59303..8abc34ee 100644 --- a/servers/mediafire.json +++ b/servers/mediafire.json @@ -11,7 +11,7 @@ }, "free": true, "id": "mediafire", - "name": "mediafire", + "name": "MediaFire", "premium": [ "realdebrid", "alldebrid" diff --git a/servers/mixdrop.json b/servers/mixdrop.json index 7ddb6d83..b63ebd24 100644 --- a/servers/mixdrop.json +++ b/servers/mixdrop.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "mixdrop.png" + ] } diff --git a/servers/mydaddy.json b/servers/mydaddy.json index 36c9425b..671b9418 100644 --- a/servers/mydaddy.json +++ b/servers/mydaddy.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/mystream.json b/servers/mystream.json index 08717fd8..6344989c 100644 --- a/servers/mystream.json +++ b/servers/mystream.json @@ -11,7 +11,7 @@ }, "free": true, "id": "mystream", - "name": "mystream", + "name": "MyStream", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://i.postimg.cc/t43grQdh/mystream1.png" + ] } diff --git a/servers/myupload.json b/servers/myupload.json index ef42645b..fdd2bcc8 100644 --- a/servers/myupload.json +++ b/servers/myupload.json @@ -11,7 +11,7 @@ }, "free": true, "id": "myupload", - "name": "myupload", + "name": "myUpload", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/netutv.json b/servers/netutv.json index 8a7f1836..c8124fc6 100755 --- a/servers/netutv.json +++ b/servers/netutv.json @@ -56,6 +56,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_netutv.png" + ] } diff --git a/servers/nofile.json b/servers/nofile.json deleted file mode 100644 index ac6349b2..00000000 --- a/servers/nofile.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "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/servers/nofile.py b/servers/nofile.py deleted file mode 100644 index 977a10bc..00000000 --- a/servers/nofile.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# -------------------------------------------------------- -# Conector nofile By Alfa development Group -# -------------------------------------------------------- - -from core import httptools -from core import scrapertools -from platformcode import logger, config - - -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, config.get_localized_string(70449) % "nofile" - 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, '= 3: PY3 = True; unicode = str; unichr = chr; long = int - -from core import httptools -from core import scrapertools -from lib import jsunpack -from platformcode import logger - -headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:53.0) Gecko/20100101 Firefox/53.0']] - - -def test_video_exists(page_url): - referer = page_url.replace('iframe', 'preview') - - httptools.downloadpage(referer) - - global data - data = httptools.downloadpage(page_url, headers={'referer': referer}).data - - if data == "File was deleted" or data == '': - return False, "[powvideo] El video ha sido borrado" - if 'function(p,a,c,k,e,' not in data: - return False, config.get_localized_string(70449) % "powvideo" - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info() - itemlist = [] - - packed = scrapertools.find_single_match(data, "") - unpacked = jsunpack.unpack(packed) - - url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'") - if not PY3: from lib import alfaresolver - else: from lib import alfaresolver_py3 as alfaresolver - url = alfaresolver.decode_video_url(url, data, 2) - itemlist.append([".mp4" + " [powvideo]", url]) - - itemlist.sort(key=lambda x: x[0], reverse=True) - return itemlist \ No newline at end of file diff --git a/servers/prostream.json b/servers/prostream.json deleted file mode 100644 index 8ec79476..00000000 --- a/servers/prostream.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "prostream.to/(?:embed-|)([A-z0-9]+)", - "url": "https://prostream.to/embed-\\1.html" - } - ] - }, - "free": true, - "id": "prostream", - "name": "prostream", - "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://prostream.to/assets/img/logo.png" -} diff --git a/servers/prostream.py b/servers/prostream.py deleted file mode 100644 index 4ad2b859..00000000 --- a/servers/prostream.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# -------------------------------------------------------- -# Conector Prostream By Alfa development Group -# -------------------------------------------------------- -from core import httptools -from core import scrapertools -from lib import jsunpack -from platformcode import config -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - global data - data = httptools.downloadpage(page_url).data - if "File is no longer available" in data: - return False, config.get_localized_string(70449) % "Prostream" - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info("url=" + page_url) - video_urls = [] - ext = 'mp4' - - packed = scrapertools.find_single_match(data, "text/javascript'>(eval.*?)\s*") - unpacked = jsunpack.unpack(packed) - media_url = scrapertools.find_single_match(unpacked, r'sources:\s*\["([^"]+)"') - - ext = media_url[-4:] - video_urls.append(["%s [Prostream]" % (ext), media_url]) - - return video_urls diff --git a/servers/rapidgator.json b/servers/rapidgator.json index 48f3a43e..3448d62f 100644 --- a/servers/rapidgator.json +++ b/servers/rapidgator.json @@ -11,7 +11,7 @@ }, "free": false, "id": "rapidgator", - "name": "rapidgator", + "name": "Rapid Gator", "premium": [ "realdebrid", "alldebrid" @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_rapidgator.png" + ] } diff --git a/servers/rcdnme.json b/servers/rcdnme.json index ba2d24a6..6f8f4771 100644 --- a/servers/rcdnme.json +++ b/servers/rcdnme.json @@ -11,7 +11,7 @@ }, "free": true, "id": "rcdnme", - "name": "rcdnme", + "name": "RCDN", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://i.imgur.com/NErNgTg.jpg" + ] } \ No newline at end of file diff --git a/servers/rutube.json b/servers/rutube.json index 9c42fb2e..1079f56a 100644 --- a/servers/rutube.json +++ b/servers/rutube.json @@ -11,7 +11,7 @@ }, "free": true, "id": "rutube", - "name": "rutube", + "name": "RUTube", "premium": [ "alldebrid" ], @@ -40,6 +40,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://www.cubancouncil.com/uploads/project_images/rutube_branding_black.png.648x0_q90_replace_alpha.jpg" + ] } diff --git a/servers/samaup.json b/servers/samaup.json index c3feac6c..d1c2187b 100644 --- a/servers/samaup.json +++ b/servers/samaup.json @@ -11,7 +11,7 @@ }, "free": true, "id": "samaup", - "name": "samaup", + "name": "Sama Up", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://www.samaup.co/samaup_style/images/logo.png" + ] } diff --git a/servers/speedvideo.json b/servers/speedvideo.json index b0a52d79..c91a0a27 100644 --- a/servers/speedvideo.json +++ b/servers/speedvideo.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_speedvideo.png" + ] } diff --git a/servers/streamplay.json b/servers/streamplay.json deleted file mode 100755 index 0e465b19..00000000 --- a/servers/streamplay.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "(?:streamplay|streamp1ay).(?:to|me)/(?:embed-|player-|)([a-z0-9]+)(?:.html|)", - "url": "https://steamplay.me/player-\\1.html" - } - ] - }, - "free": true, - "id": "streamplay", - "name": "streamplay", - "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://s1.postimg.cc/912d5vxmv3/streamplay1.png" -} diff --git a/servers/streamplay.py b/servers/streamplay.py deleted file mode 100644 index 55cdbb21..00000000 --- a/servers/streamplay.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- -import sys - -from platformcode import config - -PY3 = False -if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int - -import re - -from core import httptools -from core import scrapertools -from lib import jsunpack -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - referer = re.sub(r"player-", "embed-", page_url) - global data - data = httptools.downloadpage(page_url, headers={'Referer': referer}).data - if data == "File was deleted": - return False, config.get_localized_string(70449) % "Streamplay" - elif "Video is processing now" in data: - return False, config.get_localized_string(70449) % "Streamplay" - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info() - video_urls = [] - - packed = scrapertools.find_single_match(data, "") - unpacked = jsunpack.unpack(packed) - - sources = eval(scrapertools.find_single_match(unpacked, "sources=(\[[^\]]+\])")) - for video_url in sources: - - if not PY3: from lib import alfaresolver - else: from lib import alfaresolver_py3 as alfaresolver - video_url = alfaresolver.decode_video_url(video_url, data, 2) - filename = scrapertools.get_filename_from_url(video_url)[-4:] - if not video_url.endswith(".mpd"): - video_urls.append([filename + " [streamplay]", video_url]) - - video_urls.sort(key=lambda x: x[0], reverse=True) - - return video_urls \ No newline at end of file diff --git a/servers/streamtape.json b/servers/streamtape.json index 749961b7..2168c016 100644 --- a/servers/streamtape.json +++ b/servers/streamtape.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/streamty.json b/servers/streamty.json deleted file mode 100644 index 3221ef81..00000000 --- a/servers/streamty.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "streamty.com/(?:embed-|)([A-z0-9]+)", - "url": "http://streamty.com/embed-\\1.html" - } - ] - }, - "free": true, - "id": "streamty", - "name": "streamty", - "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://streamty.com/img/logo.png" -} \ No newline at end of file diff --git a/servers/streamty.py b/servers/streamty.py deleted file mode 100644 index d7a792e8..00000000 --- a/servers/streamty.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# -------------------------------------------------------- -# Conector Streamty By Alfa development Group -# -------------------------------------------------------- -from core import httptools -from core import scrapertools -from lib import jsunpack -from platformcode import config -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - global data - data = httptools.downloadpage(page_url).data - if "Not Found" in data or "File was deleted" in data: - return False, config.get_localized_string(70449) % "Streamty" - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info("url=" + page_url) - video_urls = [] - - packed = scrapertools.find_single_match(data, "text/javascript'>(eval.*?)\s*") - unpacked = jsunpack.unpack(packed) - - media_url = scrapertools.find_single_match(unpacked, 'file:"([^"]+)"') - #media_url += "|Referer=%s" %page_url - if "m3u8" in media_url: - ext = "m3u8" - video_urls.append(["%s [streamty]" % (ext), media_url]) - - return video_urls diff --git a/servers/streamz.json b/servers/streamz.json index 541a9431..9d893927 100644 --- a/servers/streamz.json +++ b/servers/streamz.json @@ -11,7 +11,7 @@ }, "free": true, "id": "streamz", - "name": "streamz", + "name": "streamZ", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/supervideo.json b/servers/supervideo.json index 8f266b75..0434ee84 100644 --- a/servers/supervideo.json +++ b/servers/supervideo.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_supervideo.png" + ] } diff --git a/servers/thevid.json b/servers/thevid.json index 574cb21a..0da109c9 100644 --- a/servers/thevid.json +++ b/servers/thevid.json @@ -11,7 +11,7 @@ }, "free": true, "id": "thevid", - "name": "thevid", + "name": "TheVid", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://thevid.net/imgs/thevid.png" + ] } diff --git a/servers/thevideobee.json b/servers/thevideobee.json index 3e1fb059..45ccb4da 100644 --- a/servers/thevideobee.json +++ b/servers/thevideobee.json @@ -11,7 +11,7 @@ }, "free": true, "id": "thevideobee", - "name": "thevideobee", + "name": "The Videobee", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://thevideobee.to/img/logo.png" + ] } diff --git a/servers/thevimeo.json b/servers/thevimeo.json deleted file mode 100644 index 360159ff..00000000 --- a/servers/thevimeo.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "(https://thevimeo.pw/[a-zA-Z0-9]+)", - "url": "\\1" - } - ] - }, - "free": true, - "id": "thevimeo", - "name": "thevimeo", - "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://smmsquare.com/wp-content/uploads/2017/12/Vimeo_smmsquare.png" -} diff --git a/servers/thevimeo.py b/servers/thevimeo.py deleted file mode 100644 index 85f0eb7e..00000000 --- a/servers/thevimeo.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# -*- Server Thevimeo -*- -import re - -from core import httptools -from platformcode import config - - -def get_source(url): - #logger.info() - data = httptools.downloadpage(url).data - data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data) - return data - -def test_video_exists(page_url): - #logger.info("(page_url='%s')" % page_url) - data = get_source(page_url) - - if "File was deleted" in data or "File Not Found" in data: - return False, config.get_localized_string(70449) % "Thevimeo" - - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - #logger.info("url=" + page_url) - video_urls = [] - data = get_source(page_url) - #logger.debug(data) - patron = "{file:(.*?),label:(.*?)," - - matches = re.compile(patron, re.DOTALL).findall(data) - #url = scrapertools.find_single_match(data, "sources.*?{file:(.*?),") - for url, qual in matches: - url = url.replace("\/", "/") - qual = qual.replace("M\u00f3vil","360") - video_urls.append([qual+"p [Thevimeo]", url]) - video_urls.sort(key=lambda it: int(it[0].split("p ", 1)[0])) - - return video_urls diff --git a/servers/tiwikiwi.json b/servers/tiwikiwi.json deleted file mode 100644 index 570eee61..00000000 --- a/servers/tiwikiwi.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "https://tiwi.kiwi/embed-([a-z0-9]+).html", - "url": "https://tiwi.kiwi/embed-\\1.html" - } - ] - }, - "free": true, - "id": "tiwikiwi", - "name": "tiwikiwi", - "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://i.postimg.cc/CxdyWRcN/tiwikiwi.png" -} diff --git a/servers/tiwikiwi.py b/servers/tiwikiwi.py deleted file mode 100644 index d82f43d9..00000000 --- a/servers/tiwikiwi.py +++ /dev/null @@ -1,31 +0,0 @@ -# Conector vidcloud By Alfa development Group -# -------------------------------------------------------- -import re - -from core import httptools -from core import scrapertools -from lib import jsunpack -from platformcode import config -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url) - if data.code == 404: - return False, config.get_localized_string(70449) % "Cloud" - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info("url=" + page_url) - video_urls = [] - data = httptools.downloadpage(page_url).data - enc_data = scrapertools.find_single_match(data, "type='text/javascript'>(eval.*?)?\s+") - dec_data = jsunpack.unpack(enc_data) - sources = 'file:"([^"]+)",label:"([^"]+)"' - matches = re.compile(sources, re.DOTALL).findall(dec_data) - for url, quality in matches: - video_url = url - video_urls.append(['tiwi.kiwi [%s]' % quality, video_url]) - return video_urls \ No newline at end of file diff --git a/servers/torrent.json b/servers/torrent.json index b46cf37b..12b59037 100644 --- a/servers/torrent.json +++ b/servers/torrent.json @@ -56,7 +56,7 @@ }, "free": true, "id": "torrent", - "name": "torrent", + "name": "Torrent", "settings": [ { "default": false, diff --git a/servers/turbobit.json b/servers/turbobit.json index a5ae92f5..693b9a81 100644 --- a/servers/turbobit.json +++ b/servers/turbobit.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_turbobit.png" + ] } \ No newline at end of file diff --git a/servers/turbovid.json b/servers/turbovid.json index 0871ca45..54cc8057 100644 --- a/servers/turbovid.json +++ b/servers/turbovid.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_turbovid.png" + ] } diff --git a/servers/tusfiles.json b/servers/tusfiles.json index 1221c6a9..0dcf9cd5 100644 --- a/servers/tusfiles.json +++ b/servers/tusfiles.json @@ -11,7 +11,7 @@ }, "free": true, "id": "tusfiles", - "name": "tusfiles", + "name": "TusFiles", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://tusfiles.com/i/TFLOGO.png" + ] } diff --git a/servers/unsupported.json b/servers/unsupported.json index fba25216..066467c3 100644 --- a/servers/unsupported.json +++ b/servers/unsupported.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } \ No newline at end of file diff --git a/servers/uploadedto.json b/servers/uploadedto.json index 9d893f98..5097d423 100644 --- a/servers/uploadedto.json +++ b/servers/uploadedto.json @@ -23,7 +23,7 @@ "uploaded" ] }, - "name": "uploadedto", + "name": "Uploaded", "premium": [ "uploadedto", "realdebrid", @@ -79,6 +79,5 @@ "type": "text", "visible": true } - ], - "thumbnail": "server_uploadedto.png" + ] } \ No newline at end of file diff --git a/servers/uploadmp4.json b/servers/uploadmp4.json deleted file mode 100644 index f2c448f3..00000000 --- a/servers/uploadmp4.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "(https://(?:www\\.|)uploadmp4.com/embed/[A-z0-9]+)", - "url": "\\1" - } - ] - }, - "free": true, - "id": "uploadmp4", - "name": "uploadmp4", - "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://www.uploadmp4.com/themes/flow/images/main_logo.png" -} diff --git a/servers/uploadmp4.py b/servers/uploadmp4.py deleted file mode 100644 index 577a778b..00000000 --- a/servers/uploadmp4.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# -------------------------------------------------------- -# Conector uploadmp4 By Alfa development Group -# -------------------------------------------------------- -from core import httptools -from core import scrapertools -from platformcode import config -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url).data - if "no longer exists" in data: - return False, config.get_localized_string(70449) % "uploadmp4" - return True, "" - - -def get_video_url(page_url, user="", password="", video_password=""): - logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url).data - video_urls = [] - videos_url = scrapertools.find_multiple_matches(data, 'label":"([^"]+).*?file":"([^"]+)') - for quality, video in videos_url: - video_urls.append(["%s [uploadmp4]" %quality, video]) - - return video_urls diff --git a/servers/uppom.json b/servers/uppom.json index ac606e28..fe9b3bea 100644 --- a/servers/uppom.json +++ b/servers/uppom.json @@ -11,7 +11,7 @@ }, "free": true, "id": "uppom", - "name": "uppom", + "name": "Uppom", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://uppom.live/images/logo.png" + ] } diff --git a/servers/upstream.json b/servers/upstream.json index ee3e9685..0172432b 100644 --- a/servers/upstream.json +++ b/servers/upstream.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "upstream.png" + ] } diff --git a/servers/uptobox.json b/servers/uptobox.json index 1e35957d..c30d430d 100644 --- a/servers/uptobox.json +++ b/servers/uptobox.json @@ -45,6 +45,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_uptobox.png" + ] } \ No newline at end of file diff --git a/servers/upvid.json b/servers/upvid.json index 6c22e0b4..b5122e69 100644 --- a/servers/upvid.json +++ b/servers/upvid.json @@ -11,7 +11,7 @@ }, "free": true, "id": "upvid", - "name": "upvid", + "name": "Upvid", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s15.postimg.cc/gz0tee0gb/zt_Oi_E6_S-_400x400.jpg" + ] } diff --git a/servers/uqload.json b/servers/uqload.json index 600c0b58..505e4d85 100644 --- a/servers/uqload.json +++ b/servers/uqload.json @@ -11,7 +11,7 @@ }, "free": true, "id": "uqload", - "name": "uqload", + "name": "UQLoad", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://uqload.com/img/logo.png?v=0" + ] } \ No newline at end of file diff --git a/servers/userscloud.json b/servers/userscloud.json index a52644ee..3205bd9c 100644 --- a/servers/userscloud.json +++ b/servers/userscloud.json @@ -11,7 +11,7 @@ }, "free": true, "id": "userscloud", - "name": "userscloud", + "name": "Userscloud", "premium": [ "realdebrid", "alldebrid" @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://i.imgur.com/u4W2DgA.png?1" + ] } diff --git a/servers/vevio.json b/servers/vevio.json index 6da14811..d8bd1f45 100644 --- a/servers/vevio.json +++ b/servers/vevio.json @@ -11,7 +11,7 @@ }, "free": true, "id": "vevio", - "name": "vevio", + "name": "VEVio", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s8.postimg.cc/opp2c3p6d/vevio1.png" + ] } diff --git a/servers/vidbull.json b/servers/vidbull.json deleted file mode 100644 index 4cf37869..00000000 --- a/servers/vidbull.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "(https://(?:www|).vidbull.tv/embed/\\w+)", - "url": "\\1" - } - ] - }, - "free": true, - "id": "vidbull", - "name": "vidbull", - "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": "" -} diff --git a/servers/vidbull.py b/servers/vidbull.py deleted file mode 100644 index efda325e..00000000 --- a/servers/vidbull.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# -------------------------------------------------------- -# Conector vidbull By Alfa development Group -# -------------------------------------------------------- -from lib.kt_player import decode - -from core import httptools -from core import scrapertools -from platformcode import config -from platformcode import logger - - -def test_video_exists(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, config.get_localized_string(70449) % "vidbull" - - global video_url, license_code - video_url = scrapertools.find_single_match(response.data, "video_url: '([^']+)'") - license_code = scrapertools.find_single_match(response.data, "license_code: '([^']+)'") - - return True, "" - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info() - return [["[vidbull]", decode(video_url, license_code)]] \ No newline at end of file diff --git a/servers/vidcloud.json b/servers/vidcloud.json index f8b992cf..3e974588 100644 --- a/servers/vidcloud.json +++ b/servers/vidcloud.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_vidcloud.png" + ] } diff --git a/servers/videobb.json b/servers/videobb.json deleted file mode 100644 index 705551bc..00000000 --- a/servers/videobb.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "videobb.(?:ru|site)/v/([A-z0-9_-]+)", - "url": "https://videobb.ru/api/source/\\1" - } - ] - }, - "free": true, - "id": "videobb", - "name": "videobb", - "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://www.cinetux.to/videobb/logo.jpg" -} diff --git a/servers/videobb.py b/servers/videobb.py deleted file mode 100644 index 8439e4cc..00000000 --- a/servers/videobb.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# -------------------------------------------------------- -# Conector videobb By Alfa development Group -# -------------------------------------------------------- -from core import httptools -from core import scrapertools -from platformcode import config -from platformcode import logger - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url).data - if "no longer exists" in data: - return False, config.get_localized_string(70449) % "videobb" - return True, "" - - -def get_video_url(page_url, user="", password="", video_password=""): - logger.info("(page_url='%s')" % page_url) - video_urls = [] - id = scrapertools.find_single_match("v/(\w+)", page_url) - post = "r=&d=videobb.ru" - headers = {"x-requested-with":"XMLHttpRequest"} - data = httptools.downloadpage(page_url, post=post, headers=headers).json - for url in data["data"]: - video_urls.append([url["label"] + " [videobb]", url["file"]]) - #logger.info("Intel11 %s" %data) - - return video_urls diff --git a/servers/videobin.json b/servers/videobin.json index e9e09c2e..57209c51 100644 --- a/servers/videobin.json +++ b/servers/videobin.json @@ -11,7 +11,7 @@ }, "free": true, "id": "videobin", - "name": "videobin", + "name": "VideoBin", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/videomega.json b/servers/videomega.json index f00b7337..5dd00bec 100644 --- a/servers/videomega.json +++ b/servers/videomega.json @@ -11,7 +11,7 @@ }, "free": true, "id": "videomega", - "name": "videomega", + "name": "VideoMega", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/vidfast.json b/servers/vidfast.json index 2efe5199..9bfee90e 100644 --- a/servers/vidfast.json +++ b/servers/vidfast.json @@ -11,7 +11,7 @@ }, "free": true, "id": "vidfast", - "name": "vidfast", + "name": "VidFast", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://i.postimg.cc/jdnS13jQ/vidfast.jpg" + ] } diff --git a/servers/vidlox.json b/servers/vidlox.json index c54fb1e0..d4f6a88d 100644 --- a/servers/vidlox.json +++ b/servers/vidlox.json @@ -11,7 +11,7 @@ }, "free": true, "id": "vidlox", - "name": "vidlox", + "name": "Vidlox", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s1.postimg.cc/wathgtvin/logo-vidlox1.png" + ] } diff --git a/servers/vidmoly.json b/servers/vidmoly.json index 51cc5efd..c1b5c1c0 100644 --- a/servers/vidmoly.json +++ b/servers/vidmoly.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/vidoza.json b/servers/vidoza.json index ef91ffb4..05c1a3a8 100644 --- a/servers/vidoza.json +++ b/servers/vidoza.json @@ -11,7 +11,7 @@ }, "free": true, "id": "vidoza", - "name": "vidoza", + "name": "Vidoza", "premium": [ "realdebrid" ], @@ -40,6 +40,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_vidoza.png" + ] } \ No newline at end of file diff --git a/servers/vidtodo.json b/servers/vidtodo.json index 7ed2cd77..6ceeedf0 100755 --- a/servers/vidtodo.json +++ b/servers/vidtodo.json @@ -11,7 +11,7 @@ }, "free": true, "id": "vidtodo", - "name": "vidtodo", + "name": "VidToDo", "settings": [ { "default": false, diff --git a/servers/vidtome.json b/servers/vidtome.json deleted file mode 100755 index f6bb5618..00000000 --- a/servers/vidtome.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "active": true, - "find_videos": { - "ignore_urls": [], - "patterns": [ - { - "pattern": "vidto.me/(?:embed-|)([A-z0-9]+)", - "url": "http://vidto.me/embed-\\1.html" - } - ] - }, - "free": true, - "id": "vidtome", - "name": "vidtome", - "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 - } - ] -} \ No newline at end of file diff --git a/servers/vidtome.py b/servers/vidtome.py deleted file mode 100644 index ff1b3eb6..00000000 --- a/servers/vidtome.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- - -from core import httptools -from core import scrapertools -from platformcode import logger, config - - -def test_video_exists(page_url): - logger.info("(page_url='%s')" % page_url) - data = httptools.downloadpage(page_url).data - if "Not Found" in data or "File Does not Exist" in data: - return False, config.get_localized_string(70292) % 'vidto.me' - return True, "" - - -def get_video_url(page_url, premium=False, user="", password="", video_password=""): - logger.info("url=" + page_url) - data = httptools.downloadpage(page_url).data - code = scrapertools.find_single_match(data, 'name="code" value="([^"]+)') - hash = scrapertools.find_single_match(data, 'name="hash" value="([^"]+)') - post = "op=download1&code=%s&hash=%s&imhuman=Proceed+to+video" %(code, hash) - data1 = httptools.downloadpage("http://m.vidtome.stream/playvideo/%s" %code, post=post).data - video_urls = [] - media_urls = scrapertools.find_multiple_matches(data1, 'file: "([^"]+)') - for media_url in media_urls: - ext = scrapertools.get_filename_from_url(media_url)[-4:] - video_urls.append(["%s [vidto.me]" % (ext), media_url]) - video_urls.reverse() - for video_url in video_urls: - logger.info("%s" % (video_url[0])) - return video_urls diff --git a/servers/vidup.json b/servers/vidup.json index f6821286..e1297257 100755 --- a/servers/vidup.json +++ b/servers/vidup.json @@ -11,7 +11,7 @@ }, "free": true, "id": "vidup", - "name": "vidup", + "name": "ViduP", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://i.imgur.com/sZvy8IC.png?1" + ] } diff --git a/servers/vimeo.json b/servers/vimeo.json index ab870ed1..2b0d433a 100644 --- a/servers/vimeo.json +++ b/servers/vimeo.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s26.postimg.cc/vo685y2bt/vimeo1.png" + ] } diff --git a/servers/vimpleru.json b/servers/vimpleru.json index 6a1e93d3..d89ce595 100644 --- a/servers/vimpleru.json +++ b/servers/vimpleru.json @@ -42,6 +42,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_vimpleru.png" + ] } \ No newline at end of file diff --git a/servers/vivo.json b/servers/vivo.json index 7183ea8b..58ac6202 100644 --- a/servers/vivo.json +++ b/servers/vivo.json @@ -11,7 +11,7 @@ }, "free": true, "id": "vivo", - "name": "vivo", + "name": "VIVO", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://s15.postimg.cc/oiyhtpdqj/vivo.png" + ] } \ No newline at end of file diff --git a/servers/vk.json b/servers/vk.json index 6017efe2..e50928ef 100755 --- a/servers/vk.json +++ b/servers/vk.json @@ -15,7 +15,7 @@ }, "free": true, "id": "vk", - "name": "vk", + "name": "VK", "premium": [ "realdebrid" ], @@ -59,6 +59,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_vk.png" + ] } diff --git a/servers/vshare.json b/servers/vshare.json index 72ebe973..e1488ee6 100644 --- a/servers/vshare.json +++ b/servers/vshare.json @@ -46,6 +46,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_vshare.png" + ] } diff --git a/servers/vudeo.json b/servers/vudeo.json index 931bb075..21c6c02a 100644 --- a/servers/vudeo.json +++ b/servers/vudeo.json @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "https://vudeo.net/images/logo.png" + ] } diff --git a/servers/vupplayer.json b/servers/vupplayer.json index d0b39cdf..fe4e5c6f 100644 --- a/servers/vupplayer.json +++ b/servers/vupplayer.json @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_vupplayer.png" + ] } diff --git a/servers/vvvvid.json b/servers/vvvvid.json index d3205cfb..42be33e2 100644 --- a/servers/vvvvid.json +++ b/servers/vvvvid.json @@ -11,7 +11,7 @@ }, "free": true, "id": "vvvvid", - "name": "vvvvid", + "name": "VVVVID", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/watchanimestream.json b/servers/watchanimestream.json index 2118566b..8fe58ba7 100644 --- a/servers/watchanimestream.json +++ b/servers/watchanimestream.json @@ -11,7 +11,7 @@ }, "free": true, "id": "watchanimestream", - "name": "watchanimestream", + "name": "Watchanimestream", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/watchvideo.json b/servers/watchvideo.json index c865296a..a6bc4c1b 100644 --- a/servers/watchvideo.json +++ b/servers/watchvideo.json @@ -15,7 +15,7 @@ }, "free": true, "id": "watchvideo", - "name": "watchvideo", + "name": "WatchVideo", "settings": [ { "default": false, @@ -41,6 +41,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "http://i.imgur.com/vDev2I6.png?1" + ] } \ No newline at end of file diff --git a/servers/wstream.json b/servers/wstream.json index 517b6ce0..5f7cd897 100644 --- a/servers/wstream.json +++ b/servers/wstream.json @@ -3,7 +3,7 @@ "name": "Wstream", "active": true, "free": true, - "thumbnail": "server_wstream.png", + "find_videos": { "patterns": [ { diff --git a/servers/youdbox.json b/servers/youdbox.json index a595cdff..ab9e3263 100644 --- a/servers/youdbox.json +++ b/servers/youdbox.json @@ -11,7 +11,7 @@ }, "free": true, "id": "youdbox", - "name": "youdbox", + "name": "YouDbox", "settings": [ { "default": false, @@ -37,6 +37,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "" + ] } diff --git a/servers/yourupload.json b/servers/yourupload.json index cda4fab8..9c61f454 100755 --- a/servers/yourupload.json +++ b/servers/yourupload.json @@ -21,7 +21,7 @@ }, "free": true, "id": "yourupload", - "name": "yourupload", + "name": "YourUpload", "settings": [ { "default": false, @@ -47,6 +47,5 @@ "type": "list", "visible": false } - ], - "thumbnail" : "https://s1.postimg.cc/4wje61el4f/yourupload1.png" + ] } diff --git a/servers/youtube.json b/servers/youtube.json index 6adf5925..34a81972 100755 --- a/servers/youtube.json +++ b/servers/youtube.json @@ -15,7 +15,7 @@ }, "free": true, "id": "youtube", - "name": "youtube", + "name": "YouTube", "premium": [ "realdebrid", "alldebrid" @@ -45,6 +45,5 @@ "type": "list", "visible": false } - ], - "thumbnail": "server_youtube.png" + ] } \ No newline at end of file diff --git a/servers/youwatch.json b/servers/youwatch.json index 43644659..1c4bc87a 100644 --- a/servers/youwatch.json +++ b/servers/youwatch.json @@ -11,7 +11,7 @@ }, "free": true, "id": "youwatch", - "name": "youwatch", + "name": "You watch", "premium": [ "realdebrid" ], diff --git a/servers/zippyshare.json b/servers/zippyshare.json index dbf11475..48df2b5a 100644 --- a/servers/zippyshare.json +++ b/servers/zippyshare.json @@ -11,7 +11,7 @@ }, "free": true, "id": "zippyshare", - "name": "zippyshare", + "name": "Zippyshare", "premium": [ "realdebrid", "alldebrid"