From d4884097423ad62be535a41f40c14feec9934458 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 30 Mar 2020 13:30:14 +0200 Subject: [PATCH] traduzione server testvideo --- servers/akvideo.py | 4 ++-- servers/animeid.py | 4 ++-- servers/animeworld_server.py | 1 - servers/archiveorg.py | 4 ++-- servers/badshare.py | 5 +++-- servers/bdupload.py | 3 ++- servers/bitertv.py | 4 ++-- servers/bitp.py | 4 ++-- servers/bravoporn.py | 1 - servers/cinemaupload.py | 4 +++- servers/clicknupload.py | 6 ++++-- servers/crunchyroll.py | 4 +++- servers/datoporn.py | 4 ++-- servers/debriders/realdebrid.py | 1 - servers/deltabit.py | 6 ++++-- servers/dostream.py | 4 ++-- servers/downace.py | 4 ++-- servers/drtuber.py | 1 - servers/eporner.py | 5 +++-- servers/estream.py | 5 +++-- servers/fastplay.py | 4 ++-- servers/fembed.py | 3 ++- servers/fex.py | 5 +++-- servers/filebebo.py | 5 +++-- servers/filescdn.py | 4 ++-- servers/flix555.py | 5 +++-- servers/gamovideo.py | 10 ++++++---- servers/googlevideo.py | 1 - servers/gotporn.py | 4 ++-- servers/gvideo.py | 6 ++++-- servers/hdload.py | 5 +++-- servers/iceporn.py | 1 - servers/idtbox.py | 9 +++++---- servers/javwhores.py | 5 ++++- servers/jawcloud.py | 4 ++-- servers/jetload.py | 6 +++--- servers/jplayer.py | 7 ++++--- servers/keezmovies.py | 3 ++- servers/mangoplay.py | 4 ++-- servers/mangovideo.py | 3 ++- servers/manyvideos.py | 9 ++++++--- servers/mediafire.py | 4 ++-- servers/megadrive.py | 4 ++-- servers/mp4upload.py | 5 +++-- servers/mydaddy.py | 4 +++- servers/myupload.py | 7 +++++-- servers/netutv.py | 6 ++++-- servers/nowvideo.py | 1 + servers/onlystream.py | 4 +--- servers/oprem.py | 2 ++ servers/pornhub.py | 4 ++-- servers/pornrewind.py | 5 ++--- servers/powvideo.py | 8 ++++---- servers/prostream.py | 4 ++-- servers/rcdnme.py | 4 ++-- servers/redtube.py | 4 +++- servers/rutube.py | 7 ++++--- servers/samaup.py | 4 ++-- servers/sendvid.py | 1 - servers/streamcherry.py | 4 ++-- servers/streamplay.py | 8 +++++--- servers/streamty.py | 4 ++-- servers/streamz.py | 3 +-- servers/supervideo.py | 5 +++-- servers/thevid.py | 3 ++- servers/thevideobee.py | 4 ++-- servers/thevideome.py | 2 +- servers/thevimeo.py | 7 +++---- servers/tiwikiwi.py | 4 ++-- servers/torrent.py | 8 ++++---- servers/tube8.py | 3 ++- servers/tubeon.py | 1 - servers/tubst.py | 4 ++-- servers/turbovid.py | 3 ++- servers/tusfiles.py | 4 ++-- servers/txxx.py | 1 - servers/uploadmp4.py | 4 ++-- servers/uppom.py | 5 ++--- servers/upstream.py | 1 - servers/uptobox.py | 6 ++++-- servers/upvid.py | 8 +++++--- servers/uqload.py | 5 +++-- servers/vevio.py | 3 ++- servers/vidbull.py | 5 +++-- servers/videobb.py | 4 ++-- servers/videobin.py | 4 ++-- servers/videofiles.py | 9 +++++---- servers/videomega.py | 1 - servers/videoz.py | 4 ++-- servers/vidfast.py | 6 +++--- servers/vidlox.py | 4 ++-- servers/vidoza.py | 3 ++- servers/vidtodo.py | 2 +- servers/vidup.py | 6 ++++-- servers/vidzi.py | 4 ++-- servers/vimpleru.py | 3 ++- servers/vipporns.py | 5 +++-- servers/viptube.py | 1 - servers/vivatube.py | 1 - servers/vivo.py | 4 ++-- servers/vshare.py | 4 ++-- servers/vup.py | 4 ++-- servers/vvvvid.py | 6 ++++-- servers/watchanimestream.py | 2 -- servers/winporn.py | 1 - servers/wstream.py | 4 +++- servers/xdrive.py | 4 ++-- servers/xhamster.py | 1 - servers/xstreamcdn.py | 2 +- servers/xvideos.py | 5 +++-- servers/youdbox.py | 1 - servers/yourupload.py | 4 ++-- servers/youwatch.py | 6 +++--- servers/zippyshare.py | 1 - 114 files changed, 255 insertions(+), 211 deletions(-) diff --git a/servers/akvideo.py b/servers/akvideo.py index 3782780e..040ae55f 100644 --- a/servers/akvideo.py +++ b/servers/akvideo.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # by DrZ3r0 -import urllib, re +import urllib from core import httptools from core import scrapertools -from platformcode import logger, config, platformtools +from platformcode import logger, config def test_video_exists(page_url): diff --git a/servers/animeid.py b/servers/animeid.py index 776f13f5..3cec4070 100644 --- a/servers/animeid.py +++ b/servers/animeid.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -9,7 +9,7 @@ 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, "[animeid] El video ha sido borrado" + return False, config.get_localized_string(70449) % "animeid" if "please+try+again+later." in data: return False, "[animeid] Error de animeid, no se puede generar el enlace al video" return True, "" diff --git a/servers/animeworld_server.py b/servers/animeworld_server.py index 0fb7074c..fa73e58d 100644 --- a/servers/animeworld_server.py +++ b/servers/animeworld_server.py @@ -2,7 +2,6 @@ import urllib from core import httptools, jsontools -from core import scrapertools from platformcode import logger diff --git a/servers/archiveorg.py b/servers/archiveorg.py index c26d240d..61677b02 100644 --- a/servers/archiveorg.py +++ b/servers/archiveorg.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector ArchiveOrg By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url) if data.code == 404: - return False, "[ArchiveOrg] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "ArchiveOrg" return True, "" diff --git a/servers/badshare.py b/servers/badshare.py index f613fbda..6ccd1635 100644 --- a/servers/badshare.py +++ b/servers/badshare.py @@ -2,10 +2,11 @@ # -------------------------------------------------------- # Conector Badshare By Alfa development Group # -------------------------------------------------------- - import re + from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -14,7 +15,7 @@ def test_video_exists(page_url): global page page = httptools.downloadpage(page_url) if not page.sucess: - return False, "[Badshare] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Badshare" return True, "" diff --git a/servers/bdupload.py b/servers/bdupload.py index 4186ad96..6321dd3a 100644 --- a/servers/bdupload.py +++ b/servers/bdupload.py @@ -3,6 +3,7 @@ import time from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger headers = {'User-Agent': 'Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Mobile Safari/537.36'} @@ -12,7 +13,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "Archive no Encontrado" in data: - return False, "[bdupload] El fichero ha sido borrado" + return False, config.get_localized_string(70449) % "bdupload" return True, "" diff --git a/servers/bitertv.py b/servers/bitertv.py index b221554f..9e898962 100644 --- a/servers/bitertv.py +++ b/servers/bitertv.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36'} @@ -10,7 +10,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "Archive no Encontrado" in data or "File has been removed" in data: - return False, "[bitertv] El fichero ha sido borrado" + return False, config.get_localized_string(70449) % "bitertv" return True, "" diff --git a/servers/bitp.py b/servers/bitp.py index 7549b129..ed5a2495 100644 --- a/servers/bitp.py +++ b/servers/bitp.py @@ -4,9 +4,9 @@ # Conector para bitporno # https://github.com/alfa-addon # ------------------------------------------------------------ - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -14,7 +14,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "Object not found" in data or "no longer exists" in data or '"sources": [false]' in data: - return False, "[bitp] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "bitp" return True, "" diff --git a/servers/bravoporn.py b/servers/bravoporn.py index c281173c..f4ac400f 100644 --- a/servers/bravoporn.py +++ b/servers/bravoporn.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/cinemaupload.py b/servers/cinemaupload.py index 9f33c062..c3f05da8 100644 --- a/servers/cinemaupload.py +++ b/servers/cinemaupload.py @@ -3,8 +3,10 @@ # Conector Cinemaupload By Alfa development Group # -------------------------------------------------------- import re + from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +14,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url) if data.code == 404: - return False, "[CinemaUpload] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "CinemaUpload" return True, "" diff --git a/servers/clicknupload.py b/servers/clicknupload.py index 05a1421e..f54c5d5c 100755 --- a/servers/clicknupload.py +++ b/servers/clicknupload.py @@ -1,6 +1,8 @@ # -*- 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 @@ -23,7 +25,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = get_data(page_url.replace(".org", ".me")) - if "File Not Found" in data: return False, "[Clicknupload] El archivo no existe o ha sido borrado" + if "File Not Found" in data: return False, config.get_localized_string(70449) % "Clicknupload" return True, "" diff --git a/servers/crunchyroll.py b/servers/crunchyroll.py index 75dae4a8..2d252b3a 100755 --- a/servers/crunchyroll.py +++ b/servers/crunchyroll.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- -from builtins import range import sys + +from builtins import range + PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int diff --git a/servers/datoporn.py b/servers/datoporn.py index 259582bc..f433731e 100755 --- a/servers/datoporn.py +++ b/servers/datoporn.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools from lib import jsunpack +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if 'Not Found' in data or 'File is no longer available' in data: - return False, "[Datoporn] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Datoporn" return True, "" diff --git a/servers/debriders/realdebrid.py b/servers/debriders/realdebrid.py index 5c7c837e..98489850 100755 --- a/servers/debriders/realdebrid.py +++ b/servers/debriders/realdebrid.py @@ -14,7 +14,6 @@ else: import time from core import httptools -from core import scrapertools from platformcode import config, logger from platformcode import platformtools diff --git a/servers/deltabit.py b/servers/deltabit.py index 534c4d37..b1288073 100644 --- a/servers/deltabit.py +++ b/servers/deltabit.py @@ -1,11 +1,13 @@ # -*- coding: utf-8 -*- -import urllib import time +import urllib + from core import httptools from core import scrapertools -from platformcode import logger, config from lib import jsunpack +from platformcode import logger, config + def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) diff --git a/servers/dostream.py b/servers/dostream.py index 7184d286..1fdc4883 100644 --- a/servers/dostream.py +++ b/servers/dostream.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector DoStream By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url) if data.code == 404: - return False, "[Dostream] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Dostream" return True, "" diff --git a/servers/downace.py b/servers/downace.py index 7c649414..a238f2de 100644 --- a/servers/downace.py +++ b/servers/downace.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -13,7 +13,7 @@ def test_video_exists(page_url): if "please+try+again+later." in data: return False, "[Downace] Error de downace, no se puede generar el enlace al video" if "File has been removed due to inactivity" in data: - return False, "[Downace] El archivo ha sido removido por inactividad" + return False, config.get_localized_string(70449) % "Downace" return True, "" diff --git a/servers/drtuber.py b/servers/drtuber.py index de444847..dfd366ae 100644 --- a/servers/drtuber.py +++ b/servers/drtuber.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/eporner.py b/servers/eporner.py index a30cf276..d25b006a 100644 --- a/servers/eporner.py +++ b/servers/eporner.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- import re + from core import httptools -from core import scrapertools +from platformcode import config from platformcode import logger @@ -10,7 +11,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "

