From 21248ecbb4824b792b9ad8e6b66d6c4460aa9655 Mon Sep 17 00:00:00 2001 From: DiMartinoXBMC Date: Wed, 8 Aug 2018 13:59:56 +0300 Subject: [PATCH] add socks port --- Anteoloader.py | 6 ++++++ Content.py | 3 ++- Inposloader.py | 6 ++++++ SearcherABC.py | 3 ++- SkorbaLoader.py | 2 +- addon.xml | 2 +- changelog.txt | 5 ++++- resources/language/English/strings.xml | 1 + resources/language/Russian/strings.xml | 1 + resources/settings.xml | 3 ++- 10 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Anteoloader.py b/Anteoloader.py index 6b50e07..87eb9cb 100644 --- a/Anteoloader.py +++ b/Anteoloader.py @@ -285,6 +285,12 @@ class AnteoPlayer(xbmc.Player): def __init__(self, userStorageDirectory, torrentUrl, params={}): self.userStorageDirectory = userStorageDirectory self.torrentUrl = torrentUrl + if not is_writable(self.userStorageDirectory): + xbmcgui.Dialog().ok(Localization.localize('Torrenter v2'), + Localization.localize('Your storage path is not writable or not local! Please change it in settings!'), + self.storageDirectory) + + sys.exit(1) xbmc.Player.__init__(self) log("["+author+"Player] Initalized v"+__version__) self.params = params diff --git a/Content.py b/Content.py index 42f5ffb..0b01299 100644 --- a/Content.py +++ b/Content.py @@ -25,7 +25,8 @@ if proxy == 1: socks_ip = sys.modules["__main__"].__settings__.getSetting("socks_ip") import socket from resources import socks - socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, socks_ip, 9050) + socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, socks_ip, + int(sys.modules["__main__"].__settings__.getSetting("socks_port"))) socket.socket = socks.socksocket import urllib import urllib2 diff --git a/Inposloader.py b/Inposloader.py index 89b86dd..7387436 100644 --- a/Inposloader.py +++ b/Inposloader.py @@ -253,6 +253,12 @@ class InposPlayer(xbmc.Player): def __init__(self, userStorageDirectory, torrentUrl, params={}): self.userStorageDirectory = userStorageDirectory self.torrentUrl = torrentUrl + if not is_writable(self.userStorageDirectory): + xbmcgui.Dialog().ok(Localization.localize('Torrenter v2'), + Localization.localize('Your storage path is not writable or not local! Please change it in settings!'), + self.storageDirectory) + + sys.exit(1) xbmc.Player.__init__(self) log("["+author+"Player] Initalized v"+__version__) self.params = params diff --git a/SearcherABC.py b/SearcherABC.py index fbf95bf..ba55425 100644 --- a/SearcherABC.py +++ b/SearcherABC.py @@ -31,7 +31,8 @@ proxy = int(sys.modules["__main__"].__settings__.getSetting("proxy")) if proxy == 2: socks_ip = sys.modules["__main__"].__settings__.getSetting("socks_ip") from resources import socks - socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, socks_ip, 9050) + socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, socks_ip, + int(sys.modules["__main__"].__settings__.getSetting("socks_port"))) socket.socket = socks.socksocket import urllib import urllib2 diff --git a/SkorbaLoader.py b/SkorbaLoader.py index cd316db..c0995e8 100644 --- a/SkorbaLoader.py +++ b/SkorbaLoader.py @@ -243,7 +243,7 @@ class SkorbaLoader: return self.getContentList()[contentId]['size'] def getFilePath(self, contentId=0): - return os.path.join(self.storageDirectory, self.getContentList()[contentId]['title']) # .decode('utf8') + return os.path.join(self.storageDirectory, decode_str(self.getContentList()[contentId]['title'])) def getContentList(self): filelist = [] diff --git a/addon.xml b/addon.xml index 9980c8e..60f59c2 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/changelog.txt b/changelog.txt index 6d81d34..556fe84 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,7 @@ -[B]Version 2.6.6[/B] +[B]Version 2.6.7[/B] +[+] Теперь можно указать порт SOCKS-прокси, при использоании прокси Tor + +[B]Version 2.6.6[/B] [+] Добавлена поддержка прокси для windows [+] Теперь можно указать адрес SOCKS-прокси, при использоании прокси Tor diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index b2ea4f8..c6fbd15 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -47,6 +47,7 @@ Proxy for Search Proxy for Content Lists SOCKS-proxy IP + SOCKS-proxy Port None Anti-zapret Tor diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml index b612cf3..dc4057a 100644 --- a/resources/language/Russian/strings.xml +++ b/resources/language/Russian/strings.xml @@ -47,6 +47,7 @@ Прокси для поиска Прокси для списков медиа IP SOCKS-прокси + Порт SOCKS-прокси Не использовать Anti-zapret Tor diff --git a/resources/settings.xml b/resources/settings.xml index 46f30b2..cc65347 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -13,8 +13,9 @@ - + +