merged from develop

plugin.video.alfa/servers/adnstream.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/allmyvideos.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/auroravid.py

@@ -3,8 +3,8 @@
 import re
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/backin.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/bigfile.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/bitshare.py

@@ -2,12 +2,12 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):
-    ogger.info("(page_url='%s')" % page_url)
+    logger.info("(page_url='%s')" % page_url)
 
     # Existe: http://bitshare.com/files/v1ehsvu3/Nikita.S02E15.HDTV.XviD-ASAP.avi.html
     # No existe: http://bitshare.com/files/tn74w9tm/Rio.2011.DVDRip.LATiNO.XviD.by.Glad31.avi.html

plugin.video.alfa/servers/bitvidsx.py

@@ -3,8 +3,8 @@
 import re
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/clicknupload.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import re
 import urllib
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 token = ""
 excption = False

plugin.video.alfa/servers/cloudy.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/cnubis.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/copiapop.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/crunchyroll.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 
 import base64
-import re
 import struct
 import zlib
 from hashlib import sha1
 
-from core import config
 from core import filetools
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import config, logger
 
 GLOBAL_HEADER = {'User-Agent': 'Mozilla/5.0', 'Accept-Language': '*'}
 proxy = "http://anonymouse.org/cgi-bin/anon-www.cgi/"

plugin.video.alfa/servers/cumlouder.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):
@@ -19,4 +17,3 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [cumlouder]", media_url])
 
     return video_urls
-

plugin.video.alfa/servers/dailymotion.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/datoporn.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/debriders/alldebrid.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/debriders/realdebrid.py

@@ -3,10 +3,9 @@
 import time
 import urllib
 
-from core import config
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import config, logger
 from platformcode import platformtools
 
 headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:47.0) Gecko/20100101 Firefox/47.0'}

plugin.video.alfa/servers/decrypters/adfly.py

@@ -2,8 +2,8 @@
 
 from base64 import b64decode
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_long_url(short_url):

plugin.video.alfa/servers/decrypters/linkbucks.py

@@ -2,8 +2,8 @@
 
 import urllib
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # Obtiene la URL que hay detrás de un enlace a linkbucks

plugin.video.alfa/servers/decrypters/longurl.py

@@ -3,8 +3,8 @@
 import re
 import urllib
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_server_list():

plugin.video.alfa/servers/decrypters/safelinking.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_long_url(short_url):

plugin.video.alfa/servers/depositfiles.py

@@ -2,8 +2,8 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/directo.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/divxstage.py

@@ -3,8 +3,8 @@
 import re
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 host = "http://www.cloudtime.to"
 

plugin.video.alfa/servers/documentary.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/downace.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/eroshare.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # def test_video_exists(page_url):

plugin.video.alfa/servers/facebook.py

@@ -3,8 +3,8 @@
 import re
 import urllib
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/fakingstv.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/fastplay.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def test_video_exists(page_url):
@@ -25,7 +23,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         data = jsunpack.unpack(data).replace("\\", "")
     video_urls = []
     videos = scrapertools.find_multiple_matches(data, 'file\s*:\s*"([^"]+)",label:"(.*?)"')
-    ##Detección de subtítulos
+    # Detección de subtítulos
     subtitulo = scrapertools.find_single_match(data, 'tracks:\s*\[{file:"(.*?)"')
     if "http" not in subtitulo:
         subtitulo = "http://fastplay.cc" + subtitulo

plugin.video.alfa/servers/filebox.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/filefactory.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/fileflyer.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/filescdn.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/fileserve.py

@@ -2,8 +2,8 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/filesmonster.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/filez.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/flashx.py

@@ -2,15 +2,13 @@
 
 import base64
 import os
-import re
 import time
 import urllib
 
-from core import config
 from core import httptools
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import config, logger
 
 
 def test_video_exists(page_url):
@@ -68,7 +66,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
         fname = scrapertools.find_single_match(data, 'name="fname" value="([^"]+)"')
         hash_f = scrapertools.find_single_match(data, 'name="hash" value="([^"]+)"')
         post = 'op=download1&usr_login=&id=%s&fname=%s&referer=&hash=%s&imhuman=Proceed+to+video' % (
-        flashx_id, urllib.quote(fname), hash_f)
+            flashx_id, urllib.quote(fname), hash_f)
         wait_time = scrapertools.find_single_match(data, "<span id='xxc2'>(\d+)")
 
         file_id = scrapertools.find_single_match(data, "'file_id', '([^']+)'")
@@ -108,7 +106,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     # Extrae la URL
     # {file:"http://f11-play.flashx.tv/luq4gfc7gxixexzw6v4lhz4xqslgqmqku7gxjf4bk43u4qvwzsadrjsozxoa/video1.mp4"}
     video_urls = []
