Merge branch 'master' into alpha

2021-06-10 16:01:03 +02:00
parent 3c05a3cd0c aa55d2e37d
commit a04aa7cb73
68 changed files with 12011 additions and 261 deletions
@@ -1,7 +1,7 @@
 {
  "id": "altadefinizione01_link",
  "name": "Altadefinizione01 L",
-  "active": true,
+  "active": false,
  "language": ["ita","sub-ita"],
  "thumbnail": "altadefinizione01_L.png",
  "banner": "altadefinizione01_L.png",
@@ -3,6 +3,7 @@
 # Canale per AnimeUnity
 # ------------------------------------------------------------

+from lib.requests.sessions import session
 import requests, json, copy, inspect
 from core import support
 from platformcode import autorenumber
@@ -115,8 +116,10 @@ def news(item):
    support.info()
    item.contentType = 'episode'
    itemlist = []
+    import cloudscraper
+    session = cloudscraper.create_scraper()

-    fullJs = json.loads(support.match(item, headers=headers, patron=r'items-json="([^"]+)"').match.replace('&quot;','"'))
+    fullJs = json.loads(support.match(session.get(item.url).text, headers=headers, patron=r'items-json="([^"]+)"', debug=True).match.replace('&quot;','"'))
    js = fullJs['data']

    for it in js:
@@ -29,6 +29,7 @@ def mainlist(item):
 def menu(item):
    item.contentType = ''
    action = 'peliculas'
+    

    patronBlock = r'<div class="filter-header"><b>%s</b>(?P<block>.*?)<div class="filter-box">' % item.args
    patronMenu = r'<a class="[^"]+" data-state="[^"]+" (?P<other>[^>]+)>[^>]+></i>[^>]+></i>[^>]+></i>(?P<title>[^>]+)</a>'
@@ -89,7 +90,7 @@ def peliculas(item):
        patronBlock = r'<div id="%s"[^>]+>(?P<block>.*?)<div class="vistaDettagliata"' % item.args[1]
        patron = r'<li>\s*<a href="(?P<url>[^"]+)" title="(?P<title>[^"]+)" class="thumb">[^>]+>[^>]+>[^>]+>\s*[EePp]+\s*(?P<episode>\d+)[^>]+>\s<img src="(?P<thumb>[^"]+)"'
    else:
-        patron = r'<div class="showStreaming"> +<b>(?P<title>[^<]+)[^>]+>[^>]+>\s*<span>Lingua:\s*(?P<lang>[^>]+)?>[<>br\s]+a href="(?P<url>[^"]+)"[^>]+>.*?--image-url:url\(/*(?P<thumb>[^\)]+).*?Anno di inizio</b>:\s*(?P<year>[0-9]{4})'
+        patron = r'<div class="showStreaming">\s*<b>(?P<title>[^<]+)[^>]+>[^>]+>\s*<span>Lingua:\s*(?:DUB|JAP)?\s*(?P<lang>(?:SUB )?ITA)[^>]+>[<>br\s]+a href="(?P<url>[^"]+)"[^>]+>.*?--image-url:url\(/*(?P<thumb>[^\)]+).*?Anno di inizio</b>:\s*(?P<year>[0-9]{4})'
        patronNext = '<li class="currentPage">[^>]+><li[^<]+<a href="([^"]+)">'

    def itemHook(item):
@@ -128,7 +129,6 @@ def findvideos(item):
    if 'vvvvid' in matches.data:
        itemlist.append(item.clone(action="play", title='VVVVID', url=support.match(matches.data, patron=r'(http://www.vvvvid[^"]+)').match, server='vvvvid'))
    else:
-    # matches.matches.sort()
        support.info('VIDEO')
        for url in matches.matches:
            lang = url.split('/')[-2]
@@ -139,8 +139,6 @@ def findvideos(item):
            quality = url.split('/')[-1].split('?')[0]
            url += '|User-Agent=' + support.httptools.get_user_agent() + '&Referer=' + url

-            itemlist.append(item.clone(action="play", title=language, url=url, contentLanguage = language, quality = quality, order = quality.replace('p','').zfill(4), server='directo',))
-
-    itemlist.sort(key=lambda x: (x.title, x.order), reverse=False)
+            itemlist.append(item.clone(action="play", title='', url=url, contentLanguage = language, quality = quality, order = quality.replace('p','').zfill(4), server='directo',))
    return support.server(item, itemlist=itemlist)

@@ -35,18 +35,17 @@ def mainlist(item):
@support.scrape
 def peliculas(item):
    support.info()
-    #debug = True
+    # debug = True
    #debugBlock = True
+    # support.dbg()

    if item.args != 'newest':
        patronBlock = r'<ul class="posts">(?P<block>.*)<\/ul>'
        patron = r'<li><a href="(?P<url>[^"]+)" data-thumbnail="(?P<thumb>[^"]+)">.*?<div class="title[^"]*">(?P<title>.+?)(?:\[(?P<lang>Sub-ITA)\])?(?:[ ]\[?(?P<quality>[HD]+)?\])?(?:[ ]\((?P<year>\d+)\)?)?<\/div>'
-        patronNext = r'<a href="([^"]+)" >Pagina'
-
+        patronNext = r'<a href="([^"]+)[^>]+>Pagina'
    else:
        patronBlock = r'<ul class="posts">(?P<block>.*)<div class="clear[^"]*">'
        patron = r'<li>\s?<a href="(?P<url>[^"]+)" data-thumbnail="(?P<thumb>[^"]+)">.*?<div class="title[^"]*">(?P<title>.+?)(?:\s\[(?P<quality>HD)\])?<\/div><div class="episode[^"]*"[^>]+>(?P<episode>[^<(]+)(?:\((?P<lang>[a-zA-Z\-]+)\))?'
-        pagination = ''

    if item.args == 'search':
        action = 'select'
@@ -58,7 +57,7 @@ def peliculas(item):
        action = 'select'

    def itemHook(item):
-        item.title = item.title.replace(r'-', ' ')
+        item.title = item.title.replace(' - La Serie', '')
        return item

    return locals()
@@ -22,10 +22,11 @@ def mainlist(item):
 def peliculas(item):
    # debug = True
    if item.args == 'alternative':
-        patron = r'<a title="(?P<title>[^\(]+)\(\s*(?P<year>\d+)\)\s\D+(?P<quality>\d+p) ... (?P<lang>[^ ]+).*?[^"]+"\s*href="(?P<url>[^"]+)'
+        pagination = ''
+        patron = r'<a title="(?P<title>[^\(]+)\(\s*(?P<year>\d+)\)\s\D+(?P<quality>\d+p).{3}(?P<lang>[^ ]+).*?[^"]+"\s*href="(?P<url>[^"]+)'
    else:
        patron = r'<a href="(?P<url>[^"]+)" (?:rel="?[0-9]+"?)? title="(?P<title>[^\(]+)(?!\()\s*\((?P<year>\d+)\)\s(?:[^\]]+\])?\D+(?P<quality>\d+p).{3}(?P<lang>[^ ]+).*?<img id="?cov"?.*?src="(?P<thumb>[^"]+)'
-        patronNext = r'rel="?next"? href="([^"]+)"'
+        patronNext = r'current(?:[^>]*>){2}\s*<a class="[^"]+"\s* href="([^"]+)'
    return locals()


@@ -89,4 +89,11 @@ def newest(categoria):

 def findvideos(item):
    info()
-    return support.server(item)
+    urls = []
+    data = support.match(item).data
+    urls += support.match(data, patron=r'id="urlEmbed" value="([^"]+)').matches
+    matches = support.match(data, patron=r'<iframe.*?src="([^"]+)').matches
+    for m in matches:
+        if 'youtube' not in m and not m.endswith('.js'):
+            urls += support.match(m, patron=r'data-link="([^"]+)').matches
+    return support.server(item, urls)
@@ -1,7 +1,7 @@
 {
    "id": "mondoserietv",
    "name": "MondoSerieTV",
-    "active": true,
+    "active": false,
    "language": ["ita"],
    "thumbnail": "mondoserietv.png",
    "bannermenu": "mondoserietv.png",
@@ -1,7 +1,7 @@
 {
    "id": "serietvonline",
    "name": "SerieTvOnline",
-    "active": true,
+    "active": false,
    "language": ["ita"],
    "thumbnail": "serietvonline.png",
    "bannermenu": "serietvonline.png",
@@ -10,13 +10,13 @@ from platformcode import logger
 from platformcode import config


-def findhost(url):
-    permUrl = httptools.downloadpage(url).data
-    host = scrapertools.find_single_match(permUrl, r'<a href="([^"]+)')
-    return host
+# def findhost(url):
+#     permUrl = httptools.downloadpage(url).data
+#     host = scrapertools.find_single_match(permUrl, r'<a href="([^"]+)')
+#     return host


-host = config.get_channel_url(findhost)
+host = config.get_channel_url()
 headers = [['Referer', host]]

 player_iframe = r'<iframe.*?src="([^"]+)"[^>]+></iframe>\s*<div class="player'
@@ -133,7 +133,7 @@ def search(item, texto):
@support.scrape
 def newest(categoria):
    if categoria == 'series':
-        item = Item(url=host + '/aggiornamenti-giornalieri-serie-tv-2')
+        item = Item(url=host + '/aggiornamenti-giornalieri-serie-tv')
        data = support.match(item).data.replace('<u>','').replace('</u>','')
        item.contentType = 'episode'
        patronBlock = r'Aggiornamenti Giornalieri Serie TV.*?<div class="sp-body folded">(?P<block>.*?)</div>'
@@ -0,0 +1,11 @@
+{
+    "id": "tapmovie",
+    "name": "Tap Movie",
+    "language": ["ita", "sub-ita"],
+    "active": true,
+    "thumbnail": "tapmovie.png",
+    "banner": "tapmovie.png",
+    "categories": ["movie", "tvshow", "anime"],
+    "not_active": ["include_in_newest"],
+    "settings": []
+}
@@ -0,0 +1,102 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Canale per 'dvdita'
+
+from core import support, httptools
+from core.item import Item
+import sys
+if sys.version_info[0] >= 3: from concurrent import futures
+else: from concurrent_py2 import futures
+
+host = support.config.get_channel_url()
+api_url = '/api/v2/'
+per_page = 24
+
+
+@support.menu
+def mainlist(item):
+    film = ['/browse/movie']
+    tvshow = ['/browse/tvshow']
+    search = ''
+
+    # [Voce Menu,['url','action','args',contentType]
+    top = [('Generi', ['', 'genres', '', 'undefined'])]
+
+    return locals()
+
+
+def episodios(item):
+    support.info(item)
+    itemlist = []
+
+    with futures.ThreadPoolExecutor() as executor:
+        thL = []
+        for season in httptools.downloadpage(host + api_url + 'tvshow', post={'tvshow_id': item.id}).json.get('season', []):
+            season_id = season['season_number']
+            thL.append(executor.submit(httptools.downloadpage, host + api_url + 'episodes', post={'tvshow_id': item.id, 'season_id': season_id}))
+        for th in futures.as_completed(thL):
+            for episode in th.result().json.get('episodes', []):
+                itemlist.append(item.clone(action="findvideos", contentSeason=episode['season_id'], contentEpisodeNumber=episode['episode_number'], id=item.id,
+                                           title=episode['season_id']+'x'+episode['episode_number'], contentType='episode'))
+    support.scraper.sort_episode_list(itemlist)
+    support.videolibrary(itemlist, item)
+    support.download(itemlist, item)
+
+    return itemlist
+
+
+def genres(item):
+    itemlist = []
+    for n, genre in enumerate(httptools.downloadpage(host + api_url + 'categories', post={}).json.get('categories', [])):
+        itemlist.append(item.clone(action="peliculas", genre=genre.get('name'), title=genre.get('value'), n=n))
+    return support.thumb(itemlist, genre=True)
+
+
+def peliculas(item, text=''):
+    support.info('search', item)
+    itemlist = []
+    filter_type = False
+    if item.genre:
+        text = item.genre
+        cmd = 'search/category'
+    else:
+        cmd = 'search'
+        if not text:
+            filter_type = True
+
+    try:
+        page = int(item.url.split('?p=')[1])
+    except:
+        page = 1
+    results = httptools.downloadpage(host + api_url + cmd, post={'search': text, 'page': page}).json.get('results', [])
+    for result in results:
+        contentType = 'movie' if result['type'] == 'FILM' else 'tvshow'
+        if not filter_type or (filter_type and contentType == item.contentType):
+            itemlist.append(item.clone(id=result.get('id'), title=result.get('title'), contentTitle=result.get('title'),
+                                       contentSerieName='' if contentType == 'movie' else result.get('title'),
+                                       contentPlot=result.get('description'), thumbnail=result.get('poster'),
+                                       fanart=result.get('backdrop'), year=result.get('year'), action='episodios' if contentType == 'tvshow' else 'findvideos',
+                                       url='{}/{}/{}-{}'.format('https://filmigratis.org', contentType, result.get('id'), support.scrapertools.slugify(result.get('title'))),
+                                       contentType=contentType))
+    support.tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+
+    if len(results) >= per_page:
+        page += 1
+        support.nextPage(itemlist, item, next_page='https://filmigratis.org/category/' + str(item.n) + '/' + item.genre + '?p=' + str(page))
+    return itemlist
+
+
+def search(item, text):
+    return peliculas(item, text)
+
+
+def findvideos(item):
+    itemlist = []
+    if not item.contentSeason:  # film
+        json = httptools.downloadpage(host + api_url + 'movie', post={'movie_id': item.id}).json
+    else:
+        json = httptools.downloadpage(host + api_url + 'episode/links', post={'tvshow_id': item.id, 'season_id': item.contentSeason, 'episode_id': item.contentEpisodeNumber}).json
+
+    for i in json.get('links', []) + json.get('special', []):
+        itemlist.append(Item(url=i.get('link')))
+    return support.server(item, itemlist=itemlist)
@@ -3,7 +3,7 @@
 # Canale per ToonItalia
 # ------------------------------------------------------------

-from core import support
+from core import scrapertools, support
 import sys

 host = support.config.get_channel_url()
@@ -76,7 +76,7 @@ def peliculas(item):
    else:
        patronBlock = '<main[^>]+>(?P<block>.*)</main>'
        # patron = r'<a href="(?P<url>[^"]+)" rel="bookmark">(?P<title>[^<]+)</a>[^>]+>[^>]+>[^>]+><img.*?src="(?P<thumb>[^"]+)".*?<p>(?P<plot>[^<]+)</p>.*?<span class="cat-links">Pubblicato in.*?.*?(?P<type>(?:[Ff]ilm|</artic))[^>]+>'
-        patron = r'<a href="(?P<url>[^"]+)"[^>]+>(?P<title>[^<]+)</a>[^>]+>[^>]+>[^>]+><img.*?src="(?P<thumb>[^"]+)".*?<p>(?P<plot>[^<]+)</p>.*?tag">.*?(?P<type>(?:[Ff]ilm|</art|Serie Tv))'
+        patron = r'<a href="(?P<url>[^"]+)" rel="bookmark">(?P<title>[^<]+)</a>(:?[^>]+>){3}(?:<img.*?src="(?P<thumb>[^"]+)")?.*?<p>(?P<plot>[^<]+)</p>.*?tag">.*?(?P<type>(?:[Ff]ilm|</art|Serie Tv))'
        typeContentDict={'movie':['film']}
        typeActionDict={'findvideos':['film']}
        patronNext = '<a class="next page-numbers" href="([^"]+)">'
@@ -93,21 +93,27 @@ def peliculas(item):
@support.scrape
 def episodios(item):
    anime = True
-    data = support.match(item, headers=headers).data
-    if 'https://vcrypt.net' in data:
-        patron = r'(?: /> |<p>)(?P<episode>\d+.\d+)?(?: &#8211; )?(?P<title>[^<]+)<a (?P<data>.*?)(?:<br|</p)'
-    else:
-        patron = r'<br />\s*<a href="(?P<url>[^"]+)" target="_blank" rel="noopener[^>]+>(?P<episode>\d+.\d+)?(?: &#8211; )?(?P<title>[^<]+)</a>'
+    def get_ep(item):
+        find = ''
+        data = support.match(item, headers=headers).data
+        match = support.match(data, patron=r'(?: /> |<p>)(?:(?P<season>\d+)&#215;)?(?P<episode>\d+)(?:\s+&#8211;\s+)?(?P<title>[^<]+)<a (?P<data>.*?)(?:<br|</p)').matches
+        if match:
+            for m in match:
+                find += '{}{:02d}|{}|{}|'.format(m[0]+'x' if m[0] else '', int(m[1]), clean_title(m[2]), m[3])
+        return find

-    def itemHook(item):
-        item.title = support.re.sub(r'\[B\]|\[/B\]', '', item.title)
-        item.title = item.title.replace('_',' ').replace('–','-').replace('&#215;','x').replace('-','-').replace('  ',' ')
-        item.title = support.re.sub(item.fulltitle + ' - ','',item.title)
-        item.title = support.typo(item.title.strip(' -'),'bold')
-        return item
+    data = get_ep(item)
+    patron = r'(?P<episode>[^|]+)\|(?P<title>[^|]+)\|(?P<data>[^|]+)\|'

    return locals()


 def findvideos(item):
    return support.server(item, item.data if item.contentType != 'movie' else support.match(item.url, headers=headers).data )
+
+
+def clean_title(title):
+    title = scrapertools.unescape(title)
+    title = title.replace('_',' ').replace('–','-').replace('  ',' ')
+    title = title.strip(' - ')
+    return title