diff --git a/Anteoloader.py b/Anteoloader.py
index 4c26133..4eae5fa 100644
--- a/Anteoloader.py
+++ b/Anteoloader.py
@@ -370,6 +370,7 @@ class AnteoPlayer(xbmc.Player):
keep_files = True
resume_file=os.path.join(self.userStorageDirectory, 'torrents', os.path.basename(self.torrentUrl)+'.resume_data')
+ enable_dht = self.__settings__.getSetting("enable_dht") == 'true'
dht_routers = ["router.bittorrent.com:6881","router.utorrent.com:6881"]
user_agent = 'uTorrent/2200(24683)'
self.pre_buffer_bytes = int(self.__settings__.getSetting("pre_buffer_bytes"))*1024*1024
@@ -378,7 +379,7 @@ class AnteoPlayer(xbmc.Player):
connections_limit=connections_limit, download_kbps=download_limit, upload_kbps=upload_limit,
encryption=encryption, keep_complete=keep_complete, keep_incomplete=keep_incomplete,
dht_routers=dht_routers, use_random_port=use_random_port, listen_port=listen_port,
- keep_files=keep_files, user_agent=user_agent, resume_file=resume_file)
+ keep_files=keep_files, user_agent=user_agent, resume_file=resume_file, enable_dht=enable_dht)
def buffer(self):
#self.pre_buffer_bytes = 30*1024*1024 #30 MB
diff --git a/Core.py b/Core.py
index 8e24223..d667c03 100644
--- a/Core.py
+++ b/Core.py
@@ -909,7 +909,7 @@ class Core:
kinometa = self.Scraper.scraper(scraper, {'label': title, 'search': search,
'year': year}, self.language)
- #print 'kinometa:'+str(kinometa)
+ log('kinometa:'+str(kinometa))
for section in kinometa.keys():
if isinstance(kinometa[section], dict):
@@ -935,7 +935,13 @@ class Core:
else:
title = meta.get('info').get('title')
- listitem = xbmcgui.ListItem(title, iconImage=img, thumbnailImage=img)
+ listitem = xbmcgui.ListItem(title)
+ images = {'thumb': img, #'icon': img,
+ 'poster': img,# 'banner': img,
+ #'fanart': img, 'landscape': img,
+ # 'clearart': image, 'clearlogo': image,
+ }
+ listitem.setArt(images)
listitem.setInfo(type='Video', infoLabels=info)
if meta:
listitem=itemScrap(listitem, meta)
@@ -1102,7 +1108,29 @@ class Core:
def drawItem(self, title, action, link='', image='', isFolder=True, contextMenu=None, replaceMenu=True, action2='', fileSize=0L,
info={}):
#log('[drawItem]:'+str((title, action, image, isFolder, contextMenu, replaceMenu, action2, info)))
- listitem = xbmcgui.ListItem(title, iconImage=image, thumbnailImage=image)
+ listitem = xbmcgui.ListItem(title)
+ images = {'icon':image, 'thumb':image}
+ images = {'icon': image, 'thumb': image,
+ 'poster': image, 'banner': image,
+ 'fanart': image, 'landscape': image,
+ #'clearart': image, 'clearlogo': image,
+ }
+ listitem.setArt(images)
+ """
+ setArt(values) -- Sets the listitem's art
+ values : dictionary - pairs of { label: value }.
+ - Some default art values (any string possible):
+ - thumb : string - image filename
+ - poster : string - image filename
+ - banner : string - image filename
+ - fanart : string - image filename
+ - clearart : string - image filename
+ - clearlogo : string - image filename
+ - landscape : string - image filename
+ - icon : string - image filename
+ example:
+ - self.list.getSelectedItem().setArt({ 'poster': 'poster.png', 'banner' : 'banner.png' })
+ """
if not info: info = {"Title": title, "plot": title}
if not isFolder and fileSize:
info['size'] = fileSize
diff --git a/Inposloader.py b/Inposloader.py
index 3be50f2..bd5f2eb 100644
--- a/Inposloader.py
+++ b/Inposloader.py
@@ -137,13 +137,14 @@ class InposLoader:
keep_complete = True
keep_incomplete = True
+ enable_dht = self.__settings__.getSetting("enable_dht") == 'true'
dht_routers = ["router.bittorrent.com:6881", "router.utorrent.com:6881"]
user_agent = 'uTorrent/2200(24683)'
self.engine = Engine(uri=file_url(self.torrentFile), download_path=self.storageDirectory,
connections_limit=connections_limit,
encryption=encryption, keep_complete=keep_complete, keep_incomplete=keep_incomplete,
dht_routers=dht_routers, use_random_port=use_random_port, listen_port=listen_port,
- user_agent=user_agent)
+ user_agent=user_agent, enable_dht=enable_dht)
def localize(self, string):
try:
diff --git a/SkorbaLoader.py b/SkorbaLoader.py
index 285bd5b..30b02c4 100644
--- a/SkorbaLoader.py
+++ b/SkorbaLoader.py
@@ -46,6 +46,7 @@ class SkorbaLoader:
lt = None
save_resume_data = None
__settings__ = sys.modules["__main__"].__settings__
+ enable_dht = __settings__.getSetting("enable_dht") == 'true'
def __init__(self, storageDirectory='', torrentFile='', torrentFilesDirectory='torrents'):
self.storageDirectory = storageDirectory
@@ -163,7 +164,7 @@ class SkorbaLoader:
iterator = 0
while iterator < 100:
xbmc.sleep(500)
- self.torrentHandle.force_dht_announce()
+ if self.enable_dht: self.torrentHandle.force_dht_announce()
progressBar.update(iterator, Localization.localize('Please Wait'), Localization.localize('Magnet-link is converting')+'.' * (iterator % 4), ' ')
iterator += 1
if progressBar.iscanceled():
@@ -339,9 +340,10 @@ class SkorbaLoader:
self.session = self.lt.session()
self.session.set_alert_mask(self.lt.alert.category_t.error_notification | self.lt.alert.category_t.status_notification | self.lt.alert.category_t.storage_notification)
#self.session.set_alert_mask(self.lt.alert.category_t.all_categories)
- self.session.add_dht_router("router.bittorrent.com", 6881)
- self.session.add_dht_router("router.utorrent.com", 6881)
- self.session.start_dht()
+ if self.enable_dht:
+ self.session.add_dht_router("router.bittorrent.com", 6881)
+ self.session.add_dht_router("router.utorrent.com", 6881)
+ self.session.start_dht()
self.session.start_lsd()
self.session.start_upnp()
self.session.start_natpmp()
@@ -481,7 +483,7 @@ class SkorbaLoader:
self.session.stop_natpmp()
self.session.stop_upnp()
self.session.stop_lsd()
- self.session.stop_dht()
+ if self.enable_dht: self.session.stop_dht()
def resume_data(self):
wasPaused=self.session.is_paused()
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 39e3cb3..8897896 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -67,6 +67,7 @@
Aeon Nox (by joyrider)
pyrrent2http (python-libtorrent via http)
Append size to file name
+ Enable DHT
Interface
P2P Network
Advanced
diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml
index a6be9a9..fb67ec9 100644
--- a/resources/language/Russian/strings.xml
+++ b/resources/language/Russian/strings.xml
@@ -67,6 +67,7 @@
Aeon Nox (от joyrider)
pyrrent2http (python-libtorrent по http)
Добавлять размер к имени файла
+ Включить DHT
Интерфейс
P2P Сеть
Дополнительные
diff --git a/resources/settings.xml b/resources/settings.xml
index bddb0dd..43c2b1d 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -69,6 +69,7 @@
+