Merge branch 'master' of
https://github.com/DiMartinoXBMC/plugin.video.torrenter into DiMartinoXBMC-master # Conflicts: # resources/proxy/antizapret.pysandbox1
commit
ac3f8e4757
|
|
@ -27,6 +27,7 @@ import zlib
|
|||
import xbmc
|
||||
import xbmcgui
|
||||
import xbmcvfs
|
||||
import xbmcaddon
|
||||
import Localization
|
||||
from functions import file_encode, isSubtitle, DownloadDB, log, debug, is_writable, unquote, file_url
|
||||
|
||||
|
|
@ -42,9 +43,13 @@ from functions import foldername, showMessage, clearStorage, WatchedHistoryDB, g
|
|||
if sys.modules["__main__"].__settings__.getSetting("torrent_player") == '2':
|
||||
from torrent2http import State, Engine, MediaType
|
||||
author = 'Anteo'
|
||||
__settings__ = xbmcaddon.Addon(id='script.module.torrent2http')
|
||||
__version__ = __settings__.getAddonInfo('version')
|
||||
elif sys.modules["__main__"].__settings__.getSetting("torrent_player") == '3':
|
||||
from pyrrent2http import State, Engine, MediaType
|
||||
author = 'Inpos'
|
||||
__settings__ = xbmcaddon.Addon(id='script.module.pyrrent2http')
|
||||
__version__ = __settings__.getAddonInfo('version')
|
||||
|
||||
ROOT = sys.modules["__main__"].__root__
|
||||
RESOURCES_PATH = os.path.join(ROOT, 'resources')
|
||||
|
|
@ -278,7 +283,7 @@ class AnteoPlayer(xbmc.Player):
|
|||
self.userStorageDirectory = userStorageDirectory
|
||||
self.torrentUrl = torrentUrl
|
||||
xbmc.Player.__init__(self)
|
||||
log("[AnteoPlayer] Initalized")
|
||||
log("["+author+"Player] Initalized v"+__version__)
|
||||
self.params = params
|
||||
self.get = self.params.get
|
||||
self.contentId = int(self.get("url"))
|
||||
|
|
@ -397,7 +402,7 @@ class AnteoPlayer(xbmc.Player):
|
|||
#self.pre_buffer_bytes = 30*1024*1024 #30 MB
|
||||
ready = False
|
||||
progressBar = xbmcgui.DialogProgress()
|
||||
progressBar.create(self.localize('Please Wait'),
|
||||
progressBar.create('[%sPlayer v%s] ' % (author, __version__) + self.localize('Please Wait'),
|
||||
self.localize('Seeds searching.'))
|
||||
#if self.subs_dl:
|
||||
# subs = self.torrent.getSubsIds(os.path.basename(self.torrent.getFilePath(self.contentId)))
|
||||
|
|
@ -543,7 +548,7 @@ class AnteoPlayer(xbmc.Player):
|
|||
if isSubtitle(filename, i.name):
|
||||
subs.append(i)
|
||||
if subs:
|
||||
log("[AnteoPlayer][setup_subs]: Detected subtitles: %s" % str(subs))
|
||||
log("["+author+"Player][setup_subs]: Detected subtitles: %s" % str(subs))
|
||||
for sub in subs:
|
||||
xbmc.Player().setSubtitles(sub.url)
|
||||
|
||||
|
|
|
|||
14
Core.py
14
Core.py
|
|
@ -276,7 +276,19 @@ class Core:
|
|||
# self.Downloader.__exit__()
|
||||
#self.Player = AnteoPlayer(userStorageDirectory=self.userStorageDirectory, torrentUrl=torrentUrl, params=params)
|
||||
|
||||
xbmcgui.Dialog().ok('Dam Son!','Now send this shit to DiMartino')
|
||||
#xbmcgui.Dialog().ok('Dam Son!','Now send this shit to DiMartino')
|
||||
from resources.proxy import antizapret
|
||||
filename = os.path.join(tempdir(),"antizapret.pac_config")
|
||||
import shelve
|
||||
from contextlib import contextmanager, closing
|
||||
with closing(shelve.open(filename, writeback=True)) as d:
|
||||
import time
|
||||
log(str(d))
|
||||
log(str(time.time()))
|
||||
log(str((time.time() - d["created_at"])))
|
||||
ttl = 24*3600
|
||||
if ttl > 0 and (time.time() - d["created_at"]) > ttl:
|
||||
log('xxx')
|
||||
|
||||
def DownloadStatus(self, params={}):
|
||||
db = DownloadDB()
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ class TorrentPlayer(xbmc.Player):
|
|||
def buffer(self):
|
||||
iterator = 0
|
||||
progressBar = xbmcgui.DialogProgress()
|
||||
progressBar.create(self.localize('Please Wait') + str(' [%s]' % str(self.torrent.lt.version)),
|
||||
progressBar.create('[python-libtorrent %s] - ' % str(self.torrent.lt.version) + self.localize('Please Wait'),
|
||||
self.localize('Seeds searching.'))
|
||||
if self.subs_dl:
|
||||
subs = self.torrent.getSubsIds(os.path.basename(self.path))
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import sys
|
|||
import xbmcgui
|
||||
import xbmc
|
||||
import Localization
|
||||
from functions import log, debug
|
||||
from functions import log, debug, showMessage
|
||||
|
||||
|
||||
class SearcherABC:
|
||||
|
|
@ -47,13 +47,6 @@ class SearcherABC:
|
|||
|
||||
socket.setdefaulttimeout(10+(10*int(timeout_multi)))
|
||||
|
||||
|
||||
#def __del__(self):
|
||||
# print '!!!!!!!!!!!!!!!!!! DIED !!! '+self.__class__.__name__
|
||||
|
||||
#def __init__(self):
|
||||
# print '!!!!!!!!!!!!!!!!!! BORN '+self.__class__.__name__
|
||||
|
||||
def search(self, keyword):
|
||||
'''
|
||||
Retrieve keyword from the input and return a list of tuples:
|
||||
|
|
@ -110,19 +103,24 @@ class SearcherABC:
|
|||
|
||||
def makeRequest(self, url, data={}, headers={}):
|
||||
self.load_cookie()
|
||||
opener = None
|
||||
if self.proxy == 1:
|
||||
from resources.proxy import antizapret
|
||||
opener = urllib2.build_opener(antizapret.AntizapretProxyHandler(), urllib2.HTTPCookieProcessor(self.cookieJar))
|
||||
config = antizapret.config()
|
||||
self.debug('[antizapret]: '+str(config["domains"]))
|
||||
self.debug('[antizapret]: '+str(config["server"]))
|
||||
elif self.proxy == 2:
|
||||
from resources.proxy import immunicity
|
||||
opener = urllib2.build_opener(immunicity.ImmunicityProxyHandler(), urllib2.HTTPCookieProcessor(self.cookieJar))
|
||||
config = immunicity.config()
|
||||
self.debug('[immunicity]: '+str(config["domains"]))
|
||||
self.debug('[immunicity]: '+str(config["server"]))
|
||||
else:
|
||||
try:
|
||||
from resources.proxy import antizapret
|
||||
opener = urllib2.build_opener(antizapret.AntizapretProxyHandler(), urllib2.HTTPCookieProcessor(self.cookieJar))
|
||||
config = antizapret.config()
|
||||
self.debug('[antizapret]: '+str(config["domains"]))
|
||||
self.debug('[antizapret]: '+str(config["server"]))
|
||||
except:
|
||||
showMessage('AntiZapret', Localization.localize('Error'))
|
||||
self.debug('[antizapret]: OFF!')
|
||||
#elif self.proxy == 2:
|
||||
# from resources.proxy import immunicity
|
||||
# opener = urllib2.build_opener(immunicity.ImmunicityProxyHandler(), urllib2.HTTPCookieProcessor(self.cookieJar))
|
||||
# config = immunicity.config()
|
||||
# self.debug('[immunicity]: '+str(config["domains"]))
|
||||
# self.debug('[immunicity]: '+str(config["server"]))
|
||||
if not opener:
|
||||
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(self.cookieJar))
|
||||
opener.addheaders = headers
|
||||
if 0 < len(data):
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ def config():
|
|||
global _config
|
||||
if not _config:
|
||||
# with shelf("antizapret.pac_config", ttl=CACHE) as pac_config:
|
||||
d = shelf("antizapret.pac_config", ttl=CACHE)
|
||||
d = shelf("antizapret.pac_config2", ttl=CACHE)
|
||||
pac_config = d['data']
|
||||
if not pac_config:
|
||||
log("[antizapret]: Fetching Antizapret PAC file on %s" %PAC_URL)
|
||||
|
|
|
|||
Loading…
Reference in New Issue