diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 74af705..bce384e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,12 @@
-
-
+
+
+
+
+
+
@@ -34,11 +38,11 @@
-
+
-
-
+
+
@@ -79,14 +83,11 @@
-
-
-
@@ -242,10 +243,10 @@
-
+
-
+
@@ -255,8 +256,8 @@
-
-
+
+
@@ -265,28 +266,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -328,16 +309,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -348,30 +319,20 @@
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
-
@@ -386,43 +347,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -460,12 +409,6 @@
@@ -545,6 +494,7 @@
+
@@ -577,28 +527,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -780,12 +711,6 @@
1420801533300
-
- 1440927124367
-
-
- 1440927124367
-
1443285528050
@@ -1074,18 +999,24 @@
1455384796938
-
+
+ 1456153123745
+
+
+ 1456153123747
+
+
-
+
-
+
@@ -1115,7 +1046,6 @@
-
@@ -1140,7 +1070,8 @@
-
+
+
@@ -1149,41 +1080,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1366,22 +1262,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1477,78 +1357,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1627,16 +1435,104 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -1677,14 +1573,11 @@
-
-
-
@@ -1755,11 +1648,49 @@
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Core.py b/Core.py
index 94c05ac..cdc74ec 100644
--- a/Core.py
+++ b/Core.py
@@ -1631,7 +1631,11 @@ class Core:
filesList=search(url, searchersList, get('isApi'))
if self.__settings__.getSetting('sort_search')=='true':
+ self.__settings__.setSetting('sort_search','1')
+ if int(self.__settings__.getSetting('sort_search'))==0:
filesList = sorted(filesList, key=lambda x: x[0], reverse=True)
+ elif int(self.__settings__.getSetting('sort_search'))==2:
+ filesList = sorted(filesList, key=lambda x: x[4], reverse=False)
self.showFilesList(filesList, params)
def controlCenter(self, params={}):
diff --git a/resources/contenters/RiperAM.py b/resources/contenters/RiperAM.py
index 04da053..4b36ca0 100644
--- a/resources/contenters/RiperAM.py
+++ b/resources/contenters/RiperAM.py
@@ -28,11 +28,11 @@ class RiperAM(Content.Content):
'hot': ('Most Recent', '/', {'page': '/portal.php?tp=%d', 'increase': 30, 'second_page': 30}),
}
- baseurl = "http://www.riper.am"
+ baseurl = "http://riperam.org"
headers = [('User-Agent',
'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124' + \
' YaBrowser/14.10.2062.12061 Safari/537.36'),
- ('Referer', 'http://www.riper.am/'), ('Accept-Encoding', 'gzip,deflate,sdch'),
+ ('Referer', baseurl+'/'), ('Accept-Encoding', 'gzip,deflate,sdch'),
('Accept-Language', 'ru,en;q=0.8')]
'''
Weight of source with this searcher provided.
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 10edd49..0ca5dd8 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -58,6 +58,10 @@
Below average PC/router
Storage minimum size for auto clear (GB)
Pause video after start
+ Sort search results
+ by Seeds
+ Do not sort
+ by Name
Interface
P2P Network
Advanced
diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml
index d02a922..8d97d14 100644
--- a/resources/language/Russian/strings.xml
+++ b/resources/language/Russian/strings.xml
@@ -58,6 +58,10 @@
Плохой ПК/роутер
Минимальный размер хранилища для очистки (ГБ)
Ставить паузу при старте видео
+ Сортировать результат поиска
+ по Количеству раздающих
+ Не сортировать
+ по Имени
Интерфейс
P2P Сеть
Дополнительные
diff --git a/resources/scrapers/kinopoisk/LOGGER.py b/resources/scrapers/kinopoisk/LOGGER.py
index 5197d9d..3fe307b 100644
--- a/resources/scrapers/kinopoisk/LOGGER.py
+++ b/resources/scrapers/kinopoisk/LOGGER.py
@@ -5,9 +5,9 @@ try:
from functions import log, debug
__settings__ = xbmcaddon.Addon("plugin.video.torrenter")
- debug = __settings__.getSetting("debug")
+ force_debug = __settings__.getSetting("debug")
except:
- debug = 'true'
+ force_debug = 'true'
def Log(msg, force=False):
@@ -15,15 +15,15 @@ def Log(msg, force=False):
def Debug(msg, force=False):
- if debug == 'true' or force:
+ if force_debug == 'true' or force:
debug(msg, True)
def Info(msg, force=False):
- if debug == 'true' or force:
+ if force_debug == 'true' or force:
debug(msg, True)
def Warn(msg, force=False):
- if debug == 'true' or force:
+ if force_debug == 'true' or force:
debug(msg, True)
\ No newline at end of file
diff --git a/resources/settings.xml b/resources/settings.xml
index 4e3a269..c6dd8d3 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -3,7 +3,7 @@
-
+