fixes

Anteoloader.py

@@ -133,7 +133,7 @@ class AnteoLoader:
             keep_incomplete = True
 
         dht_routers = ["router.bittorrent.com:6881", "router.utorrent.com:6881"]
-        user_agent = 'uTorrent/2200(24683)'
+        user_agent = ''
         self.engine = Engine(uri=file_url(localize_path(self.torrentFile)), download_path=self.storageDirectory,
                              connections_limit=connections_limit,
                              encryption=encryption, keep_complete=keep_complete, keep_incomplete=keep_incomplete,
@@ -386,7 +386,7 @@ class AnteoPlayer(xbmc.Player):
 
         enable_dht = self.__settings__.getSetting("enable_dht") == 'true'
         dht_routers = ["router.bittorrent.com:6881","router.utorrent.com:6881"]
-        user_agent = 'uTorrent/2200(24683)'
+        user_agent = ''
         self.pre_buffer_bytes = int(self.__settings__.getSetting("pre_buffer_bytes"))*1024*1024
 
         self.engine = Engine(uri=file_url(self.torrentUrl), download_path=self.userStorageDirectory,

Content.py

@@ -24,7 +24,7 @@ proxy = int(sys.modules["__main__"].__settings__.getSetting("cl_proxy"))
 if proxy == 1:
     socks_ip = sys.modules["__main__"].__settings__.getSetting("socks_ip")
     import socket
-    from resources import socks
+    from resources.proxy import socks
     socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, socks_ip,
                           int(sys.modules["__main__"].__settings__.getSetting("socks_port")))
     socket.socket = socks.socksocket

Core.py

@@ -1085,28 +1085,6 @@ class Core:
                 self.drawItem(title, 'downloadLibtorrent', link, image=img, info=info, contextMenu=contextMenu, replaceMenu=False)
             #self.drawItem(title, 'openTorrent', link, img, info=info, contextMenu=contextMenu, replaceMenu=False)
 
-    def ActionInfo(self, params={}):
-        from resources.skins.DialogXml import DialogXml
-        get = params.get
-        contenter=get('provider')
-        infolink=get('url')
-        link=get('link')
-        if ROOT + os.sep + 'resources' + os.sep + 'contenters' not in sys.path:
-            sys.path.insert(0, ROOT + os.sep + 'resources' + os.sep + 'contenters')
-        try:
-            self.Content = getattr(__import__(contenter), contenter)()
-        except Exception, e:
-            log('Unable to use contenter: ' + contenter + ' at ' + ' ActionInfo(). Exception: ' + str(e))
-
-        movieInfo=self.Content.get_info(infolink)
-        if movieInfo:
-            w = DialogXml("movieinfo.xml", ROOT, "Default")
-            w.doModal(movieInfo, link)
-            del w
-            del movieInfo
-        else:
-            showMessage(self.localize('Information'),self.localize('Information not found!'))
-
     def searchOption(self, params={}):
         try:
             apps = json.loads(urllib.unquote_plus(params.get("url")))

Inposloader.py

@@ -140,7 +140,7 @@ class InposLoader:
 
         enable_dht = self.__settings__.getSetting("enable_dht") == 'true'
         dht_routers = ["router.bittorrent.com:6881", "router.utorrent.com:6881"]
-        user_agent = 'uTorrent/2200(24683)'
+        user_agent = ''
         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,
@@ -375,7 +375,7 @@ class InposPlayer(xbmc.Player):
             resume_file=os.path.join(self.userStorageDirectory, 'torrents', os.path.basename(self.torrentUrl)+'.resume_data')
 
         dht_routers = ["router.bittorrent.com:6881","router.utorrent.com:6881"]
-        user_agent = 'uTorrent/2200(24683)'
+        user_agent = ''
         self.pre_buffer_bytes = int(self.__settings__.getSetting("pre_buffer_bytes"))*1024*1024
         if self.__settings__.getSetting('debug') == 'true':
             showMessage('[%sPlayer v%s] ' % (author, __version__), self.localize('Please Wait'))

Player.py

@@ -30,7 +30,7 @@ import Downloader
 import xbmcgui
 import xbmcvfs
 import Localization
-from functions import calculate, showMessage, clearStorage, WatchedHistoryDB, DownloadDB, get_ids_video, log, debug, foldername, ensure_str, loadsw_onstop
+from functions import calculate, showMessage, clearStorage, WatchedHistoryDB, DownloadDB, get_ids_video, log, debug, foldername, ensure_str, loadsw_onstop, decode_str
 
 ROOT = sys.modules["__main__"].__root__
 RESOURCES_PATH = os.path.join(ROOT, 'resources')
@@ -388,10 +388,11 @@ class TorrentPlayer(xbmc.Player):
                 addition = os.path.dirname(title).lstrip(folder + os.sep).replace(os.sep, '.').replace(' ', '_').strip()
                 ext = temp.split('.')[-1]
                 temp = temp[:len(temp) - len(ext) - 1] + '.' + addition + '.' + ext
-                newFileName = os.path.join(os.path.dirname(path), temp)
+                newFileName = os.path.join(ensure_str(os.path.dirname(decode_str(path))), ensure_str(temp))
-                debug('[setup_subs]: '+str((os.path.join(os.path.dirname(os.path.dirname(path)),title),newFileName)))
+                debug('[setup_subs]: {} {}'.format(newFileName, title))
                 if not xbmcvfs.exists(newFileName):
-                    xbmcvfs.copy(os.path.join(os.path.dirname(os.path.dirname(path)), title), newFileName)
+                    fileName = os.path.join(ensure_str(os.path.dirname(os.path.dirname(decode_str(path)))), ensure_str(title))
+                    xbmcvfs.copy(fileName, newFileName)
 
     def onPlayBackStarted(self):
         for f in self.on_playback_started:

SearcherABC.py

@@ -30,7 +30,7 @@ import sys
 proxy = int(sys.modules["__main__"].__settings__.getSetting("proxy"))
 if proxy == 2:
     socks_ip = sys.modules["__main__"].__settings__.getSetting("socks_ip")
-    from resources import socks
+    from resources.proxy import socks
     socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, socks_ip,
                           int(sys.modules["__main__"].__settings__.getSetting("socks_port")))
     socket.socket = socks.socksocket

