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

Fix streamingcommunity

Browse Source
This commit is contained in:
marco
2023-05-30 20:17:47 +02:00
parent 0cfe48cc74
commit 14488c4c54
2 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/streamingcommunity.py
+48 -48
View File
@@ -4,6 +4,8 @@
# ------------------------------------------------------------ # ------------------------------------------------------------
import json, re, sys import json, re, sys
import urllib.parse
from core import support, channeltools, httptools, jsontools from core import support, channeltools, httptools, jsontools
from platformcode import logger, config from platformcode import logger, config
@@ -17,8 +19,6 @@ else:
host = support.config.get_channel_url() host = support.config.get_channel_url()
headers = {'user-agent': httptools.random_useragent(),
'referer': host + '/browse'}
# def getHeaders(forced=False): # def getHeaders(forced=False):
# global headers # global headers
@@ -43,35 +43,38 @@ headers = {'user-agent': httptools.random_useragent(),
@support.menu @support.menu
def mainlist(item): def mainlist(item):
film=['', film=['/film',
('Generi',['/film','genres']), ('Aggiunti di recente',['/film','peliculas',1]),
('Titoli del Momento',['/film','peliculas',0]), ('Top 10 film di oggi',['/film','peliculas',2])]
('Novità',['/film','peliculas',1]), tvshow=['/serie-tv',
('Popolari',['/film','peliculas',2])] ('Aggiunti di recente', ['/serie-tv', 'peliculas', 1]),
tvshow=['', ('Top 10 serie TV di oggi', ['/serie-tv', 'peliculas', 2])]
('Generi',['/serie-tv','genres']), generi = [('Generi', ['','genres'])]
('Titoli del Momento',['/serie-tv','peliculas',0]),
('Novità',['/serie-tv','peliculas',1]),
('Popolari',['/serie-tv','peliculas',2])]
search='' search=''
return locals() return locals()
def get_data(url):
return jsontools.load(
support.scrapertools.decodeHtmlentities(support.match(url, patron='data-page="([^"]+)').match))
def genres(item): def genres(item):
# getHeaders() # getHeaders()
# logger.debug() # logger.debug()
itemlist = [] itemlist = []
data = support.scrapertools.decodeHtmlentities(support.match(item).data) data_page = get_data(item.url)
args = support.match(data, patronBlock=r'genre-options-json="([^\]]+)\]', patron=r'name"\s*:\s*"([^"]+)').matches args = data_page['props']['genres']
for arg in args: for arg in args:
itemlist.append(item.clone(title=support.typo(arg, 'bold'), args=arg, action='peliculas')) itemlist.append(item.clone(title=support.typo(arg['name'], 'bold'), url=host+'/browse/genre?g='+urllib.parse.quote(arg['name']), action='peliculas', genre=True))
support.thumb(itemlist, genre=True) support.thumb(itemlist, genre=True)
return itemlist return itemlist
def search(item, text): def search(item, text):
logger.debug('search', text) logger.debug('search', text)
item.search = text item.search = True
item.url = host + '/search?q=' + text
try: try:
return peliculas(item) return peliculas(item)
@@ -118,23 +121,17 @@ def peliculas(item):
itemlist = [] itemlist = []
items = [] items = []
recordlist = [] recordlist = []
videoType = 'movie' if item.contentType == 'movie' else 'tv'
page = item.page if item.page else 0 page = item.page if item.page else 0
offset = page * 60 data_page = get_data(item.url)
if item.records: if item.records:
records = item.records records = item.records
elif type(item.args) == int: elif item.genre or item.search:
data = support.scrapertools.decodeHtmlentities(support.match(item).data) records = data_page['props']['titles']
records = json.loads(support.match(data, patron=r'slider-title titles-json="(.*?)"\s*slider-name="').matches[item.args])
elif not item.search:
payload = {'type': videoType, 'offset':offset, 'genre':item.args}
records = httptools.downloadpage(host + '/api/browse', headers=headers, post=payload).json['records']
else: else:
payload = {'q': item.search} if not item.args:
headers['referer'] = host + '/search' item.args = 0
records = httptools.downloadpage(host + '/api/search', headers=headers, post=payload).json['records'] records = data_page['props']['sliders'][item.args]['titles']
if records and type(records[0]) == list: if records and type(records[0]) == list:
js = [] js = []
@@ -171,15 +168,14 @@ def peliculas(item):
def makeItem(n, it, item): def makeItem(n, it, item):
info = httptools.downloadpage(host + '/api/titles/preview/{}'.format(it['id']), headers=headers, post={}).json logger.debug(it)
logger.debug(jsontools.dump(info)) title = it['name']
title = info['name'] lang = 'Sub-ITA' if it.get('sub_ita', 0) == 1 else 'ITA'
lang = 'Sub-ITA' if 'sub-ita' in title.lower() else 'ITA'
title = support.cleantitle(re.sub('\[|\]|[Ss][Uu][Bb]-[Ii][Tt][Aa]', '', title))
itm = item.clone(title=support.typo(title,'bold') + support.typo(lang,'_ [] color kod bold')) itm = item.clone(title=support.typo(title,'bold') + support.typo(lang,'_ [] color kod bold'))
itm.contentType = info['type'].replace('tv', 'tvshow') itm.contentType = it['type'].replace('tv', 'tvshow')
itm.language = lang itm.language = lang
itm.year = info['release_date'].split('-')[0] if it['last_air_date']:
itm.year = it['last_air_date'].split('-')[0]
if itm.contentType == 'movie': if itm.contentType == 'movie':
# itm.contentType = 'movie' # itm.contentType = 'movie'
@@ -192,7 +188,7 @@ def makeItem(n, it, item):
itm.contentTitle = '' itm.contentTitle = ''
itm.fulltitle = itm.show = itm.contentSerieName = title itm.fulltitle = itm.show = itm.contentSerieName = title
itm.action = 'episodios' itm.action = 'episodios'
itm.season_count = info['seasons_count'] itm.season_count = it['seasons_count']
itm.url = host + '/titles/%s-%s' % (it['id'], it['slug']) itm.url = host + '/titles/%s-%s' % (it['id'], it['slug'])
itm.n = n itm.n = n
return itm return itm
@@ -203,27 +199,31 @@ def episodios(item):
logger.debug() logger.debug()
itemlist = [] itemlist = []
js = json.loads(support.match(item.url, patron=r'seasons="([^"]+)').match.replace('"','"')) data_page = get_data(item.url)
seasons = data_page['props']['title']['seasons']
# episodes = data_page['props']['loadedSeason']['episodes']
# support.dbg()
for episodes in js: for se in seasons:
# logger.debug(jsontools.dump(js)) data_page = get_data(item.url + '/stagione-' + str(se['number']))
for it in episodes['episodes']: episodes = data_page['props']['loadedSeason']['episodes']
for ep in episodes:
itemlist.append( itemlist.append(
item.clone(title=support.typo(str(episodes['number']) + 'x' + str(it['number']).zfill(2) + ' - ' + support.cleantitle(it['name']), 'bold'), item.clone(title=support.typo(str(se['number']) + 'x' + str(ep['number']).zfill(2) + ' - ' + support.cleantitle(ep['name']), 'bold'),
episode=it['number'], episode=ep['number'],
season=episodes['number'], season=se['number'],
contentSeason=episodes['number'], contentSeason=se['number'],
contentEpisodeNumber=it['number'], contentEpisodeNumber=ep['number'],
thumbnail=it['images'][0].get('original_url', item.thumbnail) if it['images'] else item.thumbnail, thumbnail=ep['images'][0].get('original_url', item.thumbnail) if ep['images'] else item.thumbnail,
contentThumbnail=item.thumbnail, contentThumbnail=item.thumbnail,
fanart=item.fanart, fanart=item.fanart,
contentFanart=item.fanart, contentFanart=item.fanart,
plot=it['plot'], plot=ep['plot'],
action='findvideos', action='findvideos',
contentType='episode', contentType='episode',
contentSerieName=item.fulltitle, contentSerieName=item.fulltitle,
url= '{}/watch/{}?e={}'.format(host, episodes['title_id'], it['id']))) url='{}/watch/{}?e={}'.format(host, se['title_id'], ep['id'])))
if config.get_setting('episode_info') and not support.stackCheck(['add_tvshow', 'get_newest']): if config.get_setting('episode_info') and not support.stackCheck(['add_tvshow', 'get_newest']):
support.tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) support.tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
core/support.py
+2
View File
@@ -1667,9 +1667,11 @@ def stackCheck(values):
def callAds(url, host): def callAds(url, host):
try: try:
import requests import requests
from threading import Thread
headers = {{'User-Agent': httptools.random_useragent(), headers = {{'User-Agent': httptools.random_useragent(),
'Origin': host, 'Origin': host,
'Referer': host}} 'Referer': host}}
requests.get(url, headers=headers) requests.get(url, headers=headers)
Thread(target=requests.get, args=(url, headers)).start()
except: except:
pass pass