-    match = match.replace("\\","").replace('\"',"\'")
+    match = match.replace("\\", "").replace('\"', "\'")
     media_urls = scrapertools.find_multiple_matches(match, "{src:'([^']+)'.*?,label:'([^']+)'")
     subtitle = ""
     for media_url, label in media_urls:

plugin.video.alfa/servers/fourshared.py

@@ -2,8 +2,8 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/freakshare.py

@@ -2,8 +2,8 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/gamovideo.py

@@ -3,9 +3,9 @@
 import re
 
 from core import httptools
-from core import logger
 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'}
 

plugin.video.alfa/servers/gigasize.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/googlevideo.py

@@ -2,8 +2,8 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/gvideo.py

@@ -3,7 +3,6 @@
 import urllib
 
 from core import httptools
-from core import logger
 from core import scrapertools
 
 
@@ -13,7 +12,8 @@ def test_video_exists(page_url):
         return False, "[gvideo] El video no existe o ha sido borrado"
     if "Se+ha+excedido+el" in response.data:
         return False, "[gvideo] Se ha excedido el número de reproducciones permitidas"
-	return True, ""
+
+    return True, ""
 
 
 def get_video_url(page_url, user="", password="", video_password=""):
@@ -29,8 +29,8 @@ def get_video_url(page_url, user="", password="", video_password=""):
     headers_string = "|Cookie=" + cookies
     url_streams = scrapertools.find_single_match(data, 'url_encoded_fmt_stream_map=(.*)')
     streams = scrapertools.find_multiple_matches(url_streams,
-                                             'itag=(\d+)&url=(.*?)(?:;.*?quality=.*?(?:,|&)|&quality=.*?(?:,|&))')
-    itags = {'18':'360p', '22':'720p', '34':'360p', '35':'480p', '37':'1080p', '43':'360p', '59':'480p'}
+                                                 'itag=(\d+)&url=(.*?)(?:;.*?quality=.*?(?:,|&)|&quality=.*?(?:,|&))')
+    itags = {'18': '360p', '22': '720p', '34': '360p', '35': '480p', '37': '1080p', '43': '360p', '59': '480p'}
     for itag, video_url in streams:
         if not video_url in urls:
             video_url += headers_string

plugin.video.alfa/servers/hugefiles.py

@@ -3,9 +3,9 @@
 import re
 import urllib
 
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/idowatch.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/kingvid.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/letwatch.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/mailru.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/mediafire.py

@@ -3,7 +3,7 @@
 import re
 
 from core import httptools
-from core import logger
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/mega.py

@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
-from platformcode import platformtools
+from platformcode import platformtools, logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/movshare.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/mp4upload.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/netutv.py

@@ -5,8 +5,8 @@ import urllib
 
 from core import httptools
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/nosvideo.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/nowdownload.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/nowvideo.py

@@ -3,8 +3,8 @@
 import re
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/oboom.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/okru.py

@@ -3,8 +3,8 @@
 import re
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/onefichier.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
 import urllib
 
-from core import config
-from core import logger
 from core import scrapertools
+from platformcode import config, logger
 
 
 def test_video_exists(page_url):
@@ -15,7 +13,7 @@ def test_video_exists(page_url):
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):
     logger.info("(page_url='%s')" % page_url)
 
-    if config.get_setting("premium", server="onefichier") == True:
+    if config.get_setting("premium", server="onefichier"):
         user = config.get_setting("user", server="onefichier")
         password = config.get_setting("password", server="onefichier")
 

plugin.video.alfa/servers/openload.py

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import config
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import config, logger
 
 headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:51.0) Gecko/20100101 Firefox/51.0'}
 

plugin.video.alfa/servers/pcloud.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/playwatch.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
 import base64
-import re
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/playwire.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 
-import re
 import xml.etree.ElementTree as ET
 
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/powvideo.py

@@ -3,9 +3,9 @@
 import re
 
 from core import httptools
-from core import logger
 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']]
 host = "http://powvideo.net/"

plugin.video.alfa/servers/rapidgator.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/rapidvideo.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):
@@ -15,7 +13,7 @@ def test_video_exists(page_url):
         pass
 
     if not response.data or "urlopen error [Errno 1]" in str(response.code):
-        from core import config
+        from platformcode import config
         if config.is_xbmc():
             return False, "[Rapidvideo] Este conector solo funciona a partir de Kodi 17"
         elif config.get_platform() == "plex":

plugin.video.alfa/servers/raptu.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):
@@ -15,7 +13,7 @@ def test_video_exists(page_url):
         pass
 
     if not response.data or "urlopen error [Errno 1]" in str(response.code):
-        from core import config
+        from platformcode import config
         if config.is_xbmc():
             return False, "[Raptu] Este conector solo funciona a partir de Kodi 17"
         elif config.get_platform() == "plex":

plugin.video.alfa/servers/redirects.py

