RussakHH stable roll-back 2

pull/1/head
DiMartinoXBMC 2015-12-15 17:18:06 +03:00
parent ff762538f1
commit 3e7fa281e9
13 changed files with 64 additions and 44 deletions

View File

@ -3,18 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment=""> <list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/AceStream.py" afterPath="$PROJECT_DIR$/AceStream.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BTClientPlayer.py" afterPath="$PROJECT_DIR$/BTClientPlayer.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/BeautifulSoup.py" afterPath="$PROJECT_DIR$/BeautifulSoup.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Downloader.py" afterPath="$PROJECT_DIR$/Downloader.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Libtorrent.py" afterPath="$PROJECT_DIR$/Libtorrent.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Player.py" afterPath="$PROJECT_DIR$/Player.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.txt" afterPath="$PROJECT_DIR$/README.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/addon.xml" afterPath="$PROJECT_DIR$/addon.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/default.py" afterPath="$PROJECT_DIR$/default.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/default.py" afterPath="$PROJECT_DIR$/default.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/functions.py" afterPath="$PROJECT_DIR$/functions.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/__init__.py" afterPath="$PROJECT_DIR$/resources/__init__.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/__init__.py" afterPath="$PROJECT_DIR$/resources/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/English/strings.xml" afterPath="$PROJECT_DIR$/resources/language/English/strings.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/English/strings.xml" afterPath="$PROJECT_DIR$/resources/language/English/strings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/Russian/strings.xml" afterPath="$PROJECT_DIR$/resources/language/Russian/strings.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/language/Russian/strings.xml" afterPath="$PROJECT_DIR$/resources/language/Russian/strings.xml" />
@ -75,8 +65,8 @@
<file leaf-file-name="functions.py" pinned="false" current-in-tab="true"> <file leaf-file-name="functions.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/functions.py"> <entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.49827784"> <state vertical-scroll-proportion="0.53114754">
<caret line="1663" column="27" selection-start-line="1663" selection-start-column="27" selection-end-line="1663" selection-end-column="27" /> <caret line="1656" column="7" selection-start-line="1656" selection-start-column="7" selection-end-line="1656" selection-end-column="7" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
</folding> </folding>
@ -131,7 +121,7 @@
<file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="true"> <file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Libtorrent.py"> <entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.22962113"> <state vertical-scroll-proportion="0.33770493">
<caret line="325" column="26" selection-start-line="325" selection-start-column="26" selection-end-line="325" selection-end-column="26" /> <caret line="325" column="26" selection-start-line="325" selection-start-column="26" selection-end-line="325" selection-end-column="26" />
<folding> <folding>
<element signature="e#24#836#1" expanded="false" /> <element signature="e#24#836#1" expanded="false" />
@ -146,9 +136,9 @@
<entry file="file://$PROJECT_DIR$/default.py"> <entry file="file://$PROJECT_DIR$/default.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="31" column="20" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="20" /> <caret line="35" column="20" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
<folding> <folding>
<element signature="e#838#848#0" expanded="true" /> <marker date="1439305745455" expanded="true" signature="838:849" placeholder="import ..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -202,7 +192,7 @@
<entry file="file://$PROJECT_DIR$/resources/settings.xml"> <entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" /> <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -357,8 +347,8 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -540,12 +530,6 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1420801533300</updated> <updated>1420801533300</updated>
</task> </task>
<task id="LOCAL-00090" summary="searcher update">
<created>1437067970770</created>
<option name="number" value="00090" />
<option name="project" value="LOCAL" />
<updated>1437067970771</updated>
</task>
<task id="LOCAL-00091" summary="searcher update"> <task id="LOCAL-00091" summary="searcher update">
<created>1437068342157</created> <created>1437068342157</created>
<option name="number" value="00091" /> <option name="number" value="00091" />
@ -834,18 +818,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1450123718596</updated> <updated>1450123718596</updated>
</task> </task>
<option name="localTasksCounter" value="139" /> <task id="LOCAL-00139" summary="RussakHH stable roll-back">
<created>1450188565240</created>
<option name="number" value="00139" />
<option name="project" value="LOCAL" />
<updated>1450188565240</updated>
</task>
<option name="localTasksCounter" value="140" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="false" />
<layout> <layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13224447" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13224447" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32814237" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32814237" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29064587" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29032257" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32703003" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32703003" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@ -875,7 +865,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="spec fix" />
<MESSAGE value="captcha name" /> <MESSAGE value="captcha name" />
<MESSAGE value="riper fix" /> <MESSAGE value="riper fix" />
<MESSAGE value="dht fix" /> <MESSAGE value="dht fix" />
@ -900,7 +889,8 @@
<MESSAGE value="kickass fix" /> <MESSAGE value="kickass fix" />
<MESSAGE value="listen_on fix" /> <MESSAGE value="listen_on fix" />
<MESSAGE value="fix nothing" /> <MESSAGE value="fix nothing" />
<option name="LAST_COMMIT_MESSAGE" value="fix nothing" /> <MESSAGE value="RussakHH stable roll-back" />
<option name="LAST_COMMIT_MESSAGE" value="RussakHH stable roll-back" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1207,7 +1197,7 @@
<entry file="file://$PROJECT_DIR$/resources/settings.xml"> <entry file="file://$PROJECT_DIR$/resources/settings.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" /> <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1270,9 +1260,9 @@
<entry file="file://$PROJECT_DIR$/default.py"> <entry file="file://$PROJECT_DIR$/default.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="31" column="20" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="20" /> <caret line="35" column="20" selection-start-line="35" selection-start-column="20" selection-end-line="35" selection-end-column="20" />
<folding> <folding>
<element signature="e#838#848#0" expanded="true" /> <marker date="1439305745455" expanded="true" signature="838:849" placeholder="import ..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1305,8 +1295,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/functions.py"> <entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.49827784"> <state vertical-scroll-proportion="0.53114754">
<caret line="1663" column="27" selection-start-line="1663" selection-start-column="27" selection-end-line="1663" selection-end-column="27" /> <caret line="1656" column="7" selection-start-line="1656" selection-start-column="7" selection-end-line="1656" selection-end-column="7" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
</folding> </folding>
@ -1315,7 +1305,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Libtorrent.py"> <entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.22962113"> <state vertical-scroll-proportion="0.33770493">
<caret line="325" column="26" selection-start-line="325" selection-start-column="26" selection-end-line="325" selection-end-column="26" /> <caret line="325" column="26" selection-start-line="325" selection-start-column="26" selection-end-line="325" selection-end-column="26" />
<folding> <folding>
<element signature="e#24#836#1" expanded="false" /> <element signature="e#24#836#1" expanded="false" />

