diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e4f06a2..4297a2a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,12 @@
-
-
-
+
+
+
@@ -38,49 +38,32 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -264,7 +247,7 @@
-
+
@@ -277,468 +260,30 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -747,115 +292,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -918,22 +356,22 @@
-
-
-
-
-
+
+
+
+
+
@@ -1018,6 +456,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1330,13 +848,6 @@
1420801533300
-
- 1455033246891
-
-
-
- 1455033246892
-
1455384796936
@@ -1673,7 +1184,14 @@
1478266480667
-
+
+ 1478266893338
+
+
+
+ 1478266893338
+
+
@@ -1692,6 +1210,7 @@
+
@@ -1706,7 +1225,6 @@
-
@@ -1723,7 +1241,6 @@
-
@@ -1748,7 +1265,8 @@
-
+
+
@@ -1757,13 +1275,6 @@
-
-
-
-
-
-
-
@@ -1967,22 +1478,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1997,7 +1492,7 @@
-
+
@@ -2235,13 +1730,6 @@
-
-
-
-
-
-
-
@@ -2289,14 +1777,6 @@
-
-
-
-
-
-
-
-
@@ -2305,10 +1785,18 @@
+
+
+
+
+
+
+
+
-
-
+
+
@@ -2316,462 +1804,60 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index dfd04ec..cf792f3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,7 +2,7 @@
[B]Version 2.5.3[/B]
[+] Венгерский язык
-
+[+] Совместимость с Коди 17
[B]Version 2.5.2[/B]
[+] Упорядочивание по разверу файла
diff --git a/functions.py b/functions.py
index ce82361..4ca9123 100644
--- a/functions.py
+++ b/functions.py
@@ -575,14 +575,14 @@ def view_style(func):
styles['sectionMenu'] = styles['Seasons'] = 'list'
styles['uTorrentBrowser'] = styles['torrentPlayer'] = styles['openTorrent'] = 'wide'
styles['showFilesList'] = styles['DownloadStatus'] = 'wide'
- elif view_style in [1, 4, 5]:
+ elif view_style in [1, 4, 5, 7]:
styles['searchOption'] = 'info'
styles['drawContent'] = styles['torrentPlayer'] = styles['openTorrent'] = styles['drawtrackerList'] = 'info'
styles['uTorrentBrowser'] = styles['History'] = styles['DownloadStatus'] = 'wide'
styles['showFilesList'] = styles['sectionMenu'] = 'wide'
styles['List'] = styles['drawcontentList'] = 'info3'
- if view_style == 1:
+ if view_style in [1, 7]:
styles['uTorrentBrowser'] = styles['torrentPlayer'] = 'wide'
styles['openTorrent'] = styles['History'] = styles['DownloadStatus'] = 'wide'
styles['sectionMenu'] = 'icons'
@@ -598,9 +598,11 @@ def view_style(func):
num_skin = 1
elif view_style == 6:
num_skin = 2
+ elif view_style == 7:
+ num_skin = 3
style = styles.get(func)
- # debug('[view_style]: lock '+str(style))
+ log('[view_style]: lock '+str(style)+' for '+str(func))
lockView(style, num_skin)
@@ -610,12 +612,28 @@ def lockView(viewId='info', num_skin=0):
{'list': 50, 'info': 50, 'wide': 51, 'icons': 500, 'info3': 515, }, # Confluence
{'list': 50, 'info': 51, 'wide': 52, 'icons': 53, }, # Transperency!
{'list': 55, 'info': 55, 'wide': 55, 'icons': 55, 'info3': 55, }, # Aeon Nox
+ {'list': 50, 'info': 54, 'wide': 55, 'icons': 54, 'info3': 500, }, # Estuary
)
try:
+ if viewId == 'wide' and num_skin == 3:
+ xbmcplugin.setContent(int(sys.argv[1]), 'files')
xbmc.executebuiltin("Container.SetViewMode(%s)" % str(skinOptimizations[num_skin][viewId]))
except:
return
+ ''' Estuary
+ View_50_List
+ View_51_Poster
+ View_52_IconWall
+ View_53_Shift
+ View_54_InfoWall
+ View_55_WideList
+ View_500_SmallThumb
+ View_501_Banner
+ View_502_FanArt
+ '''
+
+
'''
PosterWrapView2_Fanart
MediaListView3
@@ -1360,7 +1378,7 @@ class Contenters():
searchersList = []
dirList = os.listdir(ROOT + os.sep + 'resources' + os.sep + 'contenters')
for searcherFile in dirList:
- if re.match('^(\w+)\.py$', searcherFile):
+ if re.match('^(\w+)\.py$', searcherFile) and searcherFile != '__init__.py':
searchersList.append(searcherFile.replace('.py', ''))
return searchersList
diff --git a/resources/contenters/KickAssSo.py b/resources/contenters/KickAssSo.py
index 35dd2c9..36df64d 100644
--- a/resources/contenters/KickAssSo.py
+++ b/resources/contenters/KickAssSo.py
@@ -100,7 +100,7 @@ class KickAssSo(Content.Content):
num = 51
good_forums = ['TV', 'Anime', 'Movies']
regex = '''
'''
- regex_tr = r'''title="Download torrent file" href="(.+?)" class=".+?">(.+?).+? in .+?">(.+?).+?(.+?) | .+?(\d+ .+?) | .+?(\d+?) | .+?(\d+?) | '''
+ regex_tr = r'''(.+?).+? in .+?">(.+?).+?(.+?) | .+?(\d+ .+?) | .+?(\d+?) | .+?(\d+?) | '''
for tr in re.compile(regex, re.DOTALL).findall(response):
result=re.compile(regex_tr, re.DOTALL).findall(tr)
if result:
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 8897896..d58ab3b 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -68,6 +68,7 @@
pyrrent2http (python-libtorrent via http)
Append size to file name
Enable DHT
+ Estuary (by DiMartino)
Interface
P2P Network
Advanced
diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml
index fb67ec9..015559c 100644
--- a/resources/language/Russian/strings.xml
+++ b/resources/language/Russian/strings.xml
@@ -68,6 +68,7 @@
pyrrent2http (python-libtorrent по http)
Добавлять размер к имени файла
Включить DHT
+ Estuary (от DiMartino)
Интерфейс
P2P Сеть
Дополнительные
diff --git a/resources/settings.xml b/resources/settings.xml
index 18daeed..ff71017 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -4,7 +4,7 @@
-
+