diff --git a/channels/LIKUOO.py b/channels/LIKUOO.py index 660cd916..fbeb3023 100644 --- a/channels/LIKUOO.py +++ b/channels/LIKUOO.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger -from core import scrapertools -from core.item import Item -from core import servertools +import re +import urlparse + from core import httptools +from core import scrapertools +from core import servertools +from core.item import Item +from platformcode import logger host = 'http://www.likuoo.video' diff --git a/channels/TXXX.py b/channels/TXXX.py index 32a360b2..26c8137a 100644 --- a/channels/TXXX.py +++ b/channels/TXXX.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urllib +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://www.txxx.com' diff --git a/channels/absoluporn.py b/channels/absoluporn.py index dcdf6757..f5fce909 100644 --- a/channels/absoluporn.py +++ b/channels/absoluporn.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://www.absoluporn.es' diff --git a/channels/alsoporn.py b/channels/alsoporn.py index fb3b0288..1ada8f96 100644 --- a/channels/alsoporn.py +++ b/channels/alsoporn.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://www.alsoporn.com' diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py index 962297e1..d97eefd8 100644 --- a/channels/altadefinizione01.py +++ b/channels/altadefinizione01.py @@ -2,13 +2,11 @@ # ------------------------------------------------------------ # Canale per altadefinizione01 # ------------------------------------------------------------ -import re -import urlparse -from specials import filtertools, autoplay from core import servertools, httptools, tmdb, scrapertoolsV2, support from core.item import Item from platformcode import logger, config +from specials import autoplay #URL che reindirizza sempre al dominio corrente host = "https://altadefinizione01.team" diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py index e54d3179..4f0ebf42 100644 --- a/channels/altadefinizione01_club.py +++ b/channels/altadefinizione01_club.py @@ -5,11 +5,11 @@ # -*- last change: 04/05/2019 -from specials import autoplay, filtertools from channelselector import get_thumb from core import httptools, channeltools, scrapertools, servertools, tmdb, support from core.item import Item from platformcode import config, logger +from specials import autoplay, filtertools __channel__ = "altadefinizione01_club" diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py index 8cdeaa69..3037f154 100644 --- a/channels/altadefinizioneclick.py +++ b/channels/altadefinizioneclick.py @@ -5,10 +5,10 @@ import re -from specials import autoplay, filtertools from core import servertools, support from core.item import Item from platformcode import logger, config +from specials import autoplay host = "https://altadefinizione.center" ### <- cambio Host da .fm a .center diff --git a/channels/altadefinizionehd.py b/channels/altadefinizionehd.py index 2187c1a4..33693d4f 100644 --- a/channels/altadefinizionehd.py +++ b/channels/altadefinizionehd.py @@ -4,12 +4,11 @@ # ---------------------------------------------------------- import re -from core import httptools, scrapertools, servertools, tmdb -from platformcode import logger, config -from core.item import Item -from specials import autoplay from channelselector import thumb - +from core import httptools, scrapertools, servertools, tmdb +from core.item import Item +from platformcode import logger, config +from specials import autoplay host = "https://altadefinizione.doctor" diff --git a/channels/analdin.py b/channels/analdin.py index a8a63576..9520d314 100644 --- a/channels/analdin.py +++ b/channels/analdin.py @@ -1,13 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools - +from platformcode import logger host = 'https://www.analdin.com/es' diff --git a/channels/animeforce.py b/channels/animeforce.py index 10d1d40a..4113f6c5 100644 --- a/channels/animeforce.py +++ b/channels/animeforce.py @@ -3,15 +3,15 @@ # Ringraziamo Icarus crew # Canale per http://animeinstreaming.net/ # ------------------------------------------------------------ -import re, urllib, urlparse +import re +import urllib +import urlparse from core import httptools, scrapertools, servertools, tmdb from core.item import Item from platformcode import config, logger from servers.decrypters import adfly - - host = "https://ww1.animeforce.org" IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index 853aadf7..285f3393 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -5,12 +5,12 @@ import re -from specials import filtertools, autoplay, autorenumber -from core.support import log, menu -from core import servertools, httptools, scrapertoolsV2, scrapertools, tmdb, support -from platformcode import logger, config +from core import servertools, httptools, scrapertoolsV2, tmdb, support from core.item import Item +from core.support import log, menu from lib.js2py.host import jsfunctions +from platformcode import logger, config +from specials import autoplay, autorenumber host = "https://animepertutti.com" diff --git a/channels/animesaturn.py b/channels/animesaturn.py index 5d461240..7f88cef5 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -3,16 +3,16 @@ # Canale per AnimeSaturn # Thanks to me # ---------------------------------------------------------- -import inspect import re -import time + import urlparse -import channelselector, filtertools -from core import httptools, tmdb, scrapertools, servertools, support -from specials import autoplay +import channelselector +from core import httptools, tmdb, scrapertools, support from core.item import Item from platformcode import logger, config +from specials import autoplay + __channel__ = "animesaturn" host = config.get_setting("channel_host", __channel__) headers = [['Referer', host]] diff --git a/channels/animespace.py b/channels/animespace.py index e19fdfac..7634a5fd 100644 --- a/channels/animespace.py +++ b/channels/animespace.py @@ -4,17 +4,15 @@ # -*- By the Alfa Develop Group -*- import re -import urllib +from channelselector import get_thumb from core import httptools from core import scrapertools from core import servertools -from channelselector import get_thumb from core import tmdb from core.item import Item from platformcode import logger, config from specials import autoplay -from specials import filtertools from specials import renumbertools host = "https://animespace.tv/" diff --git a/channels/animesubita.py b/channels/animesubita.py index cb77da59..5559f58b 100644 --- a/channels/animesubita.py +++ b/channels/animesubita.py @@ -5,13 +5,13 @@ # Canale per AnimeSubIta # ------------------------------------------------------------ -import re, urllib, urlparse +import re +import urllib +import urlparse -from core import servertools, httptools, scrapertools, tmdb, support -from platformcode import logger, config +from core import httptools, scrapertools, tmdb, support from core.item import Item - - +from platformcode import logger, config host = "http://www.animesubita.org" diff --git a/channels/animetubeita.py b/channels/animetubeita.py index d3bd044d..817d77d7 100644 --- a/channels/animetubeita.py +++ b/channels/animetubeita.py @@ -3,13 +3,12 @@ # Ringraziamo Icarus crew # Canale per animetubeita # ---------------------------------------------------------- -import re, urllib +import re +import urllib from core import httptools, scrapertools, tmdb -from platformcode import logger, config from core.item import Item - - +from platformcode import logger, config host = "http://www.animetubeita.com" hostlista = host + "/lista-anime/" diff --git a/channels/animeworld.py b/channels/animeworld.py index 7ee895d2..ff56efef 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -2,15 +2,14 @@ # ------------------------------------------------------------ # Canale per animeworld # ---------------------------------------------------------- -import re, urlparse +import re +import urlparse -from core import httptools, scrapertoolsV2, servertools, tmdb, tvdb, support +from channelselector import thumb +from core import httptools, scrapertoolsV2, servertools, tmdb, support from core.item import Item from platformcode import logger, config -from specials import autoplay, filtertools, autorenumber -from channelselector import thumb - - +from specials import autoplay, autorenumber host = "https://www.animeworld.it" diff --git a/channels/bleachportal.py b/channels/bleachportal.py index 209b83a6..f06aa116 100644 --- a/channels/bleachportal.py +++ b/channels/bleachportal.py @@ -8,10 +8,8 @@ import re from core import scrapertools, httptools -from platformcode import logger from core.item import Item - - +from platformcode import logger host = "http://www.bleachportal.it" diff --git a/channels/bravoporn.py b/channels/bravoporn.py index 740dd779..c3521363 100644 --- a/channels/bravoporn.py +++ b/channels/bravoporn.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://www.bravoporn.com' diff --git a/channels/camwhoresbay.py b/channels/camwhoresbay.py index 2267e6c1..a55af776 100644 --- a/channels/camwhoresbay.py +++ b/channels/camwhoresbay.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.camwhoresbay.com' diff --git a/channels/casacinema.py b/channels/casacinema.py index fa0c794a..07d889de 100644 --- a/channels/casacinema.py +++ b/channels/casacinema.py @@ -3,14 +3,14 @@ # Kodi on Demand - Kodi Addon # Canale per casacinema # ------------------------------------------------------------ -import re, urlparse +import re +import urlparse -from core import scrapertools, scrapertoolsV2, httptools, servertools, tmdb, support -from specials import autoplay, filtertools +from channelselector import thumb, get_thumb +from core import scrapertools, scrapertoolsV2, httptools, tmdb, support from core.item import Item from platformcode import logger, config -from channelselector import thumb, get_thumb - +from specials import autoplay host = 'https://www.casacinema.site' @@ -335,37 +335,6 @@ def findvideos(item): data = data else: continue - - itemlist = servertools.find_video_items(data=data) - for videoitem in itemlist: - server = re.sub(r'[-\[\]\s]+', '', videoitem.title).capitalize() - videoitem.title = "".join(["[%s] " % support.color(server, 'orange'), item.title]) - videoitem.fulltitle = item.fulltitle - videoitem.thumbnail = item.thumbnail - videoitem.show = item.show - videoitem.plot = item.plot - videoitem.channel = item.channel - videoitem.contentType = item.contentType - videoitem.language = IDIOMAS['Italiano'] - - # Requerido para Filtrar enlaces - - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) - - # Requerido para FilterTools - - # itemlist = filtertools.get_links(itemlist, item, list_language) - - # Requerido para AutoPlay - - autoplay.start(itemlist, item) - - if item.contentType != 'episode': - if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos': - itemlist.append( - Item(channel=item.channel, title='[COLOR yellow][B]Aggiungi alla videoteca[/B][/COLOR]', url=item.url, - action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle)) - - return itemlist + + return support.server(item, data=data) diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py index 38fa29d3..a371b392 100644 --- a/channels/casacinemaInfo.py +++ b/channels/casacinemaInfo.py @@ -2,13 +2,11 @@ # ------------------------------------------------------------ # Canale per casacinema # ------------------------------------------------------------ -import re, urlparse, base64 from core import scrapertoolsV2, httptools, servertools, tmdb, support -from specials import autoplay from core.item import Item from platformcode import logger, config - +from specials import autoplay host = 'https://casacinema.info' diff --git a/channels/cat3plus.py b/channels/cat3plus.py index ea0a7234..140056b3 100644 --- a/channels/cat3plus.py +++ b/channels/cat3plus.py @@ -5,8 +5,7 @@ import re -import urllib -import urlparse + from channelselector import get_thumb from core import httptools from core import scrapertools diff --git a/channels/cb01anime.py b/channels/cb01anime.py index 9cccfdc8..f68fbe6f 100644 --- a/channels/cb01anime.py +++ b/channels/cb01anime.py @@ -10,8 +10,6 @@ from core import httptools, scrapertools, servertools, tmdb from core.item import Item from platformcode import logger, config - - host = "https://www.cineblog01.pink" #esclusione degli articoli 'di servizio' diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 3ded6e1f..8000c555 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -4,13 +4,12 @@ # ------------------------------------------------------------ import re -import urlparse -from specials import autoplay, filtertools from core import scrapertoolsV2, httptools, servertools, tmdb, support from core.item import Item from lib import unshortenit from platformcode import logger, config +from specials import autoplay #impostati dinamicamente da getUrl() host = "" diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index c00f9709..1b0c0670 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -2,17 +2,15 @@ # ------------------------------------------------------------ # Canale per CinemaLibero - First Version # ------------------------------------------------------------ -import base64 import re -import urlparse -from specials import autoplay, filtertools from core import scrapertools, servertools, httptools, support -from platformcode import logger, config +from core import tmdb from core.item import Item from lib import unshortenit from platformcode import config -from core import tmdb +from platformcode import logger +from specials import autoplay # Necessario per Autoplay IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/cinemastreaming.py b/channels/cinemastreaming.py index 0120d3e6..23df9ca4 100644 --- a/channels/cinemastreaming.py +++ b/channels/cinemastreaming.py @@ -4,9 +4,9 @@ # ------------------------------------------------------------ import re -from specials import filtertools, autoplay -from core import scrapertools, servertools, httptools, scrapertoolsV2, support +from core import scrapertools, httptools, scrapertoolsV2, support from core.item import Item +from specials import autoplay host = 'https://cinemastreaming.icu' diff --git a/channels/cinetecadibologna.py b/channels/cinetecadibologna.py index eab59e07..f5c1d088 100644 --- a/channels/cinetecadibologna.py +++ b/channels/cinetecadibologna.py @@ -5,15 +5,13 @@ # ------------------------------------------------------------ import re + import urlparse from core import httptools, scrapertools from core.item import Item from platformcode import logger, config - - - host = "http://cinestore.cinetecadibologna.it" headers = [['Referer', host]] diff --git a/channels/cinetemagay.py b/channels/cinetemagay.py index ad5f5a6d..ad575f68 100644 --- a/channels/cinetemagay.py +++ b/channels/cinetemagay.py @@ -3,9 +3,8 @@ import os import re -from core import scrapertools -from core import servertools from core import httptools +from core import servertools from core.item import Item from platformcode import config, logger diff --git a/channels/cliphunter.py b/channels/cliphunter.py index 60784647..cf044a34 100644 --- a/channels/cliphunter.py +++ b/channels/cliphunter.py @@ -1,13 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools - +from platformcode import logger host = 'https://www.cliphunter.com' diff --git a/channels/coomelonitas.py b/channels/coomelonitas.py index 42b88afd..05d9164e 100644 --- a/channels/coomelonitas.py +++ b/channels/coomelonitas.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger -from core import httptools +import re +from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host ='http://www.coomelonitas.com' diff --git a/channels/cumlouder.py b/channels/cumlouder.py index abbeeba8..1bc5568c 100644 --- a/channels/cumlouder.py +++ b/channels/cumlouder.py @@ -2,6 +2,7 @@ import re import urllib + import urlparse from core import httptools diff --git a/channels/czechvideo.py b/channels/czechvideo.py index b914d462..3dd4bbb8 100644 --- a/channels/czechvideo.py +++ b/channels/czechvideo.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re +import urlparse + +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools +from platformcode import logger host = 'http://czechvideo.org' diff --git a/channels/documentaristreamingda.py b/channels/documentaristreamingda.py index 4dd43d76..bfed21b3 100644 --- a/channels/documentaristreamingda.py +++ b/channels/documentaristreamingda.py @@ -3,13 +3,12 @@ # Ringraziamo Icarus crew # Canale per documentaristreamingda # ------------------------------------------------------------ -import re, urlparse +import re +import urlparse -from platformcode import logger, config -from core import httptools, scrapertools, servertools +from core import httptools, scrapertools, servertools from core.item import Item - - +from platformcode import logger, config host = "https://documentari-streaming-da.com" diff --git a/channels/dreamsub.py b/channels/dreamsub.py index e575ee3f..c5516fae 100644 --- a/channels/dreamsub.py +++ b/channels/dreamsub.py @@ -3,14 +3,13 @@ # Ringraziamo Icarus crew # Canale per dreamsub # ------------------------------------------------------------ -import re, urlparse +import re +import urlparse from core import scrapertools, httptools, servertools, tmdb from core.item import Item from platformcode import logger, config - - host = "https://www.dreamsub.co" diff --git a/channels/elreyx.py b/channels/elreyx.py index 2be4cb35..33f78914 100644 --- a/channels/elreyx.py +++ b/channels/elreyx.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger -from core import scrapertools -from core.item import Item -from core import servertools +import re +import urlparse + from core import httptools +from core import scrapertools +from core import servertools +from core.item import Item +from platformcode import logger host = 'http://www.elreyx.com' diff --git a/channels/eporner.py b/channels/eporner.py index edbb3f67..7cb78df8 100644 --- a/channels/eporner.py +++ b/channels/eporner.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import httptools diff --git a/channels/eroticage.py b/channels/eroticage.py index fab51da2..eb42dd31 100644 --- a/channels/eroticage.py +++ b/channels/eroticage.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re +import urlparse + +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools +from platformcode import logger host = 'http://www.eroticage.net' diff --git a/channels/eroticasonlinetv.py b/channels/eroticasonlinetv.py index 42e4e885..6f6c6017 100644 --- a/channels/eroticasonlinetv.py +++ b/channels/eroticasonlinetv.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger -from core import scrapertools -from core.item import Item -from core import servertools +import re +import urlparse + from core import httptools +from core import scrapertools +from core import servertools +from core.item import Item +from platformcode import logger host = 'http://www.peliculaseroticasonline.tv' diff --git a/channels/erotik.py b/channels/erotik.py index 25250305..fb8168f1 100644 --- a/channels/erotik.py +++ b/channels/erotik.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import httptools diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index 70ebc4ee..d2687933 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -17,11 +17,10 @@ import re -from specials import autoplay, filtertools -from core import scrapertoolsV2, httptools, servertools, tmdb, support +from core import scrapertoolsV2, httptools, tmdb, support from core.item import Item from platformcode import logger, config - +from specials import autoplay host = "https://eurostreaming.cafe/" headers = ['Referer', host] diff --git a/channels/fapality.py b/channels/fapality.py index f8ec9cbc..780f9796 100644 --- a/channels/fapality.py +++ b/channels/fapality.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://fapality.com' diff --git a/channels/fastsubita.py b/channels/fastsubita.py index 97e75997..f2bba2a5 100644 --- a/channels/fastsubita.py +++ b/channels/fastsubita.py @@ -4,12 +4,12 @@ # Canale per fastsubita # ------------------------------------------------------------ -import re, urlparse +import re -from specials import autoplay, filtertools -from core import scrapertools, servertools, httptools, tmdb +from core import scrapertools, httptools, tmdb from core.item import Item from platformcode import config, logger +from specials import autoplay __channel__ = 'fastsubita' host = config.get_setting("channel_host", __channel__) diff --git a/channels/fetishshrine.py b/channels/fetishshrine.py index a0a3971d..ddd0ac14 100644 --- a/channels/fetishshrine.py +++ b/channels/fetishshrine.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.fetishshrine.com' diff --git a/channels/filmigratis.py b/channels/filmigratis.py index 82e9bca8..1a1a28b3 100644 --- a/channels/filmigratis.py +++ b/channels/filmigratis.py @@ -2,15 +2,12 @@ # ------------------------------------------------------------ # Canale per Filmi Gratis # ------------------------------------------------------------ -import base64 import re -import urlparse -from channelselector import get_thumb -from specials import filtertools, autoplay from core import scrapertools, servertools, httptools, tmdb, support -from platformcode import logger, config from core.item import Item +from platformcode import logger, config +from specials import autoplay channel = 'filmigratis' diff --git a/channels/filmoviXXX.py b/channels/filmoviXXX.py index f61b0e84..b378e4d5 100644 --- a/channels/filmoviXXX.py +++ b/channels/filmoviXXX.py @@ -1,12 +1,14 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re +import urlparse + +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools +from platformcode import logger + # BLOQUEO ESET INTERNET SECURITY def mainlist(item): diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py index bca50d7e..6a936109 100644 --- a/channels/filmpertutti.py +++ b/channels/filmpertutti.py @@ -3,14 +3,12 @@ # Canale per filmpertutti.co # ------------------------------------------------------------ import re -import urlparse -from specials import autoplay +from channelselector import thumb from core import scrapertoolsV2, servertools, httptools, tmdb, support from core.item import Item -from lib import unshortenit from platformcode import config, logger -from channelselector import thumb +from specials import autoplay host = "https://www.filmpertutti.club" headers = [['Referer', host]] diff --git a/channels/filmpornoita.py b/channels/filmpornoita.py index 2287c3ed..880f1e1d 100644 --- a/channels/filmpornoita.py +++ b/channels/filmpornoita.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://www.streamxxxx.com' diff --git a/channels/filmsenzalimiti.py b/channels/filmsenzalimiti.py index a0103af7..de62f0c4 100644 --- a/channels/filmsenzalimiti.py +++ b/channels/filmsenzalimiti.py @@ -2,17 +2,13 @@ # ------------------------------------------------------------ # Canale per Filmsenzalimiti # ------------------------------------------------------------ -import base64 import re -import urlparse -from channelselector import get_thumb -from specials import filtertools, autoplay from core import scrapertools, servertools, httptools, support -from platformcode import logger, config from core.item import Item from platformcode import config -from core import tmdb +from platformcode import logger +from specials import autoplay __channel__ = 'filmsenzalimiti' diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py index d54afbdd..7db3b9b5 100644 --- a/channels/filmsenzalimiticc.py +++ b/channels/filmsenzalimiticc.py @@ -2,17 +2,16 @@ # ------------------------------------------------------------ # Canale per Filmsenzalimiti CC # ------------------------------------------------------------ -import base64 import re + import urlparse -from specials import autoplay -from specials import filtertools from core import scrapertools, servertools, httptools -from platformcode import logger, config +from core import tmdb from core.item import Item from platformcode import config -from core import tmdb +from platformcode import logger +from specials import autoplay # Necessario per Autoplay __channel__ = 'filmsenzalimiticc' diff --git a/channels/foxtube.py b/channels/foxtube.py index 353d0bdb..4b45a898 100644 --- a/channels/foxtube.py +++ b/channels/foxtube.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://es.foxtube.com' diff --git a/channels/freeporn.py b/channels/freeporn.py index ee856614..3103651f 100644 --- a/channels/freeporn.py +++ b/channels/freeporn.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://frprn.com' diff --git a/channels/freepornstreams.py b/channels/freepornstreams.py index b56db321..c436dec8 100644 --- a/channels/freepornstreams.py +++ b/channels/freepornstreams.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re +import urlparse + +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools +from platformcode import logger host = 'http://freepornstreams.org' diff --git a/channels/guardarefilm.py b/channels/guardarefilm.py index 3e1403b0..b3a5fb0d 100644 --- a/channels/guardarefilm.py +++ b/channels/guardarefilm.py @@ -4,13 +4,13 @@ # Canale per guardarefilm # ---------------------------------------------------------- import re + import urlparse from core import httptools from core import scrapertools from core import servertools from core.item import Item -from core import tmdb from platformcode import logger, config host = "https://www.guardarefilm.video" diff --git a/channels/guardaseriecc.py b/channels/guardaseriecc.py index 4e65e832..41fe6102 100644 --- a/channels/guardaseriecc.py +++ b/channels/guardaseriecc.py @@ -7,12 +7,11 @@ import re from core import httptools, scrapertools, servertools -from core.item import Item from core import tmdb +from core.item import Item from lib import unshortenit from platformcode import logger, config - host = 'https://guardaserie.site' headers = [['Referer', host]] diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py index 71915f5d..a7387fef 100644 --- a/channels/guardaserieclick.py +++ b/channels/guardaserieclick.py @@ -6,12 +6,11 @@ import re -from core import httptools, scrapertools, servertools, support -from core.item import Item +from core import httptools, scrapertools, servertools, support from core import tmdb +from core.item import Item from platformcode import logger, config - host = "http://www.guardaserie.watch" headers = [['Referer', host]] diff --git a/channels/guardogratis.py b/channels/guardogratis.py index f5808ef4..03583c41 100644 --- a/channels/guardogratis.py +++ b/channels/guardogratis.py @@ -4,15 +4,16 @@ # Canale per guardogratis # # ---------------------------------------------------------- -import re +import re + import urlparse from core import httptools -from platformcode import logger, config from core import scrapertools from core import servertools -from core.item import Item from core import tmdb +from core.item import Item +from platformcode import logger, config __channel__ = "guardogratis" diff --git a/channels/hclips.py b/channels/hclips.py index 9ae7ce89..785ba47e 100644 --- a/channels/hclips.py +++ b/channels/hclips.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urllib +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://www.hclips.com' diff --git a/channels/hdblog.py b/channels/hdblog.py index f98f1b18..805e3d84 100644 --- a/channels/hdblog.py +++ b/channels/hdblog.py @@ -3,13 +3,12 @@ # Ringraziamo Icarus crew # Canale hdblog # ------------------------------------------------------------ -import re, urlparse +import re +import urlparse from core import httptools, scrapertools -from platformcode import logger, config from core.item import Item - - +from platformcode import logger host = "https://www.hdblog.it" diff --git a/channels/hdzog.py b/channels/hdzog.py index 09ef0158..7fb08179 100644 --- a/channels/hdzog.py +++ b/channels/hdzog.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urllib +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://www.hdzog.com' diff --git a/channels/hellporno.py b/channels/hellporno.py index d1e21273..e6407aa0 100644 --- a/channels/hellporno.py +++ b/channels/hellporno.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://hellporno.com' diff --git a/channels/hentaiid.py b/channels/hentaiid.py index 22430fef..f1c69f7b 100644 --- a/channels/hentaiid.py +++ b/channels/hentaiid.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import httptools diff --git a/channels/hotmovs.py b/channels/hotmovs.py index 37ec2078..78ebcb6a 100644 --- a/channels/hotmovs.py +++ b/channels/hotmovs.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urllib +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://hotmovs.com' diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py index 77bcc496..a88dafe4 100644 --- a/channels/ilgeniodellostreaming.py +++ b/channels/ilgeniodellostreaming.py @@ -3,14 +3,14 @@ # Ringraziamo Icarus crew # Canale per ilgeniodellostreaming # ------------------------------------------------------------ -import re, urlparse +import re +import urlparse -from platformcode import config, logger from core import scrapertools, servertools, httptools -from core.item import Item -from specials import autoplay -from specials import filtertools from core import tmdb +from core.item import Item +from platformcode import config, logger +from specials import autoplay __channel__ = "ilgeniodellostreaming" diff --git a/channels/ilgiramondo.py b/channels/ilgiramondo.py index 07130391..e6b9116d 100644 --- a/channels/ilgiramondo.py +++ b/channels/ilgiramondo.py @@ -3,13 +3,12 @@ # Ringraziamo Icarus crew # Canale ilgiramondo # ------------------------------------------------------------ -import re, urlparse +import re +import urlparse from core import httptools, scrapertools -from platformcode import logger, config from core.item import Item - - +from platformcode import logger host = "http://www.ilgiramondo.net" diff --git a/channels/istitutoluce.py b/channels/istitutoluce.py index acf8249a..e859bfd5 100644 --- a/channels/istitutoluce.py +++ b/channels/istitutoluce.py @@ -4,14 +4,13 @@ # Canale istitutoluce # ------------------------------------------------------------ -import re, urlparse +import re +import urlparse from core import httptools, scrapertools, servertools from core.item import Item from platformcode import logger, config - - host = "https://patrimonio.archivioluce.com" host2 = "https://www.archivioluce.com" diff --git a/channels/italiafilm.py b/channels/italiafilm.py index a9b6c296..fa437435 100644 --- a/channels/italiafilm.py +++ b/channels/italiafilm.py @@ -4,15 +4,14 @@ # Canale per italiafilm # ---------------------------------------------------------- import re -import time + import urlparse from core import httptools from core import scrapertools from core import servertools -from core.item import Item from core import tmdb -from lib.unshortenit import unshorten_only +from core.item import Item from platformcode import logger, config host = "https://www.italia-film.pro" diff --git a/channels/italiafilmhd.py b/channels/italiafilmhd.py index ba41d390..9ab4a0ab 100644 --- a/channels/italiafilmhd.py +++ b/channels/italiafilmhd.py @@ -3,15 +3,14 @@ # Ringraziamo Icarus crew # Canale per italiafilmhd # ---------------------------------------------------------- -import base64 import re + import urlparse -from specials import autoplay -from specials import filtertools from core import scrapertools, servertools, httptools, tmdb, support from core.item import Item from platformcode import logger, config +from specials import autoplay IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() diff --git a/channels/italiaserie.py b/channels/italiaserie.py index af216988..0c1e46bf 100644 --- a/channels/italiaserie.py +++ b/channels/italiaserie.py @@ -5,8 +5,8 @@ import re import autoplay -import filtertools import support + from core import httptools, scrapertools from core import tmdb from core.item import Item diff --git a/channels/itastreaming.py b/channels/itastreaming.py index 79a5318c..9c9cf2e4 100644 --- a/channels/itastreaming.py +++ b/channels/itastreaming.py @@ -3,16 +3,12 @@ # Ringraziamo Icarus crew # Canale per itastreaming # ---------------------------------------------------------- -import base64 import re -import urlparse -from core import scrapertools, httptools, servertools, tmdb, support +from core import scrapertools, httptools, tmdb, support from core.item import Item from platformcode import logger, config - - host = "https://itastreaming.film" headers = [['Referer', host]] diff --git a/channels/javlin.py b/channels/javlin.py index f73e27a8..39d12d60 100644 --- a/channels/javlin.py +++ b/channels/javlin.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://javl.in' diff --git a/channels/javwhores.py b/channels/javwhores.py index e0c901c4..26105d9f 100644 --- a/channels/javwhores.py +++ b/channels/javwhores.py @@ -1,13 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools - +from platformcode import logger host = 'https://www.javwhores.com/' diff --git a/channels/jizzbunker.py b/channels/jizzbunker.py index a7c6e0e2..4e148b76 100644 --- a/channels/jizzbunker.py +++ b/channels/jizzbunker.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://jizzbunker.com/es' diff --git a/channels/justporn.py b/channels/justporn.py index accfe7ae..e44e5388 100644 --- a/channels/justporn.py +++ b/channels/justporn.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://xxx.justporno.tv' diff --git a/channels/mondolunatico.py b/channels/mondolunatico.py index 1a6c5f46..864cc419 100644 --- a/channels/mondolunatico.py +++ b/channels/mondolunatico.py @@ -7,15 +7,16 @@ import os import re import time import urllib + import urlparse from core import httptools -from platformcode import config -from platformcode import logger from core import scrapertools from core import servertools -from core.item import Item from core import tmdb +from core.item import Item +from platformcode import config +from platformcode import logger __channel__ = "mondolunatico" diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py index a7649b10..fc8e1498 100644 --- a/channels/mondoserietv.py +++ b/channels/mondoserietv.py @@ -5,15 +5,13 @@ # # ---------------------------------------------------------- import re -import urllib -from specials import autoplay -from specials import filtertools from core import scrapertools, servertools, httptools, scrapertoolsV2 -from core.item import Item from core import tmdb +from core.item import Item from lib.unshortenit import unshorten from platformcode import logger, config +from specials import autoplay host = "https://mondoserietv.com" IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/mporno.py b/channels/mporno.py index 6b48d298..a9501fa5 100644 --- a/channels/mporno.py +++ b/channels/mporno.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://mporno.tv' diff --git a/channels/muchoporno.py b/channels/muchoporno.py index 5f3acbca..7841a745 100644 --- a/channels/muchoporno.py +++ b/channels/muchoporno.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.pornburst.xxx' diff --git a/channels/nuvid.py b/channels/nuvid.py index cddd53ad..36c0d630 100644 --- a/channels/nuvid.py +++ b/channels/nuvid.py @@ -2,6 +2,7 @@ import base64 import hashlib + import urlparse from core import httptools diff --git a/channels/pandamovie.py b/channels/pandamovie.py index 8cec78c5..febd0f7a 100644 --- a/channels/pandamovie.py +++ b/channels/pandamovie.py @@ -1,16 +1,13 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -import urlparse -import urllib2 -import urllib import re -import os -import sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger + +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'https://pandamovies.pw' diff --git a/channels/peliculaseroticas.py b/channels/peliculaseroticas.py index bfe7f065..07557dc8 100644 --- a/channels/peliculaseroticas.py +++ b/channels/peliculaseroticas.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- import re + import urlparse +from core import httptools from core import scrapertools from core.item import Item from platformcode import logger -from core import httptools def mainlist(item): diff --git a/channels/perfectgirls.py b/channels/perfectgirls.py index 43503f3c..bd9ab819 100644 --- a/channels/perfectgirls.py +++ b/channels/perfectgirls.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://www.perfectgirls.net' diff --git a/channels/piratestreaming.py b/channels/piratestreaming.py index d7b3c11f..a3598e2a 100644 --- a/channels/piratestreaming.py +++ b/channels/piratestreaming.py @@ -4,15 +4,15 @@ # Canale per piratestreaming # ---------------------------------------------------------- import re + import urlparse -from specials import autoplay -from specials import filtertools from core import httptools, scrapertools, servertools -from core.item import Item from core import tmdb +from core.item import Item from lib import unshortenit from platformcode import logger, config +from specials import autoplay __channel__ = "piratestreaming" diff --git a/channels/playpornx.py b/channels/playpornx.py index 6d78f45c..a95d2d77 100644 --- a/channels/playpornx.py +++ b/channels/playpornx.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import httptools diff --git a/channels/porn300.py b/channels/porn300.py index 98336141..e68dbc69 100644 --- a/channels/porn300.py +++ b/channels/porn300.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.porn300.com' diff --git a/channels/pornboss.py b/channels/pornboss.py index fff3c45e..3a8f00b2 100644 --- a/channels/pornboss.py +++ b/channels/pornboss.py @@ -1,14 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import jsontools as json +import re + +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools -from core import tmdb +from platformcode import logger host = 'http://pornboss.org' diff --git a/channels/porneq.py b/channels/porneq.py index b99e176d..e7ecd0dc 100644 --- a/channels/porneq.py +++ b/channels/porneq.py @@ -1,16 +1,11 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -import urlparse -import urllib2 -import urllib import re -import os -import sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://porneq.com' diff --git a/channels/pornhive.py b/channels/pornhive.py index be3ff00b..42c23f84 100644 --- a/channels/pornhive.py +++ b/channels/pornhive.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys import base64 +import re +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools +from platformcode import logger host = 'http://www.pornhive.tv/en' diff --git a/channels/pornhub.py b/channels/pornhub.py index 1ba72460..55fafe6c 100644 --- a/channels/pornhub.py +++ b/channels/pornhub.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- import re + import urlparse + from core import httptools from core import scrapertools from core.item import Item diff --git a/channels/pornrewind.py b/channels/pornrewind.py index 16af24f4..918bead8 100644 --- a/channels/pornrewind.py +++ b/channels/pornrewind.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.pornrewind.com' diff --git a/channels/porntrex.py b/channels/porntrex.py index 6888e620..e11ac968 100644 --- a/channels/porntrex.py +++ b/channels/porntrex.py @@ -2,6 +2,7 @@ import re import urllib + import urlparse from core import httptools diff --git a/channels/programmazione.py b/channels/programmazione.py index 39d28aae..7ad79e71 100644 --- a/channels/programmazione.py +++ b/channels/programmazione.py @@ -8,10 +8,8 @@ import re from core import httptools, scrapertools -from platformcode import logger, config from core.item import Item - - +from platformcode import logger site = "https://www.youtube.com" diff --git a/channels/qwertty.py b/channels/qwertty.py index c15fb750..bfcfef78 100644 --- a/channels/qwertty.py +++ b/channels/qwertty.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urllib +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://qwertty.net' diff --git a/channels/redtube.py b/channels/redtube.py index 9aaf9a61..c6ad55aa 100644 --- a/channels/redtube.py +++ b/channels/redtube.py @@ -2,7 +2,9 @@ #------------------------------------------------------------ import re + import urlparse + from core import httptools from core import scrapertools from core.item import Item diff --git a/channels/ricettevideo.py b/channels/ricettevideo.py index 66f746e0..f304eef1 100644 --- a/channels/ricettevideo.py +++ b/channels/ricettevideo.py @@ -3,13 +3,12 @@ # Ringraziamo Icarus crew # Canale ricettevideo # ------------------------------------------------------------ -import re, urlparse +import re +import urlparse from core import httptools, scrapertools -from platformcode import logger, config from core.item import Item - - +from platformcode import logger host = "http://ricettevideo.net" diff --git a/channels/seriehd.py b/channels/seriehd.py index 2f167ac6..7a1e5974 100644 --- a/channels/seriehd.py +++ b/channels/seriehd.py @@ -4,12 +4,12 @@ # ------------------------------------------------------------ import urlparse -from specials import autoplay, filtertools -from core.support import menu, log -from core import scrapertoolsV2, servertools, httptools, tmdb, support -from core.item import Item -from platformcode import logger, config from channelselector import thumb +from core import scrapertoolsV2, servertools, httptools, support +from core.item import Item +from core.support import menu, log +from platformcode import logger, config +from specials import autoplay host = "https://seriehd.casa" diff --git a/channels/serietvonline.py b/channels/serietvonline.py index adc05134..120e4152 100644 --- a/channels/serietvonline.py +++ b/channels/serietvonline.py @@ -4,12 +4,12 @@ # ---------------------------------------------------------- import re +from channelselector import thumb from core import httptools, scrapertoolsV2, servertools, tmdb, support from core.item import Item from lib import unshortenit from platformcode import logger, config from specials import autoplay -from channelselector import thumb host = "https://serietvonline.live" headers = [['Referer', host]] diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py index 7716cedc..0e587acc 100644 --- a/channels/serietvsubita.py +++ b/channels/serietvsubita.py @@ -3,15 +3,15 @@ # Canale per Serie Tv Sub ITA # Thanks to Icarus crew & Alfa addon # ---------------------------------------------------------- -import inspect import re import time import channelselector -from specials import autoplay, filtertools -from core import httptools, tmdb, scrapertools, servertools, support +from core import httptools, tmdb, scrapertools, support from core.item import Item from platformcode import logger, config +from specials import autoplay + __channel__ = "serietvsubita" host = config.get_setting("channel_host", __channel__) headers = [['Referer', host]] diff --git a/channels/serietvu.py b/channels/serietvu.py index c4dedb4f..80fb13c9 100644 --- a/channels/serietvu.py +++ b/channels/serietvu.py @@ -6,10 +6,11 @@ import re import channelselector -from specials import autoplay, filtertools -from core import httptools, tmdb, scrapertools, servertools, support +from core import httptools, tmdb, scrapertools, support from core.item import Item from platformcode import logger, config +from specials import autoplay + __channel__ = 'serietvu' host = config.get_setting("channel_host", __channel__) headers = [['Referer', host]] diff --git a/channels/serviporno.py b/channels/serviporno.py index e1491070..704b1496 100644 --- a/channels/serviporno.py +++ b/channels/serviporno.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import httptools diff --git a/channels/sexgalaxy.py b/channels/sexgalaxy.py index c8b68f16..9cc93f00 100644 --- a/channels/sexgalaxy.py +++ b/channels/sexgalaxy.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- import re + import urlparse + from core import httptools from core import scrapertools from core import servertools diff --git a/channels/sexkino.py b/channels/sexkino.py index efb4d5c3..8eb31482 100644 --- a/channels/sexkino.py +++ b/channels/sexkino.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- import re + import urlparse + from core import httptools from core import scrapertools from core import servertools diff --git a/channels/sexofilm.py b/channels/sexofilm.py index 305bd899..1d7012dd 100644 --- a/channels/sexofilm.py +++ b/channels/sexofilm.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re +import urlparse + +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools +from platformcode import logger host = 'http://sexofilm.com' diff --git a/channels/siska.py b/channels/siska.py index 2ef0d1a2..4fce0a75 100644 --- a/channels/siska.py +++ b/channels/siska.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://www.siska.tv/' diff --git a/channels/sleazemovies.py b/channels/sleazemovies.py index 10b81e6f..1f7d8744 100644 --- a/channels/sleazemovies.py +++ b/channels/sleazemovies.py @@ -4,6 +4,7 @@ # -*- By Sculkurt -*- import re + from channelselector import get_thumb from core import httptools from core import scrapertools diff --git a/channels/spankbang.py b/channels/spankbang.py index 538eabe8..f6c25fcf 100644 --- a/channels/spankbang.py +++ b/channels/spankbang.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://es.spankbang.com' diff --git a/channels/spankwire.py b/channels/spankwire.py index f0271f58..38522cd6 100644 --- a/channels/spankwire.py +++ b/channels/spankwire.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.spankwire.com' diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py index 5e190e68..8dceedac 100644 --- a/channels/streamingaltadefinizione.py +++ b/channels/streamingaltadefinizione.py @@ -4,8 +4,8 @@ # ------------------------------------------------------------ from core import support -from specials import autoplay from core.item import Item +from specials import autoplay host = 'https://www.streamingaltadefinizione.space' diff --git a/channels/streamingporn.py b/channels/streamingporn.py index 027fc9e9..15357d7f 100644 --- a/channels/streamingporn.py +++ b/channels/streamingporn.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger -from core import scrapertools -from core.item import Item -from core import servertools +import re +import urlparse + from core import httptools +from core import scrapertools +from core import servertools +from core.item import Item +from platformcode import logger host = 'http://streamingporn.xyz' diff --git a/channels/streamking.py b/channels/streamking.py index 7a49541c..71aecbfe 100644 --- a/channels/streamking.py +++ b/channels/streamking.py @@ -7,10 +7,9 @@ import re import urllib -from core import scrapertools, servertools, httptools -from platformcode import logger, config +from core import scrapertools, httptools from core.item import Item -from platformcode import config +from platformcode import logger host = "http://streamking.cc" diff --git a/channels/streamporno.py b/channels/streamporno.py index 04bf6b28..1625ee2e 100644 --- a/channels/streamporno.py +++ b/channels/streamporno.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://streamporno.eu' diff --git a/channels/submityouflicks.py b/channels/submityouflicks.py index cdc15fce..4d013109 100644 --- a/channels/submityouflicks.py +++ b/channels/submityouflicks.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import httptools diff --git a/channels/sunporno.py b/channels/sunporno.py index 2711a09b..65438323 100644 --- a/channels/sunporno.py +++ b/channels/sunporno.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.sunporno.com' diff --git a/channels/support.py b/channels/support.py deleted file mode 100644 index 3755929e..00000000 --- a/channels/support.py +++ /dev/null @@ -1,541 +0,0 @@ -# support functions that are needed by many channels, to no repeat the same code -import base64, urlparse, re, os, inspect -from core import httptools, scrapertoolsV2, servertools, tmdb -from core.item import Item -import urllib - -from lib import unshortenit -from platformcode import logger, config -from channelselector import thumb -from specials import autoplay - - -def hdpass_get_servers(item): - # Carica la pagina - data = httptools.downloadpage(item.url).data.replace('\n', '') - patron = r']+><\/iframe>' - url = scrapertoolsV2.find_single_match(data, patron).replace("?alta", "") - url = url.replace("&download=1", "") - if 'https' not in url: - url = 'https:' + url - - if 'hdpass' or 'hdplayer' in url: - data = httptools.downloadpage(url).data - - start = data.find('
') - end = data.find('
', start) - data = data[start:end] - - patron_res = '
(.*?)
' - patron_mir = '
(.*?)
' - patron_media = r'' - - res = scrapertoolsV2.find_single_match(data, patron_res) - - itemlist = [] - - for res_url, res_video in scrapertoolsV2.find_multiple_matches(res, '([^<]+?)'): - - data = httptools.downloadpage(urlparse.urljoin(url, res_url)).data.replace('\n', '') - - mir = scrapertoolsV2.find_single_match(data, patron_mir) - - for mir_url, server in scrapertoolsV2.find_multiple_matches(mir, '([^<]+?)'): - - data = httptools.downloadpage(urlparse.urljoin(url, mir_url)).data.replace('\n', '') - for media_label, media_url in scrapertoolsV2.find_multiple_matches(data, patron_media): - itemlist.append(Item(channel=item.channel, - action="play", - title=item.title+" ["+color(server, 'orange')+"]"+" - "+color(res_video, 'limegreen'), - fulltitle=item.fulltitle, - quality=res_video, - show=item.show, - thumbnail=item.thumbnail, - contentType=item.contentType, - server=server, - url=url_decode(media_url))) - log("video -> ", res_video) - - return itemlist - - -def url_decode(url_enc): - lenght = len(url_enc) - if lenght % 2 == 0: - len2 = lenght / 2 - first = url_enc[0:len2] - last = url_enc[len2:lenght] - url_enc = last + first - reverse = url_enc[::-1] - return base64.b64decode(reverse) - - last_car = url_enc[lenght - 1] - url_enc[lenght - 1] = ' ' - url_enc = url_enc.strip() - len1 = len(url_enc) - len2 = len1 / 2 - first = url_enc[0:len2] - last = url_enc[len2:len1] - url_enc = last + first - reverse = url_enc[::-1] - reverse = reverse + last_car - return base64.b64decode(reverse) - - -def color(text, color): - return "[COLOR " + color + "]" + text + "[/COLOR]" - - -def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="", patron_block="", - patronNext="", action="findvideos", addVideolibrary = True): - # patron: the patron to use for scraping page, all capturing group must match with listGroups - # listGroups: a list containing the scraping info obtained by your patron, in order - # accepted values are: url, title, thumb, quality, year, plot, duration, genre, rating - - # header: values to pass to request header - # blacklist: titles that you want to exclude(service articles for example) - # data: if you want to pass data manually, maybe because you need some custom replacement - # patron_block: patron to get parts of the page (to scrape with patron attribute), - # if you need a "block inside another block" you can create a list, please note that all matches - # will be packed as string - # patronNext: patron for scraping next page link - # action: if you want results perform an action different from "findvideos", useful when scraping film by genres - # url_host: string to prepend to scrapedurl, useful when url don't contain host - # example usage: - # import support - # itemlist = [] - # patron = 'blablabla' - # headers = [['Referer', host]] - # blacklist = 'Request a TV serie!' - # return support.scrape(item, itemlist, patron, ['thumb', 'quality', 'url', 'title', 'year', 'plot','episode','lang'], - # headers=headers, blacklist=blacklist) - - itemlist = [] - - if not data: - data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"') - data = re.sub('\n|\t', ' ', data) - # replace all ' with " and eliminate newline, so we don't need to worry about - log('DATA =', data) - - block = data - - if patron_block: - if type(patron_block) == str: - patron_block = [patron_block] - - for n, regex in enumerate(patron_block): - blocks = scrapertoolsV2.find_multiple_matches(block, regex) - block = "" - for b in blocks: - block += "\n" + str(b) # by greko - log('BLOCK ', n, '=', block) - else: - block = data - if patron and listGroups: - matches = scrapertoolsV2.find_multiple_matches(block, patron) - log('MATCHES =', matches) - - known_keys = ['url', 'title', 'episode', 'thumb', 'quality', 'year', 'plot', 'duration', 'genere', 'rating', 'lang'] # by greko aggiunto episode + lang - for match in matches: - if len(listGroups) > len(match): # to fix a bug - match = list(match) - match.extend([''] * (len(listGroups) - len(match))) - - scraped = {} - for kk in known_keys: - val = match[listGroups.index(kk)] if kk in listGroups else '' - if val and (kk == "url" or kk == 'thumb') and 'http' not in val: - val = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + val - scraped[kk] = val - - title = scrapertoolsV2.decodeHtmlentities(scraped["title"]).strip() - plot = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["plot"])) - - # modificato by Greko inizio - longtitle = '[B]' + title + '[/B] ' - if scraped["quality"]: # by greko aggiunto episode - longtitle += '[COLOR blue][' + scraped["quality"] + '][/COLOR]'#'[B]' + title + '[/B] - [B]' + scraped["episode"] + '[/B][COLOR blue][' + scraped["quality"] + '][/COLOR]' # by greko aggiunto episode - if scraped["episode"]: # by greko aggiunto episode - longtitle += '[B]' + scraped["episode"] + '[/B]'#'[B]' + title + '[/B] - [B]' + scraped["episode"] + '[/B]' # by greko aggiunto episode - if scraped["lang"]: - if 'sub' in scraped["lang"].lower(): - lang = 'Sub-ITA' - else: - lang = 'ITA' - longtitle += '[COLOR blue][ ' + lang + ' ][/COLOR]' - # modificato by Greko fine - - if item.infoLabels["title"] or item.fulltitle: # if title is set, probably this is a list of episodes or video sources - infolabels = item.infoLabels - else: - infolabels = {} - if scraped["year"]: - infolabels['year'] = scraped["year"] - if scraped["plot"]: - infolabels['plot'] = plot - if scraped["duration"]: - matches = scrapertoolsV2.find_multiple_matches(scraped["duration"],r'([0-9])\s*?(?:[hH]|:|\.|,|\\|\/|\||\s)\s*?([0-9]+)') - for h, m in matches: - scraped["duration"] = int(h) * 60 + int(m) - if not matches: - scraped["duration"] = scrapertoolsV2.find_single_match(scraped["duration"], r'(\d+)') - infolabels['duration'] = int(scraped["duration"]) * 60 - if scraped["genere"]: - genres = scrapertoolsV2.find_multiple_matches(scraped["genere"], '[A-Za-z]+') - infolabels['genere'] = ", ".join(genres) - if scraped["rating"]: - infolabels['rating'] = scrapertoolsV2.decodeHtmlentities(scraped["rating"]) - - if scraped["title"] not in blacklist: - it = Item( - channel=item.channel, - action=action, - contentType=item.contentType, - title=longtitle, - fulltitle=title, - show=title, - quality=scraped["quality"], - url=scraped["url"], - infoLabels=infolabels, - thumbnail=scraped["thumb"], - args=item.args - ) - - for lg in list(set(listGroups).difference(known_keys)): - it.__setattr__(lg, match[listGroups.index(lg)]) - - itemlist.append(it) - - if (item.contentType == "episode" and (action != "findvideos" and action != "play")) \ - or (item.contentType == "movie" and action != "play"): - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - else: - for it in itemlist: - it.infoLabels = item.infoLabels - - if patronNext: - nextPage(itemlist, item, data, patronNext, 2) - - if addVideolibrary and (item.infoLabels["title"] or item.fulltitle): - item.fulltitle = item.infoLabels["title"] - videolibrary(itemlist, item) - - return itemlist - - -def dooplay_get_links(item, host): - # get links from websites using dooplay theme and dooplay_player - # return a list of dict containing these values: url, title and server - - data = httptools.downloadpage(item.url).data.replace("'", '"') - patron = r'
  • ([^<>]+)(?:([^<>]+))?' - matches = scrapertoolsV2.find_multiple_matches(data, patron) - - ret = [] - - for type, post, nume, title, server in matches: - postData = urllib.urlencode({ - "action": "doo_player_ajax", - "post": post, - "nume": nume, - "type": type - }) - dataAdmin = httptools.downloadpage(host + 'wp-admin/admin-ajax.php', post=postData,headers={'Referer': item.url}).data - link = scrapertoolsV2.find_single_match(dataAdmin, "([^<>]+).*?([^<>]+).*?([0-9]{4}).*?

    ([^<>]+)' - patronNext = '') if not match else match - - if not match: - from lib import jsunpack - - try: - data = scrapertoolsV2.find_single_match(data.replace('\n', ''), r"(eval\s?\(function\(p,a,c,k,e,d.*?)") - data = jsunpack.unpack(data) - - logger.debug("##### play /link/ unpack ##\n%s\n##" % data) - except: - logger.debug("##### The content is yet unpacked ##\n%s\n##" % data) - - data = scrapertoolsV2.find_single_match(data, r'var link(?:\s)?=(?:\s)?"([^"]+)";') - data, c = unshortenit.unwrap_30x_only(data) - else: - data = match - if data.startswith('/'): - data = urlparse.urljoin("http://swzz.xyz", data) - if not "vcrypt" in data: - data = httptools.downloadpage(data).data - logger.debug("##### play /link/ data ##\n%s\n##" % data) - else: - data = item.url - - return data - - -def menu(itemlist, title='', action='', url='', contentType='movie', args=[]): - # Function to simplify menu creation - - frame = inspect.stack()[1] - filename = frame[0].f_code.co_filename - filename = os.path.basename(filename).replace('.py','') - - # Call typo function - title = typo(title) - - if contentType == 'movie': extra = 'movie' - else: extra = 'tvshow' - - itemlist.append(Item( - channel = filename, - title = title, - action = action, - url = url, - extra = extra, - args = args, - contentType = contentType - )) - - # Apply auto Thumbnails at the menus - from channelselector import thumb - thumb(itemlist) - - return itemlist - - -def typo(string, typography=''): - - kod_color = '0xFF65B3DA' #'0xFF0081C2' - - - # Check if the typographic attributes are in the string or outside - if typography: - string = string + ' ' + typography - if config.get_localized_string(30992) in string: - string = string + ' >' - - # If there are no attributes, it applies the default ones - attribute = ['[]','()','{}','submenu','color','bold','italic','_','--','[B]','[I]','[COLOR]'] - - movie_word_list = ['film', 'serie', 'tv', 'anime', 'cinema', 'sala'] - search_word_list = ['cerca'] - categories_word_list = ['genere', 'categoria', 'categorie', 'ordine', 'lettera', 'anno', 'alfabetico', 'a-z', 'menu'] - - if not any(word in string for word in attribute): - if any(word in string.lower() for word in search_word_list): - string = '[COLOR '+ kod_color +']' + string + '[/COLOR]' - elif any(word in string.lower() for word in categories_word_list): - string = ' > ' + string - elif any(word in string.lower() for word in movie_word_list): - string = '[B]' + string + '[/B]' - - # Otherwise it uses the typographical attributes of the string - else: - if '[]' in string: - string = '[' + re.sub(r'\s\[\]','',string) + ']' - if '()' in string: - string = '(' + re.sub(r'\s\(\)','',string) + ')' - if '{}' in string: - string = '{' + re.sub(r'\s\{\}','',string) + '}' - if 'submenu' in string: - string = ' > ' + re.sub(r'\ssubmenu','',string) - if 'color' in string: - color = scrapertoolsV2.find_single_match(string,'color ([a-z]+)') - if color == 'kod' or '': color = kod_color - string = '[COLOR '+ color +']' + re.sub(r'\scolor\s([a-z]+)','',string) + '[/COLOR]' - if 'bold' in string: - string = '[B]' + re.sub(r'\sbold','',string) + '[/B]' - if 'italic' in string: - string = '[I]' + re.sub(r'\sitalic','',string) + '[/I]' - if '_' in string: - string = ' ' + re.sub(r'\s_','',string) - if '--' in string: - string = ' - ' + re.sub(r'\s--','',string) - - return string - - -def match(item, patron='', patron_block='', headers='', url=''): - matches = [] - url = url if url else item.url - data = httptools.downloadpage(url, headers=headers).data.replace("'", '"') - data = re.sub('\n|\t', '', data) - log('DATA= ', data) - - if patron_block: - block = scrapertoolsV2.find_single_match(data, patron_block) - log('BLOCK= ',block) - else: - block = data - - if patron: - matches = scrapertoolsV2.find_multiple_matches(block, patron) - log('MATCHES= ',matches) - - return matches, data - - -def videolibrary(itemlist, item, typography=''): - if item.contentType != 'episode': - action = 'add_pelicula_to_library' - extra = 'findvideos' - contentType = 'movie' - else: - action = 'add_serie_to_library' - extra = 'episodios' - contentType = 'tvshow' - if not typography: typography = 'color kod bold' - title = typo(config.get_localized_string(30161) + ' ' + typography) - if inspect.stack()[1][3] == 'findvideos' and contentType == 'movie' or inspect.stack()[1][3] != 'findvideos' and contentType != 'movie': - if config.get_videolibrary_support() and len(itemlist) > 0: - itemlist.append( - Item(channel=item.channel, - title=title, - contentType=contentType, - contentSerieName=item.fulltitle if contentType == 'tvshow' else '', - url=item.url, - action=action, - extra=extra, - contentTitle=item.fulltitle)) - - -def nextPage(itemlist, item, data, patron, function_level=1): - # Function_level is useful if the function is called by another function. - # If the call is direct, leave it blank - - next_page = scrapertoolsV2.find_single_match(data, patron) - if 'http' not in next_page: - next_page = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + next_page - log('NEXT= ', next_page) - - if next_page != "": - itemlist.append( - Item(channel=item.channel, - action=inspect.stack()[function_level][3], - contentType=item.contentType, - title=typo(config.get_localized_string(30992), 'color kod bold'), - url=next_page, - args=item.args, - thumbnail=thumb())) - - return itemlist - -def server(item, data='', headers='', AutoPlay=True, CheckLinks=True): - - __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', item.channel) - log(__comprueba_enlaces__ ) - __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', item.channel) - log(__comprueba_enlaces_num__ ) - - if not data: - data = httptools.downloadpage(item.url, headers=headers).data - - itemlist = servertools.find_video_items(data=str(data)) - - for videoitem in itemlist: - videoitem.title = "".join([item.title, ' ', typo(videoitem.title, 'color kod []')]) - videoitem.fulltitle = item.fulltitle - videoitem.show = item.show - videoitem.thumbnail = item.thumbnail - videoitem.channel = item.channel - videoitem.contentType = item.contentType - - if __comprueba_enlaces__ and CheckLinks: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) - - if AutoPlay == True: - autoplay.start(itemlist, item) - - return itemlist - - -def aplay(item, itemlist, list_servers='', list_quality=''): - if inspect.stack()[1][3] == 'mainlist': - autoplay.init(item.channel, list_servers, list_quality) - autoplay.show_option(item.channel, itemlist) - else: - autoplay.start(itemlist, item) - - -def log(stringa1="", stringa2="", stringa3="", stringa4="", stringa5=""): - # Function to simplify the log - # Automatically returns File Name and Function Name - - frame = inspect.stack()[1] - filename = frame[0].f_code.co_filename - filename = os.path.basename(filename) - logger.info("[" + filename + "] - [" + inspect.stack()[1][3] + "] " + str(stringa1) + str(stringa2) + str(stringa3) + str(stringa4) + str(stringa5)) diff --git a/channels/tabooshare.py b/channels/tabooshare.py index 628bc5b1..0ce7976d 100644 --- a/channels/tabooshare.py +++ b/channels/tabooshare.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re + +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools +from platformcode import logger host = 'http://tabooshare.com' diff --git a/channels/tantifilm.py b/channels/tantifilm.py index c82d92e5..aa88d6b6 100644 --- a/channels/tantifilm.py +++ b/channels/tantifilm.py @@ -4,13 +4,14 @@ # ------------------------------------------------------------ import re + import urlparse -from specials import autorenumber -from core.support import menu, log, aplay from core import scrapertoolsV2, httptools, tmdb, support from core.item import Item -from platformcode import config, logger +from core.support import menu, log, aplay +from platformcode import logger +from specials import autorenumber IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() diff --git a/channels/thumbzilla.py b/channels/thumbzilla.py index d0273b3c..e68fa3b5 100644 --- a/channels/thumbzilla.py +++ b/channels/thumbzilla.py @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- import re + import urlparse +from channelselector import get_thumb from core import channeltools from core import httptools from core import scrapertools -from core import servertools from core.item import Item from platformcode import config, logger -from channelselector import get_thumb __channel__ = "thumbzilla" diff --git a/channels/tnaflix.py b/channels/tnaflix.py index 37127033..5ed50378 100644 --- a/channels/tnaflix.py +++ b/channels/tnaflix.py @@ -1,14 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools -from core import tmdb -from core import jsontools +from platformcode import logger host = 'https://www.tnaflix.com' diff --git a/channels/toonitalia.py b/channels/toonitalia.py index 6b881f03..36cc0dfb 100644 --- a/channels/toonitalia.py +++ b/channels/toonitalia.py @@ -5,12 +5,11 @@ # ------------------------------------------------------------ import re -import urlparse -from specials import autoplay, filtertool -from core import scrapertools, scrapertoolsV2, httptools, tmdb, servertoolss, support +from core import scrapertools, httptools, tmdb, support from core.item import Item -from platformcode import logger, config +from platformcode import logger +from specials import autoplay channel = "toonitalia" host = "https://toonitalia.org" diff --git a/channels/tryboobs.py b/channels/tryboobs.py index 5d8b01bb..24d326e0 100644 --- a/channels/tryboobs.py +++ b/channels/tryboobs.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://www.tryboobs.com' diff --git a/channels/tubedupe.py b/channels/tubedupe.py index ae014ad6..c3fd7404 100644 --- a/channels/tubedupe.py +++ b/channels/tubedupe.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://tubedupe.com' diff --git a/channels/tubehentai.py b/channels/tubehentai.py index e679a5d7..baf45d1d 100644 --- a/channels/tubehentai.py +++ b/channels/tubehentai.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import scrapertools diff --git a/channels/vedohd.py b/channels/vedohd.py index 2e21ae8e..9e459c63 100644 --- a/channels/vedohd.py +++ b/channels/vedohd.py @@ -3,14 +3,10 @@ # Canale per vedohd # ------------------------------------------------------------ -import re -import urlparse - -from specials import autoplay -from core import scrapertoolsV2, httptools, servertools, support +from core import scrapertoolsV2, httptools, support from core.item import Item from platformcode import logger -from channelselector import thumb +from specials import autoplay headers = "" host = "" diff --git a/channels/videosXYZ.py b/channels/videosXYZ.py index 489efdc5..6801942b 100644 --- a/channels/videosXYZ.py +++ b/channels/videosXYZ.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re +import urlparse + +from core import httptools from core import scrapertools from core import servertools from core.item import Item -from platformcode import config, logger -from core import httptools +from platformcode import logger host = 'http://free-porn-videos.xyz' diff --git a/channels/vidz7.py b/channels/vidz7.py index 35a1cfe7..5621f1eb 100644 --- a/channels/vidz7.py +++ b/channels/vidz7.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import httptools diff --git a/channels/vintagetube.py b/channels/vintagetube.py index 1bd20636..87ca480d 100644 --- a/channels/vintagetube.py +++ b/channels/vintagetube.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://www.vintagetube.club' diff --git a/channels/vintagexxxsex.py b/channels/vintagexxxsex.py index 3e1650f9..7c732c7a 100644 --- a/channels/vintagexxxsex.py +++ b/channels/vintagexxxsex.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://www.vintagexxxsex.com' diff --git a/channels/vporn.py b/channels/vporn.py index 048ba1bd..810b6414 100644 --- a/channels/vporn.py +++ b/channels/vporn.py @@ -1,14 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import jsontools as json -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools -from core import tmdb +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'https://www.vporn.com' diff --git a/channels/watchpornfree.py b/channels/watchpornfree.py index 2115bc58..6760feb7 100644 --- a/channels/watchpornfree.py +++ b/channels/watchpornfree.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger # https://playpornfree.org/ https://mangoporn.net/ https://watchfreexxx.net/ https://losporn.org/ https://xxxstreams.me/ https://speedporn.net/ diff --git a/channels/webpeliculasporno.py b/channels/webpeliculasporno.py index 9b1d474d..d9510a03 100644 --- a/channels/webpeliculasporno.py +++ b/channels/webpeliculasporno.py @@ -1,16 +1,13 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -import urlparse -import urllib2 -import urllib import re -import os -import sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger + +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://www.webpeliculasporno.com' diff --git a/channels/woodrocket.py b/channels/woodrocket.py index 7bf2dee1..c4e1ec74 100644 --- a/channels/woodrocket.py +++ b/channels/woodrocket.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://woodrocket.com' diff --git a/channels/x18hentai.py b/channels/x18hentai.py index 66f15a18..21c84558 100644 --- a/channels/x18hentai.py +++ b/channels/x18hentai.py @@ -4,9 +4,9 @@ import re from core import httptools from core import scrapertools +from core import servertools from core.item import Item from platformcode import logger -from core import servertools host = 'http://www.18hentaionline.net/' headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], diff --git a/channels/xhamster.py b/channels/xhamster.py index e56481eb..fb528002 100644 --- a/channels/xhamster.py +++ b/channels/xhamster.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- import re -import sys + import urlparse -from platformcode import logger from core import scrapertools, httptools from core.item import Item +from platformcode import logger HOST = "http://es.xhamster.com/" diff --git a/channels/xms.py b/channels/xms.py index 3f4440c4..ad360a8c 100644 --- a/channels/xms.py +++ b/channels/xms.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import re + import urlparse from core import channeltools diff --git a/channels/xozilla.py b/channels/xozilla.py index 4b5640ed..e9ded5f6 100644 --- a/channels/xozilla.py +++ b/channels/xozilla.py @@ -1,17 +1,13 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -import urlparse -import urllib2 -import urllib import re -import os -import sys -from platformcode import config, logger +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.xozilla.com' diff --git a/channels/xtapes.py b/channels/xtapes.py index c0ce25b6..0ca05421 100644 --- a/channels/xtapes.py +++ b/channels/xtapes.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger -from core import scrapertools -from core.item import Item -from core import servertools +import re +import urlparse + from core import httptools +from core import scrapertools +from core import servertools +from core.item import Item +from platformcode import logger host = 'http://hd.xtapes.to' diff --git a/channels/xxxdan.py b/channels/xxxdan.py index dc9c7926..6d369df1 100644 --- a/channels/xxxdan.py +++ b/channels/xxxdan.py @@ -1,13 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys +import re +import urlparse -from platformcode import config, logger +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'http://xxxdan.com' diff --git a/channels/xxxfreeinhd.py b/channels/xxxfreeinhd.py index 4562cf84..c5551afa 100644 --- a/channels/xxxfreeinhd.py +++ b/channels/xxxfreeinhd.py @@ -1,12 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger -from core import scrapertools -from core.item import Item -from core import servertools +import re +import urlparse + from core import httptools +from core import scrapertools +from core import servertools +from core.item import Item +from platformcode import logger host = 'https://watchxxxfreeinhd.com' diff --git a/channels/xxxparodyhd.py b/channels/xxxparodyhd.py index 6daaf8d3..36695cc6 100644 --- a/channels/xxxparodyhd.py +++ b/channels/xxxparodyhd.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools from core import tmdb +from core.item import Item +from platformcode import logger host = 'https://xxxparodyhd.net' diff --git a/channels/xxxstreams.py b/channels/xxxstreams.py index 4d96439e..e8091c3c 100644 --- a/channels/xxxstreams.py +++ b/channels/xxxstreams.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://xxxstreams.org' diff --git a/channels/yespornplease.py b/channels/yespornplease.py index b63a61dd..89f48334 100644 --- a/channels/yespornplease.py +++ b/channels/yespornplease.py @@ -2,12 +2,11 @@ import re -from core import httptools -from core.item import Item -from platformcode import logger from urlparse import urljoin -from core import servertools +from core import httptools +from core import servertools +from platformcode import logger HOST="http://yespornplease.com" diff --git a/channels/youjizz.py b/channels/youjizz.py index eeec28cb..c7b799ae 100644 --- a/channels/youjizz.py +++ b/channels/youjizz.py @@ -1,16 +1,13 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -import urlparse -import urllib2 -import urllib import re -import os -import sys -from platformcode import config, logger + +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.youjizz.com' diff --git a/channels/youporn.py b/channels/youporn.py index f015a01b..1f952da0 100644 --- a/channels/youporn.py +++ b/channels/youporn.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from platformcode import config, logger +import re +import urlparse + +from core import httptools from core import scrapertools from core.item import Item -from core import servertools -from core import httptools +from platformcode import logger host = 'https://www.youporn.com' diff --git a/channels/youtube_channel.py b/channels/youtube_channel.py index 0cd437be..343fd332 100644 --- a/channels/youtube_channel.py +++ b/channels/youtube_channel.py @@ -3,7 +3,6 @@ import urllib from core import jsontools -from core import scrapertools from core.item import Item from platformcode import logger diff --git a/channels/yuuk.py b/channels/yuuk.py index 8e9435cc..63d83ba7 100644 --- a/channels/yuuk.py +++ b/channels/yuuk.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- #------------------------------------------------------------ -import urlparse,urllib2,urllib,re -import os, sys -from core import scrapertools -from core import servertools -from core.item import Item -from platformcode import config, logger +import re +import urlparse + from core import httptools +from core import scrapertools +from core.item import Item +from platformcode import logger host = 'http://yuuk.net' diff --git a/core/channeltools.py b/core/channeltools.py index 39d6b60b..d17fc86e 100644 --- a/core/channeltools.py +++ b/core/channeltools.py @@ -6,6 +6,7 @@ import os import jsontools + from platformcode import config, logger DEFAULT_UPDATE_URL = "/channels/" diff --git a/core/cloudflare.py b/core/cloudflare.py index b7a021c6..529e65c6 100644 --- a/core/cloudflare.py +++ b/core/cloudflare.py @@ -6,10 +6,10 @@ import re import time import urllib + import urlparse from platformcode import logger -from decimal import Decimal class Cloudflare: diff --git a/core/downloader.py b/core/downloader.py index e54ccb20..ea918462 100644 --- a/core/downloader.py +++ b/core/downloader.py @@ -24,9 +24,10 @@ import sys import threading import time import urllib +from threading import Thread, Lock + import urllib2 import urlparse -from threading import Thread, Lock from core import filetools from platformcode import logger, config diff --git a/core/downloadtools.py b/core/downloadtools.py index 36dc3350..260312e0 100644 --- a/core/downloadtools.py +++ b/core/downloadtools.py @@ -9,6 +9,7 @@ import socket import sys import time import urllib + import urllib2 from platformcode import config, logger diff --git a/core/item.py b/core/item.py index f07c8219..10d1a83c 100644 --- a/core/item.py +++ b/core/item.py @@ -7,6 +7,7 @@ import base64 import copy import os import urllib + from HTMLParser import HTMLParser from core import jsontools as json diff --git a/core/scrapertoolsV2.py b/core/scrapertoolsV2.py index 15f457bb..9fa26d28 100644 --- a/core/scrapertoolsV2.py +++ b/core/scrapertoolsV2.py @@ -5,6 +5,7 @@ import re import time + import urlparse from core.entities import html5 diff --git a/core/servertools.py b/core/servertools.py index fad7599d..260812bc 100644 --- a/core/servertools.py +++ b/core/servertools.py @@ -3,12 +3,11 @@ # Server management # -------------------------------------------------------------------------------- -import datetime import os import re -import time -import urlparse + import filetools +import urlparse from core import httptools from core import jsontools diff --git a/core/support.py b/core/support.py index cf991056..80f89599 100644 --- a/core/support.py +++ b/core/support.py @@ -1,12 +1,17 @@ # support functions that are needed by many channels, to no repeat the same code -import base64, urlparse, re, os, inspect +import base64 +import inspect +import os +import re +import urllib +import urlparse +import xbmcaddon + +from channelselector import thumb from core import httptools, scrapertoolsV2, servertools, tmdb from core.item import Item -import urllib - from lib import unshortenit from platformcode import logger, config -from channelselector import thumb from specials import autoplay @@ -56,6 +61,14 @@ def hdpass_get_servers(item): url=url_decode(media_url))) log("video -> ", res_video) + __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', item.channel) + __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', item.channel) + + if __comprueba_enlaces__: + itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks'): + itemlist = servertools.check_list_links(itemlist, xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks_number')) + return itemlist @@ -516,7 +529,9 @@ def server(item, data='', headers='', AutoPlay=True, CheckLinks=True): if __comprueba_enlaces__ and CheckLinks: itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) - + if xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks'): + itemlist = servertools.check_list_links(itemlist, xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks_number')) + if AutoPlay == True: autoplay.start(itemlist, item) diff --git a/core/tmdb.py b/core/tmdb.py index 7e5b8589..d71371b1 100644 --- a/core/tmdb.py +++ b/core/tmdb.py @@ -5,6 +5,8 @@ import re import sqlite3 import time +import xbmcaddon + from core import filetools from core import httptools from core import jsontools @@ -13,7 +15,6 @@ from core.item import InfoLabels from platformcode import config from platformcode import logger -import xbmc, xbmcaddon addon = xbmcaddon.Addon('metadata.themoviedb.org') def_lang = addon.getSetting('language') @@ -541,9 +542,6 @@ def completar_codigos(item): def discovery(item): - from core.item import Item - from platformcode import unify - if item.search_type == 'discover': listado = Tmdb(discover={'url':'discover/%s' % item.type, 'with_genres':item.list_type, 'language':def_lang, 'page':item.page}) diff --git a/core/trakt_tools.py b/core/trakt_tools.py index 95b6752b..0669e89a 100644 --- a/core/trakt_tools.py +++ b/core/trakt_tools.py @@ -4,14 +4,15 @@ # -*- By the Alfa Develop Group -* import os +from threading import Thread import xbmc + from core import httptools from core import jsontools from core.item import Item from platformcode import config from platformcode import logger -from threading import Thread client_id = "c40ba210716aee87f6a9ddcafafc56246909e5377b623b72c15909024448e89d" client_secret = "999164f25832341f0214453bb11c915adb18e9490d6b5e9a707963a5a1bee43e" diff --git a/core/tvdb.py b/core/tvdb.py index e0ad1c25..328fdce5 100644 --- a/core/tvdb.py +++ b/core/tvdb.py @@ -8,6 +8,7 @@ # ------------------------------------------------------------ import re + import urllib2 from core import jsontools @@ -19,7 +20,7 @@ from platformcode import platformtools HOST = "https://api.thetvdb.com" HOST_IMAGE = "http://thetvdb.com/banners/" -import xbmc, xbmcaddon +import xbmcaddon addon = xbmcaddon.Addon('metadata.tvdb.com') TOKEN = config.get_setting("tvdb_token", default="") diff --git a/core/videolibrarytools.py b/core/videolibrarytools.py index 6c7b532f..381e1bd5 100644 --- a/core/videolibrarytools.py +++ b/core/videolibrarytools.py @@ -11,9 +11,9 @@ from core import filetools from core import scraper from core import scrapertools from core.item import Item +from lib import generictools from platformcode import config, logger from platformcode import platformtools -from lib import generictools FOLDER_MOVIES = config.get_setting("folder_movies") FOLDER_TVSHOWS = config.get_setting("folder_tvshows") @@ -807,8 +807,6 @@ def caching_torrents(url, referer=None, post=None, torrents_path=None, timeout=1 logger.info() if referer and post: logger.info('REFERER: ' + referer) - import urllib - import re from core import httptools torrent_file = '' headers = {'Content-Type': 'application/x-www-form-urlencoded', 'Referer': referer} #Necesario para el Post del .Torrent diff --git a/platformcode/custom_code.py b/platformcode/custom_code.py index 5ccb5ea1..bcfa6319 100644 --- a/platformcode/custom_code.py +++ b/platformcode/custom_code.py @@ -3,16 +3,16 @@ # Updater (kodi) # -------------------------------------------------------------------------------- -import os import json +import os import traceback + import xbmc import xbmcaddon -from platformcode import config, logger, platformtools - -from core import jsontools from core import filetools +from core import jsontools +from platformcode import config, logger, platformtools json_data_file_name = 'custom_code.json' diff --git a/platformcode/download_and_play.py b/platformcode/download_and_play.py index f8f9faab..39e3babf 100644 --- a/platformcode/download_and_play.py +++ b/platformcode/download_and_play.py @@ -11,10 +11,11 @@ import socket import threading import time import urllib -import urllib2 +import urllib2 import xbmc import xbmcgui + from core import downloadtools from platformcode import config, logger diff --git a/platformcode/infoplus.py b/platformcode/infoplus.py index 75ea411c..aeb4ef7f 100644 --- a/platformcode/infoplus.py +++ b/platformcode/infoplus.py @@ -7,7 +7,9 @@ import re from threading import Thread import xbmc +import xbmcaddon import xbmcgui + from core import httptools from core import scrapertools from core import tmdb @@ -16,7 +18,6 @@ from core.scrapertools import decodeHtmlentities as dhe from platformcode import config, logger from platformcode import platformtools -import xbmcaddon addon = xbmcaddon.Addon('metadata.themoviedb.org') def_lang = addon.getSetting('language') diff --git a/platformcode/keymaptools.py b/platformcode/keymaptools.py index 9594fa3b..66270a50 100644 --- a/platformcode/keymaptools.py +++ b/platformcode/keymaptools.py @@ -5,6 +5,7 @@ from threading import Timer import xbmc import xbmcaddon import xbmcgui + from channelselector import get_thumb from platformcode import config diff --git a/platformcode/launcher.py b/platformcode/launcher.py index 55da26c5..df7e000b 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -5,14 +5,15 @@ import os import sys -import urllib2 -import time + import updater +import urllib2 + from core import channeltools from core import scrapertools from core import servertools -from core import videolibrarytools from core import trakt_tools +from core import videolibrarytools from core.item import Item from platformcode import config, logger from platformcode import platformtools diff --git a/platformcode/logger.py b/platformcode/logger.py index 0812c964..447fe8a1 100644 --- a/platformcode/logger.py +++ b/platformcode/logger.py @@ -6,6 +6,7 @@ import inspect import xbmc + from platformcode import config loggeractive = (config.get_setting("debug") == True) diff --git a/platformcode/mct.py b/platformcode/mct.py index 38a5085a..2c2fe21d 100644 --- a/platformcode/mct.py +++ b/platformcode/mct.py @@ -7,6 +7,7 @@ import os import shutil import tempfile import urllib + import urllib2 try: diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 3304149d..7c17e473 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -14,15 +14,17 @@ import urllib import config import xbmc +import xbmcaddon import xbmcgui import xbmcplugin + from channelselector import get_thumb -from platformcode import unify from core import channeltools from core import trakt_tools, scrapertoolsV2 from core.item import Item from platformcode import logger -import xbmcaddon +from platformcode import unify + addon = xbmcaddon.Addon('plugin.video.kod') downloadenabled = addon.getSetting('downloadenabled') @@ -1128,7 +1130,6 @@ def play_torrent(item, xlistitem, mediaurl): logger.info() import time from core import filetools - from core import httptools from core import videolibrarytools # Opciones disponibles para Reproducir torrents diff --git a/platformcode/recaptcha.py b/platformcode/recaptcha.py index fa541856..57f4a68b 100644 --- a/platformcode/recaptcha.py +++ b/platformcode/recaptcha.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import xbmcgui + from core import httptools from core import scrapertools from platformcode import config diff --git a/platformcode/subtitletools.py b/platformcode/subtitletools.py index 5e49fdc8..fa55ddb7 100644 --- a/platformcode/subtitletools.py +++ b/platformcode/subtitletools.py @@ -8,6 +8,7 @@ from unicodedata import normalize import xbmc import xbmcgui + from platformcode import config, logger allchars = string.maketrans('', '') diff --git a/platformcode/unify.py b/platformcode/unify.py index 657df0d6..b93c1e84 100644 --- a/platformcode/unify.py +++ b/platformcode/unify.py @@ -6,14 +6,11 @@ # datos obtenidos de las paginas # ---------------------------------------------------------- -import os -import sys -import urllib -import unicodedata import re +import unicodedata import config -from core.item import Item + from core import scrapertools from platformcode import logger diff --git a/platformcode/updater.py b/platformcode/updater.py index ecb9d184..995c76ee 100644 --- a/platformcode/updater.py +++ b/platformcode/updater.py @@ -3,22 +3,17 @@ # Updater (kodi) # -------------------------------------------------------------------------------- -import os, sys -import time -import threading -import traceback -import urllib import json +import os +import sys +import threading +import time +import urllib + import xbmc -import shutil -from platformcode import config, logger, platformtools - -from core import httptools -from core import jsontools -from core import downloadtools from core import ziptools -from core import filetools +from platformcode import config, logger REMOTE_FILE = "https://github.com/kodiondemand/addon/archive/master.zip" DESTINATION_FOLDER = xbmc.translatePath("special://home/addons") + "/plugin.video.kod" diff --git a/platformcode/xbmc_config_menu.py b/platformcode/xbmc_config_menu.py index da728191..c31be558 100644 --- a/platformcode/xbmc_config_menu.py +++ b/platformcode/xbmc_config_menu.py @@ -7,6 +7,7 @@ import inspect import os import xbmcgui + from core import channeltools from core import servertools from platformcode import config, logger diff --git a/platformcode/xbmc_info_window.py b/platformcode/xbmc_info_window.py index 45a2c47a..fea52fa2 100644 --- a/platformcode/xbmc_info_window.py +++ b/platformcode/xbmc_info_window.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import xbmcgui + from core.tmdb import Tmdb from platformcode import config, logger diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index adc5c1a3..ecf46d27 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -6,9 +6,10 @@ import os import threading import time -import urllib2 +import urllib2 import xbmc + from core import filetools from core import jsontools from platformcode import config, logger diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index a35082d8..7c5d7869 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -85,6 +85,14 @@ msgctxt "#30019" msgid "Filter channels by language:" msgstr "" +msgctxt "#30020" +msgid "Check if the links exist" +msgstr "" + +msgctxt "#30021" +msgid "Number of links to check" +msgstr "" + msgctxt "#30043" msgid "Force view mode:" msgstr "" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 11d24000..ab71e87f 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -85,6 +85,14 @@ msgctxt "#30019" msgid "Filter channels by language:" msgstr "Filtra canale per lingua:" +msgctxt "#30020" +msgid "Check if the links exist" +msgstr "Controlla se i link esistono" + +msgctxt "#30021" +msgid "Number of links to check" +msgstr "Numero di link da verificare" + msgctxt "#30043" msgid "Force view mode:" msgstr "Forza modalità di visualizzazione:" diff --git a/resources/settings.xml b/resources/settings.xml index de8acc5f..3b1c9059 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -4,6 +4,8 @@ + + diff --git a/servers/backin.py b/servers/backin.py index b30c3436..8bf5b7cb 100644 --- a/servers/backin.py +++ b/servers/backin.py @@ -2,11 +2,9 @@ import urllib -import xbmc - -from platformcode import logger from core import httptools from core import scrapertools +from platformcode import logger def test_video_exists(page_url): diff --git a/servers/bitshare.py b/servers/bitshare.py index 443a68b5..08acfe94 100644 --- a/servers/bitshare.py +++ b/servers/bitshare.py @@ -1,9 +1,6 @@ # -*- 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 31c166ea..f06165d9 100644 --- a/servers/cinemaupload.py +++ b/servers/cinemaupload.py @@ -3,6 +3,7 @@ # Conector Cinemaupload By Alfa development Group # -------------------------------------------------------- import re + from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/cloudvideo.py b/servers/cloudvideo.py index e8652eeb..84b5b21e 100644 --- a/servers/cloudvideo.py +++ b/servers/cloudvideo.py @@ -1,7 +1,6 @@ # Conector Cloudvideo By Alfa development Group # -------------------------------------------------------- -import re from core import httptools from core import scrapertools from lib import jsunpack diff --git a/servers/datoporn.py b/servers/datoporn.py index 8f2de9f8..ca5076c8 100644 --- a/servers/datoporn.py +++ b/servers/datoporn.py @@ -2,7 +2,6 @@ from core import httptools from core import scrapertools -from lib import jsunpack from platformcode import logger diff --git a/servers/debriders/realdebrid.py b/servers/debriders/realdebrid.py index e947111e..97b516e1 100644 --- a/servers/debriders/realdebrid.py +++ b/servers/debriders/realdebrid.py @@ -3,9 +3,8 @@ import time import urllib -from core import jsontools from core import httptools -from core import scrapertools +from core import jsontools from platformcode import config, logger from platformcode import platformtools diff --git a/servers/decrypters/zcrypt.py b/servers/decrypters/zcrypt.py index fb871f3f..9a80edf3 100644 --- a/servers/decrypters/zcrypt.py +++ b/servers/decrypters/zcrypt.py @@ -2,10 +2,9 @@ # Ringraziamo errmax e dr-z3r0 import re -from core import httptools, scrapertools, scrapertoolsV2 - -from servers.decrypters import expurl +from core import httptools, scrapertoolsV2 from platformcode import logger +from servers.decrypters import expurl def get_video_url(page_url, premium=False, user="", password="", video_password=""): diff --git a/servers/deltabit.py b/servers/deltabit.py index d3229782..ab20f44c 100644 --- a/servers/deltabit.py +++ b/servers/deltabit.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- +import time import urllib + from core import httptools from core import scrapertools from platformcode import logger -import time def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) diff --git a/servers/estream.py b/servers/estream.py index 6ff87af2..fe5ae6eb 100644 --- a/servers/estream.py +++ b/servers/estream.py @@ -4,6 +4,7 @@ # -------------------------------------------------------- import re + from core import httptools from platformcode import logger diff --git a/servers/fembed.py b/servers/fembed.py index d7b63911..e407a55f 100644 --- a/servers/fembed.py +++ b/servers/fembed.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from core import httptools -from core import scrapertools from core import jsontools from platformcode import logger diff --git a/servers/filebebo.py b/servers/filebebo.py index 4ee3f98a..d32a513d 100644 --- a/servers/filebebo.py +++ b/servers/filebebo.py @@ -4,6 +4,7 @@ # -*- By the Alfa Develop Group -*- import re + from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/flix555.py b/servers/flix555.py index 23c50f64..50f59973 100644 --- a/servers/flix555.py +++ b/servers/flix555.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -import re, base64, urllib, time +import time +import urllib from core import httptools, scrapertools from lib import jsunpack diff --git a/servers/freakshare.py b/servers/freakshare.py index 239d65a4..92f9f92f 100644 --- a/servers/freakshare.py +++ b/servers/freakshare.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -import re - from core import httptools -from core import scrapertools from platformcode import logger diff --git a/servers/gigasize.py b/servers/gigasize.py index b21cc610..85faa514 100644 --- a/servers/gigasize.py +++ b/servers/gigasize.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from core import httptools -from core import scrapertools from platformcode import logger diff --git a/servers/googlevideo.py b/servers/googlevideo.py index 9348cc85..3a411e80 100644 --- 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/gounlimited.py b/servers/gounlimited.py index ed02a6f5..a03c1a96 100644 --- a/servers/gounlimited.py +++ b/servers/gounlimited.py @@ -4,10 +4,11 @@ # -------------------------------------------------------- import re + from core import httptools -from platformcode import logger from core import scrapertools from lib import jsunpack +from platformcode import logger def test_video_exists(page_url): diff --git a/servers/mp4upload.py b/servers/mp4upload.py index e215a2c6..211e0b13 100644 --- a/servers/mp4upload.py +++ b/servers/mp4upload.py @@ -7,6 +7,7 @@ from core import scrapertools from lib import jsunpack from platformcode import logger + def test_video_exists(page_url): data = httptools.downloadpage(page_url).data if data == "File was deleted" or data == '': diff --git a/servers/mystream.py b/servers/mystream.py index eca5feaf..bfabfbdf 100644 --- a/servers/mystream.py +++ b/servers/mystream.py @@ -4,6 +4,7 @@ # -------------------------------------------------------- import re + from core import httptools from core import scrapertools from lib.aadecode import decode as aadecode diff --git a/servers/netutv.py b/servers/netutv.py index 0e0dec1b..116f5ce0 100644 --- a/servers/netutv.py +++ b/servers/netutv.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- +import random import re -import urllib, random, base64 +import urllib from core import httptools from core import jsontools diff --git a/servers/openload.py b/servers/openload.py index 4fef49a5..4f42c8d4 100644 --- a/servers/openload.py +++ b/servers/openload.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- from core import httptools +from core import jsontools from core import scrapertools from platformcode import config, logger -from core import jsontools + def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) diff --git a/servers/powvideo.py b/servers/powvideo.py index bcaa7f1b..b5a7b1a4 100644 --- a/servers/powvideo.py +++ b/servers/powvideo.py @@ -1,9 +1,5 @@ # -*- coding: utf-8 -*- -import re -import base64 -import urllib - from core import httptools from core import scrapertools from lib import jsunpack diff --git a/servers/rutube.py b/servers/rutube.py index b0d23fcc..ea6740b9 100644 --- a/servers/rutube.py +++ b/servers/rutube.py @@ -4,10 +4,10 @@ # -*- By the Alfa Develop Group -*- import re + from core import httptools -from core import scrapertools -from platformcode import logger from core import jsontools +from platformcode import logger def get_source(url): diff --git a/servers/sendvid.py b/servers/sendvid.py index 72100c9b..ed11f426 100644 --- 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 0e26da50..ef5a99f9 100644 --- a/servers/streamcherry.py +++ b/servers/streamcherry.py @@ -3,8 +3,6 @@ # Conector para streamcherry # -------------------------------------------------------- -import re - from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/streamplay.py b/servers/streamplay.py index 44e5dfbf..f47b3d83 100644 --- a/servers/streamplay.py +++ b/servers/streamplay.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- import re -import base64 -import urllib from core import httptools from core import scrapertools diff --git a/servers/thevideome.py b/servers/thevideome.py index f9b66ebd..dd6a8f75 100644 --- a/servers/thevideome.py +++ b/servers/thevideome.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- import urllib + 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..e9a22d0c 100644 --- a/servers/thevimeo.py +++ b/servers/thevimeo.py @@ -2,9 +2,8 @@ # -*- Server Thevimeo -*- import re + from core import httptools -from core import scrapertools -from platformcode import logger def get_source(url): diff --git a/servers/tiwikiwi.py b/servers/tiwikiwi.py index 4fd1f918..771ef91e 100644 --- a/servers/tiwikiwi.py +++ b/servers/tiwikiwi.py @@ -2,6 +2,7 @@ # -------------------------------------------------------- import re + from core import httptools from core import scrapertools from lib import jsunpack diff --git a/servers/upvid.py b/servers/upvid.py index 2a13afa8..c0f30f9c 100644 --- a/servers/upvid.py +++ b/servers/upvid.py @@ -3,7 +3,9 @@ # Conector UpVID By Alfa development Group # -------------------------------------------------------- -import re, base64 +import base64 +import re + from core import httptools from core import scrapertools from lib.aadecode import decode as aadecode diff --git a/servers/uqload.py b/servers/uqload.py index fed3bf31..5b352c4f 100644 --- a/servers/uqload.py +++ b/servers/uqload.py @@ -4,6 +4,7 @@ # -------------------------------------------------------- import re + from core import httptools from platformcode import logger diff --git a/servers/verystream.py b/servers/verystream.py index 3e0fd881..92a3510b 100644 --- a/servers/verystream.py +++ b/servers/verystream.py @@ -6,7 +6,7 @@ from core import httptools from core import scrapertools from platformcode import config, logger -from core import jsontools + def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) diff --git a/servers/vevio.py b/servers/vevio.py index 3f74f993..7dab36ce 100644 --- a/servers/vevio.py +++ b/servers/vevio.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- import urllib + 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/vidcloud.py b/servers/vidcloud.py index dd2e684d..41d5959d 100644 --- a/servers/vidcloud.py +++ b/servers/vidcloud.py @@ -2,8 +2,8 @@ # -------------------------------------------------------- import re + from core import httptools -from core import scrapertools from platformcode import logger diff --git a/servers/videobb.py b/servers/videobb.py index 44794fe9..b36ab915 100644 --- a/servers/videobb.py +++ b/servers/videobb.py @@ -4,8 +4,8 @@ # -------------------------------------------------------- from core import httptools -from core import scrapertools from core import jsontools +from core import scrapertools from platformcode import logger diff --git a/servers/vidoza.py b/servers/vidoza.py index e38641be..3d84a70b 100644 --- a/servers/vidoza.py +++ b/servers/vidoza.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- from core import httptools +from core import jsontools from core import scrapertools from platformcode import logger -from core import jsontools def test_video_exists(page_url): diff --git a/servers/vivo.py b/servers/vivo.py index abd77c5c..168813ea 100644 --- a/servers/vivo.py +++ b/servers/vivo.py @@ -1,8 +1,8 @@ # Conector Vivo By Alfa development Group # -------------------------------------------------------- -import re import base64 + from core import httptools from core import scrapertools from platformcode import logger diff --git a/servers/vshare.py b/servers/vshare.py index 06e79ade..fc1ce18d 100644 --- a/servers/vshare.py +++ b/servers/vshare.py @@ -4,8 +4,8 @@ import re from core import httptools from core import scrapertools -from platformcode import logger from lib import jsunpack +from platformcode import logger def test_video_exists(page_url): diff --git a/servers/wstream.py b/servers/wstream.py index a64a354e..15114a7f 100644 --- a/servers/wstream.py +++ b/servers/wstream.py @@ -6,7 +6,7 @@ import re import urllib from core import httptools, scrapertools -from platformcode import logger, config +from platformcode import logger headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:54.0) Gecko/20100101 Firefox/54.0']] diff --git a/servers/xstreamcdn.py b/servers/xstreamcdn.py index 12dde5e2..9acf6682 100644 --- a/servers/xstreamcdn.py +++ b/servers/xstreamcdn.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- import urllib + from core import httptools -from core import scrapertools from core import jsontools -from platformcode import logger, config +from core import scrapertools +from platformcode import logger def test_video_exists(page_url): diff --git a/servers/youtube.py b/servers/youtube.py index 52610cc2..aa28acbe 100644 --- a/servers/youtube.py +++ b/servers/youtube.py @@ -2,6 +2,7 @@ import re import urllib + import urlparse from core import httptools diff --git a/specials/autoplay.py b/specials/autoplay.py index 4e282147..e7d11048 100644 --- a/specials/autoplay.py +++ b/specials/autoplay.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- import os +from time import sleep from core import channeltools from core import jsontools from core.item import Item from platformcode import config, logger from platformcode import platformtools -#from platformcode import launcher # by greko -from time import sleep from platformcode.config import get_setting __channel__ = "autoplay" diff --git a/specials/autorenumber.py b/specials/autorenumber.py index 0df6a733..43ec65ef 100644 --- a/specials/autorenumber.py +++ b/specials/autorenumber.py @@ -3,18 +3,15 @@ # autorenumber - Rinomina Automaticamente gli Episodi # -------------------------------------------------------------------------------- -import os - try: import xbmcgui except: xbmcgui = None -from platformcode import config from core import jsontools, tvdb -from core.item import Item -from platformcode import platformtools from core.support import typo, log +from platformcode import config +from platformcode import platformtools TAG_TVSHOW_RENUMERATE = "TVSHOW_AUTORENUMBER" TAG_SEASON_EPISODE = "season_episode" diff --git a/specials/community.py b/specials/community.py index 5ab15928..864eec29 100644 --- a/specials/community.py +++ b/specials/community.py @@ -3,20 +3,16 @@ # -*- Created for Alfa-addon -*- # -*- By the Alfa Develop Group -*- -import re -import urllib import os -from core import httptools -from core import scrapertools -from core import servertools -from core import jsontools from channelselector import get_thumb +from core import httptools +from core import jsontools +from core import servertools from core import tmdb from core.item import Item from platformcode import logger, config, platformtools from specials import autoplay -from specials import filtertools list_data = {} @@ -199,7 +195,6 @@ def findvideos(item): def add_channel(item): logger.info() - import xbmc import xbmcgui channel_to_add = {} json_file = '' @@ -245,8 +240,6 @@ def add_channel(item): def remove_channel(item): logger.info() - import xbmc - import xbmcgui path = os.path.join(config.get_data_path(), 'community_channels.json') community_json = open(path, "r") diff --git a/specials/downloads.py b/specials/downloads.py index 46d8a264..2646f199 100644 --- a/specials/downloads.py +++ b/specials/downloads.py @@ -8,7 +8,6 @@ import re import time import unicodedata - from core import filetools, jsontools, scraper, scrapertools, servertools, videolibrarytools, support from core.downloader import Downloader from core.item import Item diff --git a/specials/filtertools.py b/specials/filtertools.py index 0195e728..df4f4c8d 100644 --- a/specials/filtertools.py +++ b/specials/filtertools.py @@ -3,11 +3,11 @@ # filtertools - se encarga de filtrar resultados # ------------------------------------------------------------ +from core import channeltools from core import jsontools from core.item import Item from platformcode import config, logger from platformcode import platformtools -from core import channeltools TAG_TVSHOW_FILTER = "TVSHOW_FILTER" TAG_NAME = "name" diff --git a/specials/help.py b/specials/help.py index 5061b6f5..723a7fa9 100644 --- a/specials/help.py +++ b/specials/help.py @@ -2,9 +2,9 @@ import os +from channelselector import get_thumb from core.item import Item from platformcode import config, logger, platformtools -from channelselector import get_thumb if config.is_xbmc(): diff --git a/specials/kodfavorites.py b/specials/kodfavorites.py index 709a17b7..945cd98d 100644 --- a/specials/kodfavorites.py +++ b/specials/kodfavorites.py @@ -15,14 +15,14 @@ # - Modificar platformtools.py para controlar el menú contextual y añadir "Guardar enlace" en set_context_commands # ------------------------------------------------------------ -import os, re +import os +import re from datetime import datetime +from core import filetools, jsontools from core.item import Item from platformcode import config, logger, platformtools -from core import filetools, jsontools - def fechahora_actual(): return datetime.now().strftime('%Y-%m-%d %H:%M') diff --git a/specials/news.py b/specials/news.py index a3cb9ea4..179fb422 100644 --- a/specials/news.py +++ b/specials/news.py @@ -11,12 +11,11 @@ from threading import Thread from channelselector import get_thumb, auto_filter from core import channeltools +from core import jsontools from core import scrapertools from core.item import Item from platformcode import config, logger from platformcode import platformtools -from core import jsontools - THUMBNAILS = {'0': 'posters', '1': 'banners', '2': 'squares'} diff --git a/specials/search.py b/specials/search.py index e225b042..024642b0 100644 --- a/specials/search.py +++ b/specials/search.py @@ -6,14 +6,16 @@ import re import time from threading import Thread +import xbmcaddon + from channelselector import get_thumb, auto_filter from core import channeltools from core import scrapertools +from core import tmdb from core.item import Item from platformcode import config, logger from platformcode import platformtools -from core import tmdb -import xbmc, xbmcaddon + addon = xbmcaddon.Addon('metadata.themoviedb.org') def_lang = addon.getSetting('language') diff --git a/specials/searchall.py b/specials/searchall.py index 9192ab61..de795570 100644 --- a/specials/searchall.py +++ b/specials/searchall.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import Queue import datetime import glob import os @@ -11,10 +10,11 @@ import urllib from threading import Thread from unicodedata import normalize +import Queue import xbmc +from lib.fuzzywuzzy import fuzz from core import channeltools, httptools, tmdb, servertools -from lib.fuzzywuzzy import fuzz from platformcode import platformtools try: diff --git a/specials/side_menu.py b/specials/side_menu.py index cac9860a..1de8ef50 100644 --- a/specials/side_menu.py +++ b/specials/side_menu.py @@ -2,13 +2,16 @@ # ------------------------------------------------------------ import os -from core.item import Item + +import xbmc +import xbmcaddon +import xbmcgui + from core import jsontools +from core.item import Item from platformcode import config, logger from platformcode import launcher -import xbmc, xbmcgui, xbmcplugin, xbmcaddon, channelselector -import xbmc, xbmcaddon addon = xbmcaddon.Addon('metadata.themoviedb.org') def_lang = addon.getSetting('language') diff --git a/specials/trailertools.py b/specials/trailertools.py index aa76dad7..9f4ed207 100644 --- a/specials/trailertools.py +++ b/specials/trailertools.py @@ -5,17 +5,17 @@ import re import urllib + import urlparse +import xbmcaddon from core import httptools -from core import jsontools from core import scrapertools from core import servertools from core.item import Item from platformcode import config, logger from platformcode import platformtools -import xbmc, xbmcaddon addon = xbmcaddon.Addon('metadata.themoviedb.org') def_lang = addon.getSetting('language') diff --git a/specials/tvmoviedb.py b/specials/tvmoviedb.py index fdd9c084..ad69b8b8 100644 --- a/specials/tvmoviedb.py +++ b/specials/tvmoviedb.py @@ -4,18 +4,19 @@ import re import urllib from base64 import b64decode as bdec +import xbmcaddon + +from channelselector import get_thumb from core import filetools from core import httptools from core import jsontools from core import scrapertools -from core.item import Item -from core.tmdb import Tmdb from core import trakt_tools +from core.item import Item +from core.support import typo, thumb +from core.tmdb import Tmdb from platformcode import config, logger from platformcode import platformtools -import xbmc, xbmcaddon -from channelselector import get_thumb -from core.support import typo, thumb addon = xbmcaddon.Addon('metadata.themoviedb.org') def_lang = addon.getSetting('language') diff --git a/specials/url.py b/specials/url.py index 73cc8e1f..c1210f48 100644 --- a/specials/url.py +++ b/specials/url.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from core import httptools -from core import scrapertools from core import servertools from core.item import Item from platformcode import config, logger diff --git a/specials/videolibrary.py b/specials/videolibrary.py index aef75da2..b8876ee1 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -1,15 +1,16 @@ # -*- coding: utf-8 -*- -import os, traceback +import os +import traceback from channelselector import get_thumb from core import filetools from core import scrapertools from core import videolibrarytools from core.item import Item +from lib import generictools from platformcode import config, logger from platformcode import platformtools -from lib import generictools def mainlist(item):