pull/15/head
DiMartinoXBMC 2016-11-04 17:31:31 +03:00
parent 47093910a6
commit 7effa30860
7 changed files with 215 additions and 1109 deletions

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
[B]Version 2.5.3[/B]
[+] Венгерский язык
[+] Совместимость с Коди 17
[B]Version 2.5.2[/B]
[+] Упорядочивание по разверу файла

View File

@ -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
<include>View_50_List</include>
<include>View_51_Poster</include>
<include>View_52_IconWall</include>
<include>View_53_Shift</include>
<include>View_54_InfoWall</include>
<include>View_55_WideList</include>
<include>View_500_SmallThumb</include>
<include>View_501_Banner</include>
<include>View_502_FanArt</include>
'''
'''
<include>PosterWrapView2_Fanart</include> <!-- view id = 508 -->
<include>MediaListView3</include> <!-- view id = 503 -->
@ -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

View File

@ -100,7 +100,7 @@ class KickAssSo(Content.Content):
num = 51
good_forums = ['TV', 'Anime', 'Movies']
regex = '''<tr class=".+?" id=.+?</tr>'''
regex_tr = r'''title="Download torrent file" href="(.+?)" class=".+?"><i.+?<a.+?<a.+?<a href="(.+?html)" class=".+?">(.+?)</a>.+? in <span.+?"><strong>.+?">(.+?)</a>.+?<td class="nobr center">(.+?)</td>.+?<td class="center".+?>(\d+&nbsp;.+?)</td>.+?<td class="green center">(\d+?)</td>.+?<td class="red lasttd center">(\d+?)</td>'''
regex_tr = r'''<a data-download .+? href="(.+?)" class=".+?"><i.+?<a.+?<a.+?<a href="(.+?html)" class=".+?">(.+?)</a>.+? in <span.+?"><strong>.+?">(.+?)</a>.+?<td class="nobr center">(.+?)</td>.+?<td class="center".+?>(\d+&nbsp;.+?)</td>.+?<td class="green center">(\d+?)</td>.+?<td class="red lasttd center">(\d+?)</td>'''
for tr in re.compile(regex, re.DOTALL).findall(response):
result=re.compile(regex_tr, re.DOTALL).findall(tr)
if result:

View File

@ -68,6 +68,7 @@
<string id="30068">pyrrent2http (python-libtorrent via http)</string>
<string id="30069">Append size to file name</string>
<string id="30070">Enable DHT</string>
<string id="30071">Estuary (by DiMartino)</string>
<string id="30101">Interface</string>
<string id="30102">P2P Network</string>
<string id="30103">Advanced</string>

View File

@ -68,6 +68,7 @@
<string id="30068">pyrrent2http (python-libtorrent по http)</string>
<string id="30069">Добавлять размер к имени файла</string>
<string id="30070">Включить DHT</string>
<string id="30018">Estuary (от DiMartino)</string>
<string id="30101">Интерфейс</string>
<string id="30102">P2P Сеть</string>
<string id="30103">Дополнительные</string>

View File

@ -4,7 +4,7 @@
<setting id="metadata" type="bool" label="30014" default="false"/>
<setting id="history" type="bool" label="30020" default="true"/>
<setting id="sort_search" type="enum" label="30061" default="0" lvalues="30062|30063|30064"/>
<setting id="skin_optimization" type="enum" label="30002" default="1" lvalues="30003|30018|30017|30016|30019|30066|30067"/>
<setting id="skin_optimization" type="enum" label="30002" default="1" lvalues="30003|30018|30017|30016|30019|30066|30067|30071"/>
<setting id="open_option" type="enum" label="30034" default="0" lvalues="30035|30036|30037|30038"/>
</category>
<category label="30103">