WE ARE SORRY

" in data or '404 Not Found' in data: - return False, "[eporner] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "eporner" return True, "" diff --git a/servers/estream.py b/servers/estream.py index 6ff87af2..24c63a34 100644 --- a/servers/estream.py +++ b/servers/estream.py @@ -2,9 +2,10 @@ # -------------------------------------------------------- # Conector Estream By Alfa development Group # -------------------------------------------------------- - import re + from core import httptools +from platformcode import config from platformcode import logger @@ -14,7 +15,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url) if data.code == 404: - return False, "[Estream] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Estream" return True, "" diff --git a/servers/fastplay.py b/servers/fastplay.py index 725d32a0..74468000 100644 --- a/servers/fastplay.py +++ b/servers/fastplay.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools from lib import jsunpack +from platformcode import config from platformcode import logger @@ -11,7 +11,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url) if "Object not found" in data.data or "longer exists on our servers" in data.data: - return False, "[Fastplay] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Fastplay" if data.code == 500: return False, "[Fastplay] Error interno del servidor" return True, "" diff --git a/servers/fembed.py b/servers/fembed.py index b7207e7e..e8831d8c 100644 --- a/servers/fembed.py +++ b/servers/fembed.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- + from core import httptools from core import jsontools from platformcode import logger, config @@ -8,7 +9,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "Sorry 404 not found" in data or "This video is unavailable" in data or "Sorry this video is unavailable:" in data: - return False, "[fembed] El fichero ha sido borrado" + return False, config.get_localized_string(70449) % "fembed" page_url = page_url.replace("/f/","/v/") page_url = page_url.replace("/v/","/api/source/") data = httptools.downloadpage(page_url, post={}).data diff --git a/servers/fex.py b/servers/fex.py index af00bea7..d64e6434 100644 --- a/servers/fex.py +++ b/servers/fex.py @@ -2,17 +2,18 @@ # -*- Server Fex -*- # -*- Created for Alfa-addon -*- # -*- By the Alfa Develop Group -*- - from core import httptools +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, follow_redirects=False) if data.code == 404: - return False, "[Fex] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Fex" return True, "" diff --git a/servers/filebebo.py b/servers/filebebo.py index 4ee3f98a..d7b21c6c 100644 --- a/servers/filebebo.py +++ b/servers/filebebo.py @@ -2,10 +2,11 @@ # -*- Server Filebebo -*- # -*- Created for Alfa-addon -*- # -*- By the Alfa Develop Group -*- - import re + from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -20,7 +21,7 @@ def test_video_exists(page_url): data = get_source(page_url) if "File was deleted" in data or "File Not Found" in data: - return False, "[Filebebo] El video ha sido borrado" + return False, config.get_localized_string(70449) % "Filebebo" return True, "" diff --git a/servers/filescdn.py b/servers/filescdn.py index 99f8e266..3a260b47 100644 --- a/servers/filescdn.py +++ b/servers/filescdn.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -10,7 +10,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if "File was deleted" in data: - return False, "[FilesCDN] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "FilesCDN" return True, "" diff --git a/servers/flix555.py b/servers/flix555.py index da1a2397..87484ada 100644 --- a/servers/flix555.py +++ b/servers/flix555.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- - import re + from core import httptools, scrapertools from lib import jsunpack +from platformcode import config from platformcode import logger data = "" @@ -11,7 +12,7 @@ def test_video_exists(page_url): global data data = resp.data if resp.code == 404 or 'File Not Found' in resp.data or "File is no longer available" in resp.data: - return False, "[flix555] El video no está disponible" + return False, config.get_localized_string(70449) % "flix555" return True, "" def get_video_url(page_url, premium=False, user="", password="", video_password=""): diff --git a/servers/gamovideo.py b/servers/gamovideo.py index 79d1b967..7a4e6f20 100755 --- a/servers/gamovideo.py +++ b/servers/gamovideo.py @@ -1,6 +1,8 @@ # -*- 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 @@ -32,13 +34,13 @@ def test_video_exists(page_url): global DATA DATA = data if "images/proced.png" in data: - return False, "[Gamovideo] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Gamovideo" if "File was deleted" in data or ("Not Found" in data and not "|mp4|" in data) or "File was locked by administrator" in data: - return False, "[Gamovideo] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Gamovideo" if "Video is processing now" in data: return False, "[Gamovideo] El video está procesándose en estos momentos. Inténtelo mas tarde." if "File is awaiting for moderation" in data: - return False, "[Gamovideo] El video está esperando por moderación." + return False, config.get_localized_string(70449) % "Gamovideo" return True, "" diff --git a/servers/googlevideo.py b/servers/googlevideo.py index 9348cc85..3a411e80 100755 --- a/servers/googlevideo.py +++ b/servers/googlevideo.py @@ -3,7 +3,6 @@ import re from core import httptools -from core import scrapertools from platformcode import logger diff --git a/servers/gotporn.py b/servers/gotporn.py index 8310b410..0b38b366 100644 --- a/servers/gotporn.py +++ b/servers/gotporn.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -10,7 +10,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "

