Merge remote-tracking branch 'origin/master'

channels/film4k.json

@@ -5,7 +5,7 @@
 	"active": true,
 	"thumbnail": "film4k.png",
 	"banner": "film4k.png",
-	"categories": ["tvshow", "movie"],
+	"categories": ["tvshow", "movie", "anime"],
 	"not_active": ["include_in_newest_peliculas", "include_in_newest_anime", "include_in_newest_series"],
 	"settings": []
 }

channels/film4k.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # ------------------------------------------------------------
-# Canale per netfreex
+# Canale per Filn4k
 # ------------------------------------------------------------
 
 from core import support
@@ -8,7 +8,7 @@ from platformcode import logger, config
 
 
 def findhost():
-    return support.httptools.downloadpage('https://film4k-nuovo.link/').url
+    return support.httptools.downloadpage('https://film4k-nuovo.link').url
 
 host = config.get_channel_url(findhost)
 
@@ -16,16 +16,15 @@ host = config.get_channel_url(findhost)
 @support.menu
 def mainlist(item):
 
-    film = ['/movies',
-        ('Qualità', ['', 'menu', 'quality']),
-        ('Generi', ['', 'menu', 'genres']),
-        ('Più popolari', ['trending/?get=movies', 'peliculas']),
-        ('Più votati', ['ratings/?get=movies', 'peliculas'])
-    ]
+    film = ['movies',
+            ('Qualità', ['', 'menu', 'quality']),
+            ('Generi', ['movies', 'menu', 'genres']),
+            ('Anno', ['movies', 'menu', 'releases']),
+            ('Più popolari', ['trending/?get=movies', 'peliculas']),
+            ('Più votati', ['ratings/?get=movies', 'peliculas'])]
     tvshow = ['/tvshows',
               ('Più popolari', ['trending/?get=tv', 'peliculas']),
-              ('Più votati', ['ratings/?get=tv', 'peliculas'])
-              ]
+              ('Più votati', ['ratings/?get=tv', 'peliculas'])]
     return locals()
 
 
@@ -41,6 +40,7 @@ def search(item, text):
         return []
 
 
+
 def peliculas(item):
     if 'anime' in item.url:
         return support.dooplay_peliculas(item, True)
@@ -49,14 +49,15 @@ def peliculas(item):
 
 
 def episodios(item):
-    return support.dooplay_get_episodes(item)
+    itemlist = support.dooplay_get_episodes(item)
+    return itemlist
 
 
 def findvideos(item):
     itemlist = []
     if item.contentType == 'episode':
         linkHead = support.httptools.downloadpage(item.url, only_headers=True).headers['link']
-        epId = support.scrapertools.find_single_match(linkHead, '\?p=([0-9]+)>')
+        epId = support.scrapertools.find_single_match(linkHead, r'\?p=([0-9]+)>')
         for link in support.dooplay_get_links(item, host, paramList=[['tv', epId, 1, 'title', 'server']]):
             itemlist.append(
                 item.clone(action="play", url=link['url']))
@@ -72,10 +73,10 @@ def findvideos(item):
 @support.scrape
 def menu(item):
     action = 'peliculas'
-    if item.extra == 'genres':
-        data = support.match(item, patron=r'<a href="#">Genere<(.*?)</ul').match
+    if item.args in ['genres','releases']:
+        patronBlock = r'<nav class="' + item.args + r'">(?P<block>.*?)</nav'
         patronMenu= r'<a href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)<'
     else:
         patronBlock = r'class="main-header">(?P<block>.*?)headitems'
-        patronMenu = r'(?P<url>' + host + 'quality/[^/]+/\?post_type=movies)">(?P<title>[^<]+)'
+        patronMenu = r'(?P<url>' + host + r'quality/[^/]+/\?post_type=movies)">(?P<title>[^<]+)'
     return locals()

channels/netfreex.py

@@ -54,12 +54,14 @@ def episodios(item):
 
 
 def findvideos(item):
+    from core import jsontools
     itemlist = []
-    for link in support.dooplay_get_links(item, host):
-        if link['title'] != 'Guarda il trailer':
-            logger.info(link['title'])
-            itemlist.append(
-                item.clone(action="play", url=link['url'], quality=link['title']))
+    matches = support.match(item, patron=r'<li id="player-option-[0-9]".*?data-type="([^"]+)" data-post="([^"]+)" data-nume="([^"]+)".*?<span class="title".*?>([^<>]+)</span>(?:<span class="server">([^<>]+))?').matches
+    for Type, Post, Nume, Quality, Server in matches:
+        dataAdmin = support.match(host + '/wp-json/dooplayer/v1/post/%s?type=%s&source=%s' %(Post, Type, Nume)).data
+        js = jsontools.load(dataAdmin)
+        link = js['embed_url'] if 'embed_url' in js else ''
+        itemlist.append( item.clone(server=Server, quality=Quality, url=link, action='play'))
     return support.server(item, itemlist=itemlist)