fixes

Anteoloader.py

@@ -287,8 +287,15 @@ class AnteoPlayer(xbmc.Player):
                         break
                     log('[AnteoPlayer]: ************************************* GO NEXT?')
                     if self.next_dl and self.next_contentId != False and isinstance(self.next_contentId, int) and self.iterator == 100:
+                        if not self.next_play:
+                            xbmc.sleep(3000)
+                            if not xbmcgui.Dialog().yesno(
+                                self.localize('Torrent2HTTP'),
+                                self.localize('Would you like to play next episode?')):
+                                break
                         self.contentId = self.next_contentId
                         continue
+
                     log('[AnteoPlayer]: ************************************* NO! break')
                 break
 
@@ -336,9 +343,9 @@ class AnteoPlayer(xbmc.Player):
         #dht_routers=None, trackers=None)
 
         encryption = Encryption.ENABLED if self.__settings__.getSetting('encryption') == 'true' else Encryption.DISABLED
-        upload_limit = int(self.__settings__.getSetting("upload_limit"))*1024 if self.__settings__.getSetting(
+        upload_limit = int(self.__settings__.getSetting("upload_limit"))*1024/8 if self.__settings__.getSetting(
             "upload_limit") != "" else 0
-        download_limit = int(self.__settings__.getSetting("download_limit"))*1024 if self.__settings__.getSetting(
+        download_limit = int(self.__settings__.getSetting("download_limit"))*1024/8 if self.__settings__.getSetting(
             "download_limit") != "" else 0
 
         if self.__settings__.getSetting("connections_limit") not in ["",0,"0"]:
@@ -373,7 +380,7 @@ class AnteoPlayer(xbmc.Player):
                              keep_files=keep_files, user_agent=user_agent, resume_file=resume_file)
 
     def buffer(self):
-        self.pre_buffer_bytes = 30*1024*1024 #30 MB
+        #self.pre_buffer_bytes = 30*1024*1024 #30 MB
         ready = False
         progressBar = xbmcgui.DialogProgress()
         progressBar.create(self.localize('Please Wait'),
@@ -412,9 +419,6 @@ class AnteoPlayer(xbmc.Player):
                 speedsText = '%s: %d Mbit/s; %s: %d Mbit/s' % (
                     self.localize('Downloading'), int(getDownloadRate),
                     self.localize('Uploading'), int(getUploadRate))
-                #if self.debug:
-                #    peersText=peersText + ' ' + self.torrent.get_debug_info('dht_state')
-                #    dialogText=dialogText.replace(self.localize('Preloaded: '),'') + ' ' + self.torrent.get_debug_info('trackers_sum')
                 progressBar.update(iterator, self.localize('Seeds searching.') + peersText, dialogText,
                                    speedsText)
 
@@ -450,7 +454,8 @@ class AnteoPlayer(xbmc.Player):
             self.next_dl = True
         else:
             self.next_dl = False
-        log('[AnteoPlayer]: nextdl - %s, ids_video - %s' % (str(self.next_dl), str(self.ids_video)))
+        self.next_play = self.__settings__.getSetting('next_play') == 'true'
+        log('[AnteoPlayer]: next_dl - %s, next_play - %s, ids_video - %s' % (str(self.next_dl), str(self.next_play), str(self.ids_video)))
 
     def setup_play(self):
         file_status = self.engine.file_status(self.contentId)

Core.py

@@ -489,6 +489,12 @@ class Core:
             xbmc.executebuiltin('Container.Refresh')
             showMessage(self.localize('Search History'), self.localize('Added!'))
 
+        if action2 == 'edit':
+            db.delete(addtime)
+            title = get('title')
+            showMessage(self.localize('Search History'), self.localize('Deleted!'))
+            xbmc.executebuiltin('XBMC.ActivateWindow(Videos,%s)' % (sys.argv[0] + '?action=%s&action2=%s&%s=%s') % ('search', '&showKey=true', 'url', title))
+
         if action2 == 'delete':
             db.delete(addtime)
             xbmc.executebuiltin('Container.Refresh')
@@ -532,6 +538,8 @@ class Core:
                                 contextMenu.append((self.localize('Add to %s') % self.localize('Favourites SH'),
                                                     ListString % ('History', 'fav', 'addtime', str(addtime)),))
                                 img = self.ROOT + '/icons/unfav.png'
+                            contextMenu.append((self.localize('Edit'),
+                                                ListString % ('History', 'edit', 'addtime='+str(addtime)+'&title', urllib.quote_plus(title))))
                             contextMenu.append((self.localize('Delete from %s') % self.localize('Search History'),
                                                 ListString % ('History', 'delete', 'addtime', str(addtime))))
 

Libtorrent.py

@@ -31,7 +31,7 @@ import xbmc
 import xbmcgui
 import xbmcvfs
 import Localization
-from functions import file_encode, isSubtitle, DownloadDB, log, debug, is_writable
+from functions import file_encode, isSubtitle, DownloadDB, log, debug, is_writable, vista_check, windows_check
 from platform_pulsar import get_platform
 
 class Libtorrent:
@@ -45,6 +45,7 @@ class Libtorrent:
     threadComplete = False
     lt = None
     save_resume_data = None
+    __settings__ = sys.modules["__main__"].__settings__
 
     def __init__(self, storageDirectory='', torrentFile='', torrentFilesDirectory='torrents'):
         self.platform = get_platform()
@@ -74,7 +75,7 @@ class Libtorrent:
 
         except Exception, e:
             log('Error importing from system. Exception: ' + str(e))
-            xbmcgui.Dialog().ok(Localization.localize('Python-Libtorrent Not Found'),
+            xbmcgui.Dialog().ok(Localization.localize('python-libtorrent Not Found'),
                                 Localization.localize(self.platform["message"][0]),
                                 Localization.localize(self.platform["message"][1]))
             return
@@ -352,14 +353,7 @@ class Libtorrent:
         except:
             log('listen_on(6881, 6891) error')
 
-        #tribler example never tested
+        pc_config = int(self.__settings__.getSetting('pc_config'))
-        #self.session.set_severity_level(self.lt.alert.severity_levels.info)
-        #self.session.add_extension("ut_pex")
-        #self.session.add_extension("lt_trackers")
-        #self.session.add_extension("metadata_transfer")
-        #self.session.add_extension("ut_metadata")
-        # Ban peers that sends bad data
-        #self.session.add_extension("smart_ban")
 
         # Session settings
         try:
@@ -367,12 +361,26 @@ class Libtorrent:
             #
             session_settings['announce_to_all_tiers'] = True
             session_settings['announce_to_all_trackers'] = True
-            session_settings['connection_speed'] = 100
             session_settings['peer_connect_timeout'] = 2
             session_settings['rate_limit_ip_overhead'] = True
             session_settings['request_timeout'] = 1
-            session_settings['torrent_connect_boost'] = 100
+            session_settings['torrent_connect_boost'] = 50
             session_settings['user_agent'] = 'uTorrent/2200(24683)'
+            if pc_config == 0:
+                #good pc
+                session_settings['connections_limit'] = 200
+                session_settings['unchoke_slots_limit'] = 10
+                session_settings['connection_speed'] = 200
+                session_settings['file_pool_size'] = 40
+            elif pc_config == 1:
+                #bad pc/router
+                session_settings['connections_limit'] = 100
+                session_settings['half_open_limit'] = (lambda: windows_check() and
+                                  (lambda: vista_check() and 4 or 8)() or 50)()
+                session_settings['unchoke_slots_limit'] = 4
+                session_settings['connection_speed'] = 100
+                session_settings['file_pool_size'] = 40
+
             #session_settings['cache_size'] = 0
             #session_settings['use_read_cache'] = False
 

Localization.py

@@ -244,7 +244,7 @@ def localize(text):
             'Rating:':'דירוג:',
             'Information not found!':'המידע לא נמצא',
             'Choose searcher':'בחר טראקר',
-            'Python-Libtorrent Not Found':'לא נמצא',
+            'python-libtorrent Not Found':'לא נמצא',
             'Windows has static compiled python-libtorrent included.':'לליבטורנט יש קובץ התקנה עבור ווינדוס',
             'You should install "script.module.libtorrent" from "MyShows.me Kodi Repo"':'נא להתקין את הקובץ script.module.libtorrent. מתוך הריפו',
             'Linux x64 has not static compiled python-libtorrent included.':'Linux x64 has not static compiled python-libtorrent included.',
@@ -503,7 +503,7 @@ def localize(text):
             'Rating:':'Рейтинг:',
             'Information not found!':'Информация не найдена!',
             'Choose searcher':'Выберите трекер',
-            'Python-Libtorrent Not Found':'Python-Libtorrent не найден',
+            'python-libtorrent Not Found':'python-libtorrent не найден',
             'Windows has static compiled python-libtorrent included.':'На Windows при установке из репозитория к плагину идет python-libtorrent.',
             'You should install "script.module.libtorrent" from "MyShows.me Kodi Repo"':'Установите "script.module.libtorrent" из "MyShows.me Kodi Repo"',
             'Linux x64 has not static compiled python-libtorrent included.':'На Linux x64 не смогли собрать статическую python-libtorrent',
@@ -548,6 +548,8 @@ def localize(text):
             'Seeking is working only with player Torrent2HTTP.':'Перемотка работает только с плеером Torrent2HTTP.',\
             'Play (from %s)':'Играть (c %s)',
             'Play (from start)':'Играть (с начала)',
+            'Edit':'Редактировать',
+            'Would you like to play next episode?':'Проиграть следующий эпизод?',
 
         },
         'uk': {
@@ -760,7 +762,7 @@ def localize(text):
             'Rating:':'Рейтинг:',
             'Information not found!':'Інформація не знайдена!',
             'Choose searcher':'Оберіть трекер',
-            'Python-Libtorrent Not Found':'Python-Libtorrent не знайдено',
+            'python-libtorrent Not Found':'python-libtorrent не знайдено',
             'Windows has static compiled python-libtorrent included.':'На Windows при встановленні з репозиторію разом з плагіном йде python-libtorrent.',
             'You should install "script.module.libtorrent" from "MyShows.me Kodi Repo"':'Встановіть "script.module.libtorrent" з "MyShows.me Kodi Repo"',
             'Linux x64 has not static compiled python-libtorrent included.':'На Linux x64 не змогли зібрати статичну версію python-libtorrent',

Player.py

@@ -170,6 +170,13 @@ class TorrentPlayer(xbmc.Player):
                     break
                 debug('************************************* GO NEXT?')
                 if self.next_dl and self.next_dling and isinstance(self.next_contentId, int) and self.iterator == 100:
+                    if not self.next_play:
+                        xbmc.sleep(3000)
+                        if not xbmcgui.Dialog().yesno(
+                                self.localize('python-libtorrent'),
+                                self.localize('Would you like to play next episode?'),
+                                self.display_name):
+                            break
                     self.contentId = self.next_contentId
                     continue
                 debug('************************************* NO! break')
@@ -192,7 +199,8 @@ class TorrentPlayer(xbmc.Player):
 
     def init(self):
         self.next_dl = True if self.__settings__.getSetting('next_dl') == 'true' and self.ids_video else False
-        log('[TorrentPlayer]: init - ' + str(self.next_dl))
+        self.next_play = self.__settings__.getSetting('next_play') == 'true'
+        log('[TorrentPlayer]: init - ' + str(self.next_dl)+ str(self.next_play))
         self.next_contentId = False
         self.display_name = ''
         self.downloadedSize = 0

changelog.txt

@@ -1,5 +1,11 @@
 English changelog at http://bit.ly/1MfSVUP
 
+[B]Version 2.4.4[/B]
+[+] Кнопка редатировать в Истории Поиска
+[+] Переключатель автоматического запуска следующего эпизода
+[+] Исправлено ограничение скорости Torrent2HTTP, которое на самом деле измерялось в MB/s, а не Mbit/s
+[+] Настройки для девайсов/ПК разной мощности у python-libtorrent
+
 [B]Version 2.4.3[/B]
 [+] Добавлена поддержка торрент-клиента qBittorent
 
@@ -10,7 +16,7 @@
 [+] Плеер Torrent2HTTP от anteo теперь по-умолчанию для новых пользователей
 
 [B]Version 2.4.0[/B]
-[+] Удален плеер BTclient
+[-] Удален плеер BTclient
 [+] Добавлен плеер Torrent2HTTP от anteo
 
 [B]Version 2.3.8[/B]

resources/language/English/strings.xml

@@ -18,7 +18,7 @@
     <string id="30018">Confluence (by DiMartino)</string>
     <string id="30019">Confluence (by RussakHH)</string>
     <string id="30020">Enable Search History</string>
-    <string id="30021">Python-Libtorrent</string>
+    <string id="30021">python-libtorrent</string>
     <string id="30022">Ace Stream</string>
     <string id="30023">P2P Player</string>
     <string id="30024">Rest Settings in Programms - AceStream Client</string>
@@ -35,7 +35,7 @@
     <string id="30035">Open Torrent File</string>
     <string id="30036">Open Context Menu</string>
     <string id="30037">Download via Torrent-client</string>
-    <string id="30038">Download via Python-Libtorrent</string>
+    <string id="30038">Download via python-libtorrent</string>
     <string id="30039">Sort search results by seeds</string>
     <string id="30040">Custom search option phrase</string>
     <string id="30041">Encryption</string>
@@ -52,6 +52,10 @@
     <string id="30052">Use random ports</string>
     <string id="30053">Port for incoming connections</string>
     <string id="30054">Pre-buffer amount before start playing, Mb</string>
+    <string id="30055">Autoplay next episode (or ask)</string>
+    <string id="30056">Device configuration</string>
+    <string id="30057">Average/Good PC</string>
+    <string id="30058">Below average PC/router</string>
     <string id="30101">Interface</string>
     <string id="30102">P2P Network</string>
     <string id="30103">Advanced</string>
@@ -78,4 +82,5 @@
     <string id="30419">You don't have external searcher. Please install it first.</string>
 
 
+
 </strings>

resources/language/Hebrew/strings.xml

@@ -18,7 +18,7 @@
     <string id="30018">Confluence (by DiMartino)</string>
     <string id="30019">Confluence (by RussakHH)</string>
     <string id="30020">אפשר היסטוריית חיפוש</string>
-    <string id="30021">Python-Libtorrent (מומלץ)</string>
+    <string id="30021">python-libtorrent (מומלץ)</string>
     <string id="30022">Ace Stream (ללא מגנטים)</string>
     <string id="30023">נגן P2P</string>
     <string id="30024">איפוס הגדרות של תוכניות - AceStream</string>
@@ -35,7 +35,7 @@
     <string id="30035">פתח קובץ טורנט</string>
     <string id="30036">פתח תפריט הקשר</string>
     <string id="30037">הורד באמצעות טורנט</string>
-    <string id="30038">הורד באמצעות Python-Libtorrent</string>
+    <string id="30038">הורד באמצעות python-libtorrent</string>
     <string id="30039">מיין תוצאות חיפוש על ידי זרעים</string>
     <string id="30040">חיפוש מותאם אישית</string>
     <string id="30041">הצפנה</string>

resources/language/Russian/strings.xml

@@ -18,7 +18,7 @@
     <string id="30018">Confluence (от DiMartino)</string>
     <string id="30019">Confluence (от RussakHH)</string>
     <string id="30020">Включить Историю Поиска</string>
-    <string id="30021">Python-Libtorrent</string>
+    <string id="30021">python-libtorrent</string>
     <string id="30022">Ace Stream</string>
     <string id="30023">P2P Проигрыватель</string>
     <string id="30024">Остальные настройки в "Программы - AceStream Client"</string>
@@ -35,7 +35,7 @@
     <string id="30035">Открыть Торрент Файл</string>
     <string id="30036">Открыть Контекстное меню</string>
     <string id="30037">Скачать Торрент-клиентом</string>
-    <string id="30038">Скачать Python-Libtorrent</string>
+    <string id="30038">Скачать python-libtorrent</string>
     <string id="30039">Сортировать поиск по количеству раздающих</string>
     <string id="30040">Дополнительная фраза в вариантах поиска</string>
     <string id="30041">Шифрование</string>
@@ -52,6 +52,10 @@
     <string id="30052">Использовать случайные порты</string>
     <string id="30053">Порт для входящих соединений</string>
     <string id="30054">Загружаемый объем файла до начала просмотра, Мб</string>
+    <string id="30055">Автоматически проиграть следующий эпизод (или предложить)</string>
+    <string id="30056">Конфигурация устройства</string>
+    <string id="30057">Нормальный ПК</string>
+    <string id="30058">Плохой ПК/роутер</string>
     <string id="30101">Интерфейс</string>
     <string id="30102">P2P Сеть</string>
     <string id="30103">Дополнительные</string>

resources/language/Ukrainian/strings.xml

@@ -18,7 +18,7 @@
     <string id="30018">Confluence (від DiMartino)</string>
     <string id="30019">Confluence (від RussakHH)</string>
     <string id="30020">Увімкнути Історію Пошуку</string>
-    <string id="30021">Python-Libtorrent (рекомендовано)</string>
+    <string id="30021">python-libtorrent (рекомендовано)</string>
     <string id="30022">Ace Stream (без магнет-посилань)</string>
     <string id="30023">P2P Програвач</string>
     <string id="30024">Решта налаштувань в "Програми - AceStream Client"</string>
@@ -35,7 +35,7 @@
     <string id="30035">Відкрити торрент-файл</string>
     <string id="30036">Відкрити контекстне меню</string>
     <string id="30037">Завантажити торрент-клієнтом</string>
-    <string id="30038">Завантажити за допомогою Python-Libtorrent</string>
+    <string id="30038">Завантажити за допомогою python-libtorrent</string>
     <string id="30039">Сортувати результати пошуку по кількості роздач</string>
     <string id="30040">Додаткова пошукова фраза в варіантах пошуку</string>
     <string id="30041">Шифрування</string>

resources/settings.xml

@@ -19,17 +19,19 @@
         <setting id="storage"           type="folder"   label="30004" default=""/>
         <setting id="keep_files"        type="enum"     label="30008" default="1"       lvalues="30043|30044|30045"/>
         <setting id="ask_dir"           type="bool"     label="30031" default="false"   enable= "!eq(-1,0)" />
-        <setting id="next_dl"           type="bool"     label="30013" default="true"    visible="!eq(-4,1)+"/>
+        <setting id="next_dl"           type="bool"     label="30013" default="true"    visible="!eq(-4,1)"/>
-        <setting id="upload_limit"      type="number"   label="30010" default="0"       visible="!eq(-5,1)"/>
+        <setting id="next_play"         type="bool"     label="30055" default="true"    visible="!eq(-5,1)+eq(-1,true)"/>
-        <setting id="download_limit"    type="number"   label="30011" default="0"       visible="!eq(-6,1)"/>
+        <setting id="upload_limit"      type="number"   label="30010" default="0"       visible="!eq(-6,1)"/>
-        <setting id="blank"             type="text"     label="30024" default=""        visible="eq(-7,1)"/>
+        <setting id="download_limit"    type="number"   label="30011" default="0"       visible="!eq(-7,1)"/>
-        <setting id="subs_dl"           type="bool"     label="30029" default="true"    visible="!eq(-8,1)"/>
+        <setting id="blank"             type="text"     label="30024" default=""        visible=" eq(-8,1)"/>
-        <setting id="keep_seeding"      type="bool"     label="30030" default="false"   visible="eq(-9,0)" enable="eq(-7,1)"/>
+        <setting id="subs_dl"           type="bool"     label="30029" default="true"    visible="!eq(-9,1)"/>
-        <setting id="encryption"        type="bool"     label="30041" default="true"    visible="!eq(-10,1)"/>
+        <setting id="keep_seeding"      type="bool"     label="30030" default="false"   visible=" eq(-10,0)" enable="eq(-7,1)"/>
-        <setting id="connections_limit" type="number"   label="30051" default="200"     visible="eq(-11,2)"/>
+        <setting id="encryption"        type="bool"     label="30041" default="true"    visible="!eq(-11,1)"/>
-        <setting id="listen_port"       type="number"   label="30053" default="6881"    visible="eq(-12,2)"/>
+        <setting id="connections_limit" type="number"   label="30051" default="200"     visible=" eq(-12,2)"/>
-        <setting id="use_random_port"   type="bool"     label="30052" default="false"   visible="eq(-13,2)"/>
+        <setting id="listen_port"       type="number"   label="30053" default="6881"    visible=" eq(-13,2)"/>
-        <setting id="pre_buffer_bytes"  type="slider"   label="30054" default="25"      visible="eq(-14,2)"  range="5,5,50" option="int"/>
+        <setting id="use_random_port"   type="bool"     label="30052" default="false"   visible=" eq(-14,2)"/>
+        <setting id="pre_buffer_bytes"  type="slider"   label="30054" default="25"      visible=" eq(-15,2)"  range="5,5,50" option="int"/>
+        <setting id="pc_config"         type="enum"     label="30056" default="0"       visible=" eq(-16,0)" lvalues="30057|30058"/>
     </category>
     <category label="Torrent-client">
         <setting id="torrent_save"                  type="enum"         label="50301" lvalues="50302|50303" default="0"/>