@@ -3,7 +3,6 @@
 import re
 import urllib2
 
-from core import logger
 from core import scrapertools
 
 

plugin.video.alfa/servers/rutube.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/sendvid.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/speedvideo.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import base64
-import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/stagevu.py

@@ -2,8 +2,8 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/stormo.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/streamango.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/streamcherry.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 # --------------------------------------------------------
-# pelisalacarta - XBMC Plugin
 # Conector para streamcherry
-# http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta/
 # --------------------------------------------------------
 
+import re
+
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):
@@ -39,6 +39,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     return video_urls
 
+
 # Encuentra vídeos del servidor en el texto pasado
 def find_videos(data):
     encontrados = set()
@@ -52,7 +53,7 @@ def find_videos(data):
         titulo = "[streamcherry]"
         url = "http://streamcherry.com/embed/%s" % match
         if url not in encontrados:
-            logger.info("  url="+url)
+            logger.info("  url=" + url)
             devuelve.append([titulo, url, 'streamcherry'])
             encontrados.add(url)
         else:

plugin.video.alfa/servers/streamcloud.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):
@@ -50,6 +48,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     return video_urls
 
+
 if __name__ == "__main__":
     import getopt
     import sys

plugin.video.alfa/servers/streame.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/streaminto.py

@@ -3,8 +3,8 @@
 import re
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/streamixcloud.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/streamplay.py

@@ -3,9 +3,9 @@
 import re
 
 from core import httptools
-from core import logger
 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']]
 host = "http://streamplay.to/"

plugin.video.alfa/servers/thevideome.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/thevideos.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/torrent.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/tunepk.py

@@ -2,8 +2,8 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/turbobit.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
+from platformcode import logger
 
 
 def get_video_url(page_url, premium=False, user="", password="", video_password=""):

plugin.video.alfa/servers/turbovideos.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/tusfiles.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/tutv.py

@@ -3,8 +3,8 @@
 import re
 import urllib
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/uploadedto.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/uptobox.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
 import urllib
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/userporn.py

@@ -3,8 +3,8 @@
 import base64
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 HOSTER_KEY = "NTI2NzI5Cgo="
 

plugin.video.alfa/servers/userscloud.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/veehd.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-import urllib
 import urlparse
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):
@@ -39,13 +37,13 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     data = scrapertools.cache_page(url, headers=headers)
     logger.info("data=" + data)
 
-    # <param name="src" value="http://v35.veehd.com/dl/f118c68806e2a98ca38a70b44b89d52b/1356264992/6000.4623246.avi&b=390">
-    media_url = scrapertools.get_match(data, '<param name="src"value="([^"]+)"')
+    # # <param name="src" value="http://v35.veehd.com/dl/f118c68806e2a98ca38a70b44b89d52b/1356264992/6000.4623246.avi&b=390">
+    # media_url = scrapertools.get_match(data, '<param name="src"value="([^"]+)"')
 
     video_urls = []
 
-    if len(matches) > 0:
-        video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [veehd]", media_url])
+    # if len(matches) > 0:
+    #     video_urls.append([scrapertools.get_filename_from_url(media_url)[-4:] + " [veehd]", media_url])
 
     for video_url in video_urls:
         logger.info("%s - %s" % (video_url[0], video_url[1]))

plugin.video.alfa/servers/veoh.py

@@ -2,8 +2,8 @@
 
 import re
 
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 # Returns an array of possible video url's from the page_url

plugin.video.alfa/servers/vidabc.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from core.httptools import downloadpage
-from core.scrapertools import logger, get_match, find_multiple_matches
+from core.scrapertools import get_match, find_multiple_matches
+from platformcode import logger
 
 host = "http://vidabc.com"
 id_server = "vidabc"
@@ -25,10 +26,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
     try:
         sources = get_match(data, 'sources\s*:\s* \[([^\]]+)\]')
     except:
-        try:
-            from core import jsunpack
-        except:
-            from lib import jsunpack
+        from lib import jsunpack
         sources = jsunpack.unpack(get_match(data, '<script[^>]*>(eval.function.p,a,c,k,e,.*?)</script>'))
         sources = get_match(sources, 'sources\s*:\s*\[([^\]]+)\]')
 

plugin.video.alfa/servers/videowood.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 
-import re
-
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/vidgg.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
 from core import jsontools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/vidgot.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
 
-import re
-
 from core import httptools
-from core import logger
 from core import scrapertools
 from lib import jsunpack
+from platformcode import logger
 
 
 def test_video_exists(page_url):

plugin.video.alfa/servers/vidlox.py

@@ -6,8 +6,8 @@
 # ------------------------------------------------------------
 
 from core import httptools
-from core import logger
 from core import scrapertools
+from platformcode import logger
 
 
 def test_video_exists(page_url):