From 3e7fa281e936d122a899758d524911d4d0ad4c76 Mon Sep 17 00:00:00 2001 From: DiMartinoXBMC Date: Tue, 15 Dec 2015 17:18:06 +0300 Subject: [PATCH] RussakHH stable roll-back 2 --- .idea/workspace.xml | 60 ++++++++----------- changelog.txt | 8 ++- default.py | 6 +- resources/__init__.py | 5 ++ resources/language/English/strings.xml | 5 ++ resources/language/Russian/strings.xml | 4 ++ .../scrapers/fuzzywuzzy/StringMatcher.py | 4 +- resources/scrapers/fuzzywuzzy/fuzz.py | 2 - resources/scrapers/kinopoisk/pageparser.py | 1 + resources/settings.xml | 1 + resources/skins/DialogReviews.py | 6 +- resources/utorrent/__init__.py | 5 ++ resources/utorrent/dopal/class_defs.py | 1 - 13 files changed, 64 insertions(+), 44 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3ab8267..88d090a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,18 +3,8 @@ - - - - - - - - - - @@ -75,8 +65,8 @@ - - + + @@ -131,7 +121,7 @@ - + @@ -146,9 +136,9 @@ - + - + @@ -202,7 +192,7 @@ - + @@ -357,8 +347,8 @@ - + @@ -540,12 +530,6 @@ - + - + - + @@ -875,7 +865,6 @@ - @@ -900,7 +889,8 @@ - @@ -1207,7 +1197,7 @@ - + @@ -1270,9 +1260,9 @@ - + - + @@ -1305,8 +1295,8 @@ - - + + @@ -1315,7 +1305,7 @@ - + diff --git a/changelog.txt b/changelog.txt index 9d16225..ced85dd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,12 @@ English changelog at http://bit.ly/1MfSVUP +[B]Version 2.3.8[/B] +[+] Добавлен АнтиЗапрет +[+] Списки Медиа: Исправлен KickAssSo + [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] [+] Проигрыватель: Уменьшена просадка после загрузки буфера diff --git a/default.py b/default.py index ed8a3dc..61f0b6b 100644 --- a/default.py +++ b/default.py @@ -19,7 +19,7 @@ ''' import sys - +import gc import xbmcaddon @@ -38,3 +38,7 @@ if (__name__ == "__main__" ): else: params = core.getParameters(sys.argv[2]) core.executeAction(params) + del core + +collected = gc.collect() +print "Garbage collector: collected %d objects." % (collected) \ No newline at end of file diff --git a/resources/__init__.py b/resources/__init__.py index e69de29..29440e1 100644 --- a/resources/__init__.py +++ b/resources/__init__.py @@ -0,0 +1,5 @@ +#-*- coding: utf-8 -*- +''' + Torrenter v2 plugin for XBMC/Kodi + Copyright (C) 2015 DiMartino +''' \ No newline at end of file diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index bc9c99d..bfd2d39 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -44,6 +44,10 @@ Save files Ask to save BTclient (python-libtorrent via http) + Auto-unblocking proxy + None + Anti-zapret + Immunicity Interface P2P Network Advanced @@ -69,4 +73,5 @@ Choose searcher You don't have external searcher. Please install it first. + diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml index 6a2fce1..1b4d968 100644 --- a/resources/language/Russian/strings.xml +++ b/resources/language/Russian/strings.xml @@ -44,6 +44,10 @@ Сохранять файлы Спросить о сохранении BTclient (python-libtorrent по http) + Антизапрет (прокси) + Не использовать + Anti-zapret + Immunicity Интерфейс P2P Сеть Дополнительные diff --git a/resources/scrapers/fuzzywuzzy/StringMatcher.py b/resources/scrapers/fuzzywuzzy/StringMatcher.py index 9dccfe7..a4b4811 100644 --- a/resources/scrapers/fuzzywuzzy/StringMatcher.py +++ b/resources/scrapers/fuzzywuzzy/StringMatcher.py @@ -7,9 +7,11 @@ ported from python-Levenshtein [https://github.com/miohtama/python-Levenshtein] """ -from Levenshtein import * from warnings import warn +from Levenshtein import * + + class StringMatcher: """A SequenceMatcher-like class built on the top of Levenshtein""" diff --git a/resources/scrapers/fuzzywuzzy/fuzz.py b/resources/scrapers/fuzzywuzzy/fuzz.py index 48470dc..db70af9 100644 --- a/resources/scrapers/fuzzywuzzy/fuzz.py +++ b/resources/scrapers/fuzzywuzzy/fuzz.py @@ -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. """ from __future__ import unicode_literals -import warnings try: from .StringMatcher import StringMatcher as SequenceMatcher except ImportError: - #warnings.warn('Using slow pure-python SequenceMatcher. Install python-Levenshtein to remove this warning') from difflib import SequenceMatcher from . import utils diff --git a/resources/scrapers/kinopoisk/pageparser.py b/resources/scrapers/kinopoisk/pageparser.py index 2b8555e..4246167 100644 --- a/resources/scrapers/kinopoisk/pageparser.py +++ b/resources/scrapers/kinopoisk/pageparser.py @@ -34,6 +34,7 @@ import translit + # 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?\((.*)\)', re.UNICODE) diff --git a/resources/settings.xml b/resources/settings.xml index 6cdd8a6..5b81080 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -11,6 +11,7 @@ + diff --git a/resources/skins/DialogReviews.py b/resources/skins/DialogReviews.py index ca0a2bd..959f46d 100644 --- a/resources/skins/DialogReviews.py +++ b/resources/skins/DialogReviews.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- -import sys, urllib, urllib2, re, os, cookielib, traceback, datetime, htmlentitydefs -import xbmc, xbmcgui, xbmcaddon +import re +import htmlentitydefs + +import xbmcgui pattern = re.compile("&(\w+?);") diff --git a/resources/utorrent/__init__.py b/resources/utorrent/__init__.py index e69de29..29440e1 100644 --- a/resources/utorrent/__init__.py +++ b/resources/utorrent/__init__.py @@ -0,0 +1,5 @@ +#-*- coding: utf-8 -*- +''' + Torrenter v2 plugin for XBMC/Kodi + Copyright (C) 2015 DiMartino +''' \ No newline at end of file diff --git a/resources/utorrent/dopal/class_defs.py b/resources/utorrent/dopal/class_defs.py index ccfb4a9..42ead4f 100644 --- a/resources/utorrent/dopal/class_defs.py +++ b/resources/utorrent/dopal/class_defs.py @@ -58,7 +58,6 @@ source file. # class_defs_make.py. # -import dopal.classes from dopal.aztypes import AzMethod as _method from dopal.aztypes import AzureusMethods