stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'master' of github.com:kodiondemand/addon

Browse Source 
* 'master' of github.com:kodiondemand/addon:
  VVVVID Fix Stagioni Multiple
  VVVVID Supporto Videoteca
This commit is contained in:
greko17
2019-09-27 19:26:15 +02:00
parent 2d52e33eec 08a930567a
commit 4d4e7fc261
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/vvvvid.py
+24 -14
View File
@@ -115,20 +115,30 @@ def episodios(item):
itemlist = [] itemlist = []
json_file = current_session.get(item.url, headers=headers, params=payload).json() json_file = current_session.get(item.url, headers=headers, params=payload).json()
show_id = str(json_file['data'][0]['show_id']) show_id = str(json_file['data'][0]['show_id'])
for key in json_file['data'][0]['episodes']: episodes = []
itemlist.append( for episode in json_file['data']:
Item( episodes.append(episode['episodes'])
channel = item.channel, for episode in episodes:
title = 'Episodio ' + str(key['number']) + ' - ' + key['title'], for key in episode:
fulltitle= item.fulltitle, if 'stagione' in key['title'].lower():
show= item.show, match = support.match(key['title'].encode('ascii', 'replace'), r'[Ss]tagione\s*(\d+) - [Ee]pisodio\s*(\d+)')[0][0]
url= host + show_id + '/season/' + str(key['season_id']) + '/', title = match[0]+'x'+match[1] + ' - ' + item.fulltitle
action= 'findvideos', else:
video_id= key['video_id'], title = 'Episodio ' + key['number'].encode('ascii', 'replace') + ' - ' + key['title'],
contentType = item.contentType itemlist.append(
)) Item(
channel = item.channel,
title = title,
fulltitle= item.fulltitle,
show= item.show,
url= host + show_id + '/season/' + str(key['season_id']) + '/',
action= 'findvideos',
video_id= key['video_id'],
contentType = item.contentType
))
autorenumber.renumber(itemlist, item, 'bold') autorenumber.renumber(itemlist, item, 'bold')
support.videolibrary(itemlist,item) if autorenumber.check(item) == True:
support.videolibrary(itemlist,item)
return itemlist return itemlist
def findvideos(item): def findvideos(item):
@@ -154,7 +164,7 @@ def findvideos(item):
url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url, url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url,
server= 'directo') server= 'directo')
) )
return support.server(item, itemlist=itemlist) return support.server(item, itemlist=itemlist, download=False)
def make_itemlist(itemlist, item, data): def make_itemlist(itemlist, item, data):
search = item.search if item.search else '' search = item.search if item.search else ''
core/support.py
+2 -2
View File
@@ -876,7 +876,7 @@ def pagination(itemlist, item, page, perpage, function_level=1):
thumbnail=thumb())) thumbnail=thumb()))
return itemlist return itemlist
def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True): def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True, download=True):
if not data: if not data:
data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
@@ -927,7 +927,7 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True):
autoplay.start(itemlist, item) autoplay.start(itemlist, item)
if item.contentChannel != 'videolibrary': videolibrary(itemlist, item, function_level=3) if item.contentChannel != 'videolibrary': videolibrary(itemlist, item, function_level=3)
if get_setting('downloadenabled'): download(itemlist, item, function_level=3) if get_setting('downloadenabled') and download == True: download(itemlist, item, function_level=3)
return itemlist return itemlist
def filterLang(item, itemlist): def filterLang(item, itemlist):
specials/autorenumber.py
+2 -1
View File
@@ -262,7 +262,8 @@ def renumeration (itemlist, item, typography, dict_series, ID, SEASON, EPISODE,
if len(EpisodeDict) >= len(itemlist): if len(EpisodeDict) >= len(itemlist):
for item in itemlist: for item in itemlist:
number = scrapertoolsV2.find_single_match(item.title, r'\d+') number = scrapertoolsV2.find_single_match(item.title, r'\d+')
if number != '0': number.lstrip("0") log('TIPO NUMBER= ', type(number))
number = int(number)
item.title = typo(EpisodeDict[str(number)] + ' - ', typography) + item.title item.title = typo(EpisodeDict[str(number)] + ' - ', typography) + item.title
else: else:
make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE) make_list(itemlist, item, typography, dict_series, ID, SEASON, EPISODE, MODE, TITLE)