View File

@ -1,8 +1,12 @@
English changelog at http://bit.ly/1MfSVUP English changelog at http://bit.ly/1MfSVUP
[B]Version 2.3.8[/B]
[+] Добавлен АнтиЗапрет
[+] Списки Медиа: Исправлен KickAssSo
[B]Version 2.3.6[/B] [B]Version 2.3.6[/B]
[+] Оптимизация импорта [+] Оптимизация импорта, ускорена работа меню
[+] Новый Проигрыватель BTclient (https://github.com/izderadicka/btclient) в тестовом режиме. [+] Новый Проигрыватель [url=https://github.com/izderadicka/btclient]BTclient[/url] в тестовом режиме, требует python-libtorrent >=1.0.4.
[B]Version 2.3.5[/B] [B]Version 2.3.5[/B]
[+] Проигрыватель: Уменьшена просадка после загрузки буфера [+] Проигрыватель: Уменьшена просадка после загрузки буфера

View File

@ -19,7 +19,7 @@
''' '''
import sys import sys
import gc
import xbmcaddon import xbmcaddon
@ -38,3 +38,7 @@ if (__name__ == "__main__" ):
else: else:
params = core.getParameters(sys.argv[2]) params = core.getParameters(sys.argv[2])
core.executeAction(params) core.executeAction(params)
del core
collected = gc.collect()
print "Garbage collector: collected %d objects." % (collected)

View File

@ -0,0 +1,5 @@
#-*- coding: utf-8 -*-
'''
Torrenter v2 plugin for XBMC/Kodi
Copyright (C) 2015 DiMartino
'''

View File

@ -44,6 +44,10 @@
<string id="30044">Save files</string> <string id="30044">Save files</string>
<string id="30045">Ask to save</string> <string id="30045">Ask to save</string>
<string id="30046">BTclient (python-libtorrent via http)</string> <string id="30046">BTclient (python-libtorrent via http)</string>
<string id="30047">Auto-unblocking proxy</string>
<string id="30048">None</string>
<string id="30049">Anti-zapret</string>
<string id="30050">Immunicity</string>
<string id="30101">Interface</string> <string id="30101">Interface</string>
<string id="30102">P2P Network</string> <string id="30102">P2P Network</string>
<string id="30103">Advanced</string> <string id="30103">Advanced</string>
@ -69,4 +73,5 @@
<string id="30418">Choose searcher</string> <string id="30418">Choose searcher</string>
<string id="30419">You don't have external searcher. Please install it first.</string> <string id="30419">You don't have external searcher. Please install it first.</string>
</strings> </strings>

View File

@ -44,6 +44,10 @@
<string id="30044">Сохранять файлы</string> <string id="30044">Сохранять файлы</string>
<string id="30045">Спросить о сохранении</string> <string id="30045">Спросить о сохранении</string>
<string id="30046">BTclient (python-libtorrent по http)</string> <string id="30046">BTclient (python-libtorrent по http)</string>
<string id="30047">Антизапрет (прокси)</string>
<string id="30048">Не использовать</string>
<string id="30049">Anti-zapret</string>
<string id="30050">Immunicity</string>
<string id="30101">Интерфейс</string> <string id="30101">Интерфейс</string>
<string id="30102">P2P Сеть</string> <string id="30102">P2P Сеть</string>
<string id="30103">Дополнительные</string> <string id="30103">Дополнительные</string>

View File

@ -7,9 +7,11 @@ ported from python-Levenshtein
[https://github.com/miohtama/python-Levenshtein] [https://github.com/miohtama/python-Levenshtein]
""" """
from Levenshtein import *
from warnings import warn from warnings import warn
from Levenshtein import *
class StringMatcher: class StringMatcher:
"""A SequenceMatcher-like class built on the top of Levenshtein""" """A SequenceMatcher-like class built on the top of Levenshtein"""

View File

@ -25,12 +25,10 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
import warnings
try: try:
from .StringMatcher import StringMatcher as SequenceMatcher from .StringMatcher import StringMatcher as SequenceMatcher
except ImportError: except ImportError:
#warnings.warn('Using slow pure-python SequenceMatcher. Install python-Levenshtein to remove this warning')
from difflib import SequenceMatcher from difflib import SequenceMatcher
from . import utils from . import utils

View File

@ -34,6 +34,7 @@ import translit
# MATCHER_MOVIE_DURATION = re.compile('\s*(\d+).*?', re.UNICODE | re.DOTALL) # MATCHER_MOVIE_DURATION = re.compile('\s*(\d+).*?', re.UNICODE | re.DOTALL)
# MATCHER_IMDB_RATING = re.compile('IMDb:\s*(\d+\.?\d*)\s*\(\s*([\s\d]+)\s*\)', re.UNICODE | re.DOTALL) # MATCHER_IMDB_RATING = re.compile('IMDb:\s*(\d+\.?\d*)\s*\(\s*([\s\d]+)\s*\)', re.UNICODE | re.DOTALL)
# MATCHER_IMDB_RATING = re.compile('IMDb:\s*(\d+\.?\d*)\s?\((.*)\)', re.UNICODE) # MATCHER_IMDB_RATING = re.compile('IMDb:\s*(\d+\.?\d*)\s?\((.*)\)', re.UNICODE)

View File

@ -11,6 +11,7 @@
<setting id="timeout" type="enum" lvalues="30026|30027|30028" label="30025" default="1"/> <setting id="timeout" type="enum" lvalues="30026|30027|30028" label="30025" default="1"/>
<setting id="search_phrase" type="text" label="30040"/> <setting id="search_phrase" type="text" label="30040"/>
<setting id="num_threads" type="slider" label="30042" default="3" range="1,1,9" option="int"/> <setting id="num_threads" type="slider" label="30042" default="3" range="1,1,9" option="int"/>
<setting id="proxy" type="enum" lvalues="30048|30049|" label="30047" default="0"/>
<setting id="debug" type="bool" label="30015" default="false"/> <setting id="debug" type="bool" label="30015" default="false"/>
</category> </category>
<category label="30102"> <category label="30102">

View File

@ -1,7 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import sys, urllib, urllib2, re, os, cookielib, traceback, datetime, htmlentitydefs import re
import xbmc, xbmcgui, xbmcaddon import htmlentitydefs
import xbmcgui
pattern = re.compile("&(\w+?);") pattern = re.compile("&(\w+?);")

View File

@ -0,0 +1,5 @@
#-*- coding: utf-8 -*-
'''
Torrenter v2 plugin for XBMC/Kodi
Copyright (C) 2015 DiMartino
'''

View File

@ -58,7 +58,6 @@ source file.
# class_defs_make.py. # class_defs_make.py.
# #
import dopal.classes
from dopal.aztypes import AzMethod as _method from dopal.aztypes import AzMethod as _method
from dopal.aztypes import AzureusMethods from dopal.aztypes import AzureusMethods