WE ARE SORRY

" in data or '404 Not Found' in data: - return False, "[Mixdrop] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Mixdrop" return True, "" diff --git a/servers/gvideo.py b/servers/gvideo.py index 53b6366b..aa9712c4 100644 --- a/servers/gvideo.py +++ b/servers/gvideo.py @@ -1,6 +1,8 @@ # -*- 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 @@ -25,7 +27,7 @@ def test_video_exists(page_url): page = response if "no+existe" in response.data or 'no existe.

' in response.data: - return False, "[gvideo] El video no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "gvideo" if "Se+ha+excedido+el" in response.data: return False, "[gvideo] Se ha excedido el número de reproducciones permitidas" if "No+tienes+permiso" in response.data: diff --git a/servers/hdload.py b/servers/hdload.py index dd09d15c..30240022 100644 --- a/servers/hdload.py +++ b/servers/hdload.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- -from core import httptools, scrapertools -from platformcode import config, logger import base64 +from core import httptools +from platformcode import config, logger + def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) diff --git a/servers/iceporn.py b/servers/iceporn.py index f2eb063a..716a5362 100644 --- a/servers/iceporn.py +++ b/servers/iceporn.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/idtbox.py b/servers/idtbox.py index a24ddd83..00cd7a81 100644 --- a/servers/idtbox.py +++ b/servers/idtbox.py @@ -2,10 +2,11 @@ # -------------------------------------------------------- # Conector Idtbox By Alfa development Group # -------------------------------------------------------- - import re -from core import httptools, scrapertools -from platformcode import logger, platformtools + +from core import httptools +from platformcode import config +from platformcode import logger data = "" def test_video_exists(page_url): @@ -14,7 +15,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url) if not data.sucess or "Not Found" in data.data or "File was deleted" in data.data or "is no longer available" in data.data: - return False, "[Idtbox] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Idtbox" data = data.data return True, "" diff --git a/servers/javwhores.py b/servers/javwhores.py index 3b67fcb9..92d892fa 100644 --- a/servers/javwhores.py +++ b/servers/javwhores.py @@ -3,9 +3,12 @@ # Conector javwhores By Alfa development Group # -------------------------------------------------------- import re + from core import httptools +from platformcode import config from platformcode import logger + def test_video_exists(page_url): response = httptools.downloadpage(page_url) @@ -14,7 +17,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[javwhores] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "javwhores" # global video_url, license_code # video_url = scrapertools.find_single_match(response.data, "video_url: '([^']+)'") diff --git a/servers/jawcloud.py b/servers/jawcloud.py index a0de88a8..8fde2947 100644 --- a/servers/jawcloud.py +++ b/servers/jawcloud.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -9,7 +9,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "The file you were looking for could not be found" in data: - return False, "[jawcloud] El archivo ha ido borrado" + return False, config.get_localized_string(70449) % "jawcloud" return True, "" diff --git a/servers/jetload.py b/servers/jetload.py index 0d8b73d9..989f3b66 100644 --- a/servers/jetload.py +++ b/servers/jetload.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector jetload By Alfa development Group # -------------------------------------------------------- -import re -from core import httptools, jsontools +from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger video_urls = [] @@ -16,7 +16,7 @@ def test_video_exists(page_url): global data data = response.data if not response.sucess or "Not Found" in data or "File was deleted" in data or "is no longer available" in data: - return False, "[jetload] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "jetload" return True, "" diff --git a/servers/jplayer.py b/servers/jplayer.py index f167a027..19048363 100644 --- a/servers/jplayer.py +++ b/servers/jplayer.py @@ -2,8 +2,10 @@ # -------------------------------------------------------- # Conector jplayer By Alfa development Group # -------------------------------------------------------- - import sys + +from platformcode import config + PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int @@ -16,7 +18,6 @@ else: from core import httptools from core import jsontools -from core import scrapertools from platformcode import logger @@ -24,7 +25,7 @@ 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, "[jplayer] El video ha sido borrado" + return False, config.get_localized_string(70449) % "jplayer" return True, "" diff --git a/servers/keezmovies.py b/servers/keezmovies.py index 19463a4a..6cbec003 100644 --- a/servers/keezmovies.py +++ b/servers/keezmovies.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -9,7 +10,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "

WE ARE SORRY

" in data or '404 Not Found' in data: - return False, "[keezmovies] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "keezmovies" return True, "" diff --git a/servers/mangoplay.py b/servers/mangoplay.py index 5ddd0515..1373175e 100644 --- a/servers/mangoplay.py +++ b/servers/mangoplay.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector mangoplay By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ 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, "[mangoplay] El video ha sido borrado" + return False, config.get_localized_string(70449) % "mangoplay" return True, "" diff --git a/servers/mangovideo.py b/servers/mangovideo.py index d169aa08..b46c8f73 100644 --- a/servers/mangovideo.py +++ b/servers/mangovideo.py @@ -4,6 +4,7 @@ # -------------------------------------------------------- from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger server = {'1': 'http://www.mangovideo.pw/contents/videos/', '7' : 'http://server9.mangovideo.pw/contents/videos/', @@ -22,7 +23,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[mangovideo] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "mangovideo" return True, "" diff --git a/servers/manyvideos.py b/servers/manyvideos.py index 7ddaf4d0..971e2a22 100644 --- a/servers/manyvideos.py +++ b/servers/manyvideos.py @@ -2,11 +2,14 @@ # -------------------------------------------------------- # Conector manyvideos By Alfa development Group # -------------------------------------------------------- +import base64 + from core import httptools from core import scrapertools -from platformcode import logger -import base64 from lib import jsunpack +from platformcode import config +from platformcode import logger + def test_video_exists(page_url): @@ -16,7 +19,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[manyvideos] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "manyvideos" return True, "" diff --git a/servers/mediafire.py b/servers/mediafire.py index d2493c90..5b452878 100755 --- a/servers/mediafire.py +++ b/servers/mediafire.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -9,7 +9,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "Invalid or Deleted File" in data or "Well, looks like we" in data: - return False, "[Mediafire] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Mediafire" if "File Removed for Violation" in data: return False, "[Mediafire] Archivo eliminado por infracción" return True, "" diff --git a/servers/megadrive.py b/servers/megadrive.py index d9b82c33..c6974984 100644 --- a/servers/megadrive.py +++ b/servers/megadrive.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -13,7 +13,7 @@ def test_video_exists(page_url): if "please+try+again+later." in data: return False, "[Megadrive] Error de Megadrive, no se puede generar el enlace al video" if "File has been removed due to inactivity" in data: - return False, "[Megadrive] El archivo ha sido removido por inactividad" + return False, config.get_localized_string(70449) % "Megadrive" return True, "" diff --git a/servers/mp4upload.py b/servers/mp4upload.py index e215a2c6..769d8699 100644 --- a/servers/mp4upload.py +++ b/servers/mp4upload.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- - 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): data = httptools.downloadpage(page_url).data if data == "File was deleted" or data == '': - return False, "[mp4upload] El video ha sido borrado" + return False, config.get_localized_string(70449) % "mp4upload" def get_video_url(page_url, premium=False, user="", password="", video_password=""): diff --git a/servers/mydaddy.py b/servers/mydaddy.py index 0b874464..846f406e 100644 --- a/servers/mydaddy.py +++ b/servers/mydaddy.py @@ -4,8 +4,10 @@ # -------------------------------------------------------- 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) @@ -14,7 +16,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[mydaddy] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "mydaddy" return True, "" diff --git a/servers/myupload.py b/servers/myupload.py index 51a3129d..2ed947b6 100644 --- a/servers/myupload.py +++ b/servers/myupload.py @@ -2,10 +2,13 @@ # -------------------------------------------------------- # Conector myupload By Alfa development Group # -------------------------------------------------------- +import base64 + from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger -import base64 + def test_video_exists(page_url): @@ -15,7 +18,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[myupload] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "myupload" return True, "" diff --git a/servers/netutv.py b/servers/netutv.py index 25f365db..8e391f6a 100755 --- a/servers/netutv.py +++ b/servers/netutv.py @@ -1,6 +1,8 @@ # -*- 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 @@ -30,7 +32,7 @@ def test_video_exists(page_url): page_url = page_url.replace("/watch_video.php?v=", "/player/embed_player.php?vid=") data = httptools.downloadpage(page_url).data if "var userid = '';" in data.lower(): - return False, "[netutv] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "netutv" return True, "" diff --git a/servers/nowvideo.py b/servers/nowvideo.py index 46e6eea6..170b3f94 100644 --- a/servers/nowvideo.py +++ b/servers/nowvideo.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import urllib + from core import httptools from core import scrapertools from platformcode import logger, config diff --git a/servers/onlystream.py b/servers/onlystream.py index ba1e7b4b..d8745b58 100644 --- a/servers/onlystream.py +++ b/servers/onlystream.py @@ -2,10 +2,8 @@ from core import httptools from core import scrapertools -from lib import jsunpack from platformcode import config, logger -import ast -from core import support + def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) diff --git a/servers/oprem.py b/servers/oprem.py index c1b4f819..feb2cd92 100644 --- a/servers/oprem.py +++ b/servers/oprem.py @@ -4,9 +4,11 @@ # -------------------------------------------------------- import os + from core import httptools from platformcode import logger, config + def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("(page_url='%s')" % page_url) diff --git a/servers/pornhub.py b/servers/pornhub.py index 45feff1d..91e50222 100644 --- a/servers/pornhub.py +++ b/servers/pornhub.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector pornhub By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -16,7 +16,7 @@ def test_video_exists(page_url): or "removed" in response.data \ or not "defaultQuality" in response.data \ or "is no longer available" in response.data: - return False, "[pornhub] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "pornhub" return True, "" def get_video_url(page_url, user="", password="", video_password=""): diff --git a/servers/pornrewind.py b/servers/pornrewind.py index e8d7abe3..d7132fc0 100644 --- a/servers/pornrewind.py +++ b/servers/pornrewind.py @@ -2,12 +2,11 @@ # -------------------------------------------------------- # Conector pornrewind By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger -from lib.kt_player import decode def test_video_exists(page_url): @@ -17,7 +16,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[pornrewind] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "pornrewind" global video_url, license_code video_url = scrapertools.find_single_match(response.data, "video_url: '([^']+)'") diff --git a/servers/powvideo.py b/servers/powvideo.py index 9140a58e..b372c796 100644 --- a/servers/powvideo.py +++ b/servers/powvideo.py @@ -1,11 +1,11 @@ # -*- 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 @@ -25,7 +25,7 @@ def test_video_exists(page_url): 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, "[powvideo] El video no está disponible" + return False, config.get_localized_string(70449) % "powvideo" return True, "" diff --git a/servers/prostream.py b/servers/prostream.py index c5be57f9..4ad2b859 100644 --- a/servers/prostream.py +++ b/servers/prostream.py @@ -2,10 +2,10 @@ # -------------------------------------------------------- # 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 @@ -14,7 +14,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "File is no longer available" in data: - return False, "[Prostream] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Prostream" return True, "" diff --git a/servers/rcdnme.py b/servers/rcdnme.py index 9d78717e..d7fc0b2c 100644 --- a/servers/rcdnme.py +++ b/servers/rcdnme.py @@ -2,10 +2,10 @@ # -------------------------------------------------------- # Conector Rcdnme By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools from lib import jsunpack +from platformcode import config from platformcode import logger @@ -14,7 +14,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url) if "Object not found" in data.data or "longer exists on our servers" in data.data: - return False, "[Rcdnme] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Rcdnme" if data.code == 500: return False, "[Rcdnme] Error interno del servidor" return True, "" diff --git a/servers/redtube.py b/servers/redtube.py index 4f93e21f..3ac456fc 100644 --- a/servers/redtube.py +++ b/servers/redtube.py @@ -4,8 +4,10 @@ # -------------------------------------------------------- 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) @@ -14,7 +16,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[redtube] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "redtube" return True, "" diff --git a/servers/rutube.py b/servers/rutube.py index b9b7716c..e6414be7 100644 --- a/servers/rutube.py +++ b/servers/rutube.py @@ -2,8 +2,10 @@ # -*- Server Rutube -*- # -*- Created for Alfa-addon -*- # -*- By the Alfa Develop Group -*- - import sys + +from platformcode import config + PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int @@ -17,7 +19,6 @@ else: import re from core import httptools -from core import scrapertools from platformcode import logger from core import jsontools @@ -33,7 +34,7 @@ def test_video_exists(page_url): data = get_source(page_url) if "File was deleted" in data or "File Not Found" in data: - return False, "[Rutube] El video ha sido borrado" + return False, config.get_localized_string(70449) % "Rutube" return True, "" diff --git a/servers/samaup.py b/servers/samaup.py index 248dca52..cc6285c0 100644 --- a/servers/samaup.py +++ b/servers/samaup.py @@ -2,10 +2,10 @@ # -------------------------------------------------------- # Conector Samaup By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools from lib import jsunpack +from platformcode import config from platformcode import logger @@ -14,7 +14,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "Not Found" in data or "File was deleted" in data: - return False, "[Samaup] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Samaup" return True, "" diff --git a/servers/sendvid.py b/servers/sendvid.py index 72100c9b..ed11f426 100755 --- a/servers/sendvid.py +++ b/servers/sendvid.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/streamcherry.py b/servers/streamcherry.py index ef5a99f9..3cff360e 100644 --- a/servers/streamcherry.py +++ b/servers/streamcherry.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector para streamcherry # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -13,7 +13,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if "We are unable to find the video" in data: - return False, "[streamcherry] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "streamcherry" return True, "" diff --git a/servers/streamplay.py b/servers/streamplay.py index 11942925..55cdbb21 100644 --- a/servers/streamplay.py +++ b/servers/streamplay.py @@ -1,6 +1,8 @@ # -*- 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 @@ -18,9 +20,9 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url, headers={'Referer': referer}).data if data == "File was deleted": - return False, "[Streamplay] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Streamplay" elif "Video is processing now" in data: - return False, "[Streamplay] El archivo se está procesando" + return False, config.get_localized_string(70449) % "Streamplay" return True, "" diff --git a/servers/streamty.py b/servers/streamty.py index 19cb1e22..d7a792e8 100644 --- a/servers/streamty.py +++ b/servers/streamty.py @@ -2,10 +2,10 @@ # -------------------------------------------------------- # 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 @@ -14,7 +14,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "Not Found" in data or "File was deleted" in data: - return False, "[Streamty] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Streamty" return True, "" diff --git a/servers/streamz.py b/servers/streamz.py index 4bb82af0..3d85f57a 100644 --- a/servers/streamz.py +++ b/servers/streamz.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools -from platformcode import logger from lib import jsunpack +from platformcode import logger def get_video_url(page_url, video_password): diff --git a/servers/supervideo.py b/servers/supervideo.py index 20410941..ea506217 100644 --- a/servers/supervideo.py +++ b/servers/supervideo.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- +import ast + from core import httptools from core import scrapertools from lib import jsunpack from platformcode import config, logger -import ast - + def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) global data diff --git a/servers/thevid.py b/servers/thevid.py index fa1a15ed..e061856b 100644 --- a/servers/thevid.py +++ b/servers/thevid.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- + from core import httptools from core import scrapertools from lib import jsunpack @@ -12,7 +13,7 @@ def test_video_exists(page_url): if "Video not found..." in data or "Video removed due to copyright" in data: return False, config.get_localized_string(70292) % "Thevid" if "Video removed for inactivity..." in data: - return False, "[Thevid] El video ha sido removido por inactividad" + return False, config.get_localized_string(70449) % "Thevid" return True, "" diff --git a/servers/thevideobee.py b/servers/thevideobee.py index a0b51967..f319dcfe 100644 --- a/servers/thevideobee.py +++ b/servers/thevideobee.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector thevideobee By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ 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, "[thevideobee] El video ha sido borrado" + return False, config.get_localized_string(70449) % "thevideobee" return True, "" diff --git a/servers/thevideome.py b/servers/thevideome.py index 2f957510..89308046 100755 --- a/servers/thevideome.py +++ b/servers/thevideome.py @@ -13,7 +13,7 @@ else: from core import httptools from core import scrapertools -from platformcode import logger, config +from platformcode import logger def test_video_exists(page_url): diff --git a/servers/thevimeo.py b/servers/thevimeo.py index e6ffa265..85f0eb7e 100644 --- a/servers/thevimeo.py +++ b/servers/thevimeo.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- # -*- Server Thevimeo -*- - import re + from core import httptools -from core import scrapertools -from platformcode import logger +from platformcode import config def get_source(url): @@ -18,7 +17,7 @@ def test_video_exists(page_url): data = get_source(page_url) if "File was deleted" in data or "File Not Found" in data: - return False, "[Thevimeo] El video ha sido borrado" + return False, config.get_localized_string(70449) % "Thevimeo" return True, "" diff --git a/servers/tiwikiwi.py b/servers/tiwikiwi.py index 771ef91e..d82f43d9 100644 --- a/servers/tiwikiwi.py +++ b/servers/tiwikiwi.py @@ -1,11 +1,11 @@ # 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 @@ -13,7 +13,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url) if data.code == 404: - return False, "[Cloud] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Cloud" return True, "" diff --git a/servers/torrent.py b/servers/torrent.py index 8d48b6d7..8aff4636 100755 --- a/servers/torrent.py +++ b/servers/torrent.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- -#from builtins import str -from builtins import range import sys + +# from builtins import str +from builtins import range + PY3 = False VFS = True if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int; VFS = False @@ -15,7 +17,6 @@ else: import urllib import time -import threading import os import traceback import re @@ -31,7 +32,6 @@ from core import filetools from core import httptools from core import scrapertools from core import jsontools -from core.item import Item from platformcode import logger from platformcode import config from platformcode import platformtools diff --git a/servers/tube8.py b/servers/tube8.py index 2dda98e1..1649d0ba 100644 --- a/servers/tube8.py +++ b/servers/tube8.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -9,7 +10,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "

WE ARE SORRY

" in data or '404 Not Found' in data: - return False, "[tube8] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "tube8" return True, "" diff --git a/servers/tubeon.py b/servers/tubeon.py index 99ab0fdd..9947345a 100644 --- a/servers/tubeon.py +++ b/servers/tubeon.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/tubst.py b/servers/tubst.py index fd69d74b..fc17790d 100644 --- a/servers/tubst.py +++ b/servers/tubst.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector tubst By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ 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, "[tubst] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "tubst" return True, "" diff --git a/servers/turbovid.py b/servers/turbovid.py index 9070693c..8e786797 100644 --- a/servers/turbovid.py +++ b/servers/turbovid.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -import urllib import time +import urllib + from core import httptools from core import scrapertools from platformcode import logger, config diff --git a/servers/tusfiles.py b/servers/tusfiles.py index ef37b5e8..18cec1ee 100644 --- a/servers/tusfiles.py +++ b/servers/tusfiles.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector tusfiles By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ 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, "[tusfiles] El video ha sido borrado" + return False, config.get_localized_string(70449) % "tusfiles" return True, "" diff --git a/servers/txxx.py b/servers/txxx.py index 24fdc737..d678566c 100644 --- a/servers/txxx.py +++ b/servers/txxx.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/uploadmp4.py b/servers/uploadmp4.py index 9130fd7d..577a778b 100644 --- a/servers/uploadmp4.py +++ b/servers/uploadmp4.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector uploadmp4 By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ 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, "[uploadmp4] El video ha sido borrado" + return False, config.get_localized_string(70449) % "uploadmp4" return True, "" diff --git a/servers/uppom.py b/servers/uppom.py index 1fe8b571..12b19d30 100644 --- a/servers/uppom.py +++ b/servers/uppom.py @@ -2,10 +2,9 @@ # -*- Server Uppom -*- # -*- Created for Alfa-addon -*- # -*- By the Alfa Develop Group -*- - -import re from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -14,7 +13,7 @@ def test_video_exists(page_url): data = get_source(page_url) if "File was deleted" in data or "File Not Found" in data: - return False, "[Uppom] El video ha sido borrado" + return False, config.get_localized_string(70449) % "Uppom" return True, "" diff --git a/servers/upstream.py b/servers/upstream.py index fb6a63a6..754fa308 100644 --- a/servers/upstream.py +++ b/servers/upstream.py @@ -5,7 +5,6 @@ from core import httptools from core import scrapertools -from lib import jsunpack from platformcode import logger, config diff --git a/servers/uptobox.py b/servers/uptobox.py index 1bcb7da0..52cc08aa 100755 --- a/servers/uptobox.py +++ b/servers/uptobox.py @@ -1,6 +1,8 @@ # -*- 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 @@ -25,7 +27,7 @@ def test_video_exists(page_url): return True, "" elif "Unfortunately, the file you want is not available." in data or "Unfortunately, the video you want to see is not available" in data or "This stream doesn" in data\ or "Page not found" in data: - return False, "[Uptobox] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Uptobox" wait = scrapertools.find_single_match(data, "You have to wait ([0-9]+) (minute|second)") if len(wait) > 0: tiempo = wait[1].replace("minute", "minuto/s").replace("second", "segundos") diff --git a/servers/upvid.py b/servers/upvid.py index 12dcfc9b..4523d5dc 100644 --- a/servers/upvid.py +++ b/servers/upvid.py @@ -2,11 +2,13 @@ # -------------------------------------------------------- # Conector UpVID By Alfa development Group # -------------------------------------------------------- +import base64 +import re -import re, base64 from core import httptools from core import scrapertools from lib.aadecode import decode as aadecode +from platformcode import config from platformcode import logger @@ -14,9 +16,9 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url) if data.code == 404: - return False, "[upvid] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "upvid" if "video is no longer available" in data.data: - return False, "[upvid] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "upvid" return True, "" diff --git a/servers/uqload.py b/servers/uqload.py index 4a8b0ec9..3c254960 100644 --- a/servers/uqload.py +++ b/servers/uqload.py @@ -2,9 +2,10 @@ # -------------------------------------------------------- # Conector Uqload By Alfa development Group # -------------------------------------------------------- - import re + from core import httptools +from platformcode import config from platformcode import logger @@ -14,7 +15,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url) if data.code == 404: - return False, "[Uqload] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Uqload" return True, "" diff --git a/servers/vevio.py b/servers/vevio.py index 5ebdbda9..f0c1a6c0 100644 --- a/servers/vevio.py +++ b/servers/vevio.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- + import sys PY3 = False if sys.version_info[0] >= 3: PY3 = True; unicode = str; unichr = chr; long = int @@ -20,7 +21,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "File was deleted" in data or "Page Cannot Be Found" in data or "<title>Video not found" in data: - return False, "[vevio] El archivo ha sido eliminado o no existe" + return False, config.get_localized_string(70449) % "vevio" return True, "" diff --git a/servers/vidbull.py b/servers/vidbull.py index 0ea9f301..efda325e 100644 --- a/servers/vidbull.py +++ b/servers/vidbull.py @@ -2,12 +2,13 @@ # -------------------------------------------------------- # 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 -from lib.kt_player import decode def test_video_exists(page_url): @@ -17,7 +18,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[vidbull] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "vidbull" global video_url, license_code video_url = scrapertools.find_single_match(response.data, "video_url: '([^']+)'") diff --git a/servers/videobb.py b/servers/videobb.py index 01aa0499..8439e4cc 100644 --- a/servers/videobb.py +++ b/servers/videobb.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector videobb By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ 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, "[videobb] El video ha sido borrado" + return False, config.get_localized_string(70449) % "videobb" return True, "" diff --git a/servers/videobin.py b/servers/videobin.py index 3740b04f..c2d0125a 100644 --- a/servers/videobin.py +++ b/servers/videobin.py @@ -4,9 +4,9 @@ # Conector para videobin # https://github.com/alfa-addon # ------------------------------------------------------------ - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -14,7 +14,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "borrado" in data or "Deleted" in data: - return False, "[videobin] El fichero ha sido borrado" + return False, config.get_localized_string(70449) % "videobin" return True, "" diff --git a/servers/videofiles.py b/servers/videofiles.py index 6110b971..89562b2f 100644 --- a/servers/videofiles.py +++ b/servers/videofiles.py @@ -2,10 +2,11 @@ # -------------------------------------------------------- # Conector Videofiles By Alfa development Group # -------------------------------------------------------- +import re -import re, time -from core import httptools, scrapertools -from platformcode import logger, platformtools +from core import httptools +from platformcode import config +from platformcode import logger data = "" def test_video_exists(page_url): @@ -14,7 +15,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url) if not data.sucess or "Not Found" in data.data or "File was deleted" in data.data or "is no longer available" in data.data: - return False, "[Videofiles] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Videofiles" global data data = data.data return True, "" diff --git a/servers/videomega.py b/servers/videomega.py index a75499c1..de473b1d 100644 --- a/servers/videomega.py +++ b/servers/videomega.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/videoz.py b/servers/videoz.py index 4ffc1f6f..a5ba7645 100644 --- a/servers/videoz.py +++ b/servers/videoz.py @@ -2,10 +2,10 @@ # -------------------------------------------------------- # Conector Videoz By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools from lib import jsunpack +from platformcode import config from platformcode import logger @@ -14,7 +14,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "Not Found" in data or "File was deleted" in data: - return False, "[Videoz] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Videoz" return True, "" diff --git a/servers/vidfast.py b/servers/vidfast.py index 64d6b1af..2b212c92 100644 --- a/servers/vidfast.py +++ b/servers/vidfast.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector vidfast By Alfa development Group # -------------------------------------------------------- -import re -from core import httptools, jsontools +from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger video_urls = [] @@ -16,7 +16,7 @@ def test_video_exists(page_url): global data data = response.data if not response.sucess or "Not Found" in data or "File was deleted" in data or "is no longer available" in data: - return False, "[vidfast] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "vidfast" return True, "" diff --git a/servers/vidlox.py b/servers/vidlox.py index 559171ff..7cbb684e 100644 --- a/servers/vidlox.py +++ b/servers/vidlox.py @@ -4,9 +4,9 @@ # Conector para vidlox # https://github.com/alfa-addon # ------------------------------------------------------------ - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -15,7 +15,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "borrado" in data or "Deleted" in data: - return False, "[vidlox] El fichero ha sido borrado" + return False, config.get_localized_string(70449) % "vidlox" return True, "" diff --git a/servers/vidoza.py b/servers/vidoza.py index 5d82c5dc..c7a39de0 100644 --- a/servers/vidoza.py +++ b/servers/vidoza.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- + from core import httptools from core import jsontools from core import scrapertools @@ -11,7 +12,7 @@ def test_video_exists(page_url): global data data = httptools.downloadpage(page_url).data if "Page not found" in data or "File was deleted" in data: - return False, "[vidoza] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "vidoza" elif "processing" in data: return False, config.get_localized_string(70449) % "Vidoza" diff --git a/servers/vidtodo.py b/servers/vidtodo.py index 2c879398..039fdabd 100755 --- a/servers/vidtodo.py +++ b/servers/vidtodo.py @@ -2,8 +2,8 @@ from core import httptools from core import scrapertools -from platformcode import logger from lib import jsunpack +from platformcode import logger id_server = "vidtodo" response = "" diff --git a/servers/vidup.py b/servers/vidup.py index ecc4bf19..c300d778 100755 --- a/servers/vidup.py +++ b/servers/vidup.py @@ -1,6 +1,8 @@ # -*- 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 @@ -22,7 +24,7 @@ def test_video_exists(page_url): page = httptools.downloadpage(page_url) url = page.url if "Not Found" in page.data or "/404" in url: - return False, "[Vidup] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Vidup" return True, "" diff --git a/servers/vidzi.py b/servers/vidzi.py index a02132e8..c04e20e0 100644 --- a/servers/vidzi.py +++ b/servers/vidzi.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools from lib import jsunpack +from platformcode import config from platformcode import logger @@ -10,7 +10,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) response = httptools.downloadpage(page_url) if not response.sucess: - return False, "[Vidzi] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Vidzi" return True, "" diff --git a/servers/vimpleru.py b/servers/vimpleru.py index 06ba88c5..dc21c4aa 100644 --- a/servers/vimpleru.py +++ b/servers/vimpleru.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- + from core import httptools from core import scrapertools from platformcode import config, logger @@ -9,7 +10,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if '"title":"Video Not Found"' in data: - return False, "[Vimple] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Vimple" return True, "" diff --git a/servers/vipporns.py b/servers/vipporns.py index b15ca65c..cb94dc10 100644 --- a/servers/vipporns.py +++ b/servers/vipporns.py @@ -2,12 +2,13 @@ # -------------------------------------------------------- # Conector vipporns 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 -from lib.kt_player import decode def test_video_exists(page_url): @@ -17,7 +18,7 @@ def test_video_exists(page_url): "Not Found" in response.data \ or "File was deleted" in response.data \ or "is no longer available" in response.data: - return False, "[vipporns] El fichero no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "vipporns" global video_url, license_code video_url = scrapertools.find_single_match(response.data, "video_url: '([^']+)'") diff --git a/servers/viptube.py b/servers/viptube.py index c154e113..9af31d6e 100644 --- a/servers/viptube.py +++ b/servers/viptube.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/vivatube.py b/servers/vivatube.py index 504ad1cb..f3515701 100644 --- a/servers/vivatube.py +++ b/servers/vivatube.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/vivo.py b/servers/vivo.py index 168813ea..4c7b73a3 100644 --- a/servers/vivo.py +++ b/servers/vivo.py @@ -1,10 +1,10 @@ # Conector Vivo By Alfa development Group # -------------------------------------------------------- - import base64 from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url) if data.code == 404: - return False, "[Vivo] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Vivo" return True, "" diff --git a/servers/vshare.py b/servers/vshare.py index fc1ce18d..20f1a000 100644 --- a/servers/vshare.py +++ b/servers/vshare.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- - import re from core import httptools from core import scrapertools from lib import jsunpack +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) response = httptools.downloadpage(page_url) if response.code != 200 or "No longer available!" in response.data: - return False, "[vshare] El archivo no existe o ha sido borrado." + return False, config.get_localized_string(70449) % "vshare" else: return True, "" diff --git a/servers/vup.py b/servers/vup.py index 9eba027d..4f860d1d 100644 --- a/servers/vup.py +++ b/servers/vup.py @@ -2,9 +2,9 @@ # -------------------------------------------------------- # Conector vup By Alfa development Group # -------------------------------------------------------- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -12,7 +12,7 @@ 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, "[vup] El video ha sido borrado" + return False, config.get_localized_string(70449) % "vup" return True, "" diff --git a/servers/vvvvid.py b/servers/vvvvid.py index 36e7d305..3f1ddc53 100644 --- a/servers/vvvvid.py +++ b/servers/vvvvid.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- +import re + +import requests + from core import httptools from lib import vvvvid_decoder from platformcode import logger -import requests -import re # Creating persistent session current_session = requests.Session() diff --git a/servers/watchanimestream.py b/servers/watchanimestream.py index 8544fb02..3df92201 100644 --- a/servers/watchanimestream.py +++ b/servers/watchanimestream.py @@ -1,9 +1,7 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger -from lib import jsunpack def get_video_url(page_url, video_password): diff --git a/servers/winporn.py b/servers/winporn.py index 246a8a41..74db631e 100644 --- a/servers/winporn.py +++ b/servers/winporn.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/wstream.py b/servers/wstream.py index c7d72e43..08960158 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -2,7 +2,9 @@ # Kodi on Demand - Kodi Addon - Kodi Addon # by DrZ3r0 - Fix Alhaziel -import re, json +import json +import re + try: import urllib.parse as urllib except ImportError: diff --git a/servers/xdrive.py b/servers/xdrive.py index 30213d6e..5baaeab4 100644 --- a/servers/xdrive.py +++ b/servers/xdrive.py @@ -4,9 +4,9 @@ # Conector para xdrive # https://github.com/alfa-addon # ------------------------------------------------------------ - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -14,7 +14,7 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "Object not found" in data or "no longer exists" in data or '"sources": [false]' in data: - return False, "[xdrive] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "xdrive" return True, "" diff --git a/servers/xhamster.py b/servers/xhamster.py index c9965171..df46152f 100644 --- a/servers/xhamster.py +++ b/servers/xhamster.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/xstreamcdn.py b/servers/xstreamcdn.py index d20374fa..27310f4d 100644 --- a/servers/xstreamcdn.py +++ b/servers/xstreamcdn.py @@ -14,7 +14,7 @@ else: from core import httptools from core import scrapertools from core import jsontools -from platformcode import logger, config +from platformcode import logger def test_video_exists(page_url): diff --git a/servers/xvideos.py b/servers/xvideos.py index 4b8abe4e..947376df 100755 --- a/servers/xvideos.py +++ b/servers/xvideos.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- import re + from core import httptools -from core import scrapertools +from platformcode import config from platformcode import logger @@ -11,7 +12,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if "Lo sentimos" in data or "File not found" in data or 'og:video">' in data: - return False, "[Xvideos] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Xvideos" return True, "" diff --git a/servers/youdbox.py b/servers/youdbox.py index 8da0461f..a58912b4 100644 --- a/servers/youdbox.py +++ b/servers/youdbox.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import re from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/yourupload.py b/servers/yourupload.py index ef7e79a0..7625c0a3 100755 --- a/servers/yourupload.py +++ b/servers/yourupload.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -11,7 +11,7 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if "File was deleted" in data or "File not found" in data or 'og:video">' in data: - return False, "[Yourupload] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Yourupload" return True, "" diff --git a/servers/youwatch.py b/servers/youwatch.py index 5febee0b..82f461c3 100644 --- a/servers/youwatch.py +++ b/servers/youwatch.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- - from core import httptools from core import scrapertools +from platformcode import config from platformcode import logger @@ -9,12 +9,12 @@ def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) data = httptools.downloadpage(page_url).data if "File Not Found" in data: - return False, "[Youwatch] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Youwatch" url_redirect = scrapertools.find_single_match(data, '<iframe src="([^"]+)"') data = httptools.downloadpage(url_redirect).data if "We're sorry, this video is no longer available" in data: - return False, "[Youwatch] El archivo no existe o ha sido borrado" + return False, config.get_localized_string(70449) % "Youwatch" return True, "" diff --git a/servers/zippyshare.py b/servers/zippyshare.py index 2d1e86c0..65c45a70 100755 --- a/servers/zippyshare.py +++ b/servers/zippyshare.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import math import re from core import httptools