SkorbaLoader.py

@@ -381,7 +381,7 @@ class SkorbaLoader:
             session_settings['rate_limit_ip_overhead'] = True
             session_settings['request_timeout'] = 1
             session_settings['torrent_connect_boost'] = 50
-            session_settings['user_agent'] = 'uTorrent/2200(24683)'
+            session_settings['user_agent'] = ''
             if pc_config == 0:
                 #good pc
                 session_settings['connections_limit'] = 200
@@ -412,7 +412,7 @@ class SkorbaLoader:
             session_settings.rate_limit_ip_overhead = True
             session_settings.request_timeout = 1
             session_settings.torrent_connect_boost = 100
-            session_settings.user_agent = 'uTorrent/2200(24683)'
+            session_settings.user_agent = ''
         #
         self.session.set_settings(session_settings)
 

changelog.txt

@@ -2,6 +2,7 @@
 [+] Теперь можно указать порт SOCKS-прокси, при использоании прокси Tor
 [+] Списки медиа: исправлен RiperAM
 [+] .torrent Player: Исправлена работа c длинными названиями
+[-] Удален user-agent "uTorrent/2200(24683)" во избежании бана
 
 [B]Version 2.6.6[/B]
 [+] Добавлена поддержка прокси для windows

resources/proxy/socks.py

@@ -67,7 +67,7 @@ from base64 import b64encode
 
 if os.name == "nt" and sys.version_info < (3, 0):
     try:
-        from resources import win_inet_pton
+        from resources.proxy import win_inet_pton
     except ImportError:
         raise ImportError("To run PySocks on Windows you must install win_inet_pton")
 

searchwindow.py

@@ -1270,8 +1270,6 @@ class InfoWindow(pyxbmct.AddonDialogWindow):
         # self.set_navigation()
 
     def set_controls(self):
-        # pyxbmct.AddonWindow().setImage(__root__ + '/resources/skins/Default/media/ConfluenceDialogBack.png')
-        # self.placeControl(self.background, 0, 0, rowspan=3, columnspan=2)
         self.listing = pyxbmct.List(_imageWidth=30, _imageHeight=30, _itemTextXOffset=1,
                                     _itemTextYOffset=0, _itemHeight=30, _space=0, _alignmentY=0)
         self.placeControl(self.listing, 0, 1, 2, 2)