Fix Film4k

This commit is contained in:
Alhaziel01
2020-07-29 12:02:56 +02:00
parent 01f85fd766
commit 190d75912c
2 changed files with 17 additions and 16 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
"active": true, "active": true,
"thumbnail": "film4k.png", "thumbnail": "film4k.png",
"banner": "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"], "not_active": ["include_in_newest_peliculas", "include_in_newest_anime", "include_in_newest_series"],
"settings": [] "settings": []
} }
+14 -13
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# ------------------------------------------------------------ # ------------------------------------------------------------
# Canale per netfreex # Canale per Filn4k
# ------------------------------------------------------------ # ------------------------------------------------------------
from core import support from core import support
@@ -8,7 +8,7 @@ from platformcode import logger, config
def findhost(): 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) host = config.get_channel_url(findhost)
@@ -16,16 +16,15 @@ host = config.get_channel_url(findhost)
@support.menu @support.menu
def mainlist(item): def mainlist(item):
film = ['/movies', film = ['movies',
('Qualità', ['', 'menu', 'quality']), ('Qualità', ['', 'menu', 'quality']),
('Generi', ['', 'menu', 'genres']), ('Generi', ['movies', 'menu', 'genres']),
('Anno', ['movies', 'menu', 'releases']),
('Più popolari', ['trending/?get=movies', 'peliculas']), ('Più popolari', ['trending/?get=movies', 'peliculas']),
('Più votati', ['ratings/?get=movies', 'peliculas']) ('Più votati', ['ratings/?get=movies', 'peliculas'])]
]
tvshow = ['/tvshows', tvshow = ['/tvshows',
('Più popolari', ['trending/?get=tv', 'peliculas']), ('Più popolari', ['trending/?get=tv', 'peliculas']),
('Più votati', ['ratings/?get=tv', 'peliculas']) ('Più votati', ['ratings/?get=tv', 'peliculas'])]
]
return locals() return locals()
@@ -41,6 +40,7 @@ def search(item, text):
return [] return []
def peliculas(item): def peliculas(item):
if 'anime' in item.url: if 'anime' in item.url:
return support.dooplay_peliculas(item, True) return support.dooplay_peliculas(item, True)
@@ -49,14 +49,15 @@ def peliculas(item):
def episodios(item): def episodios(item):
return support.dooplay_get_episodes(item) itemlist = support.dooplay_get_episodes(item)
return itemlist
def findvideos(item): def findvideos(item):
itemlist = [] itemlist = []
if item.contentType == 'episode': if item.contentType == 'episode':
linkHead = support.httptools.downloadpage(item.url, only_headers=True).headers['link'] 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']]): for link in support.dooplay_get_links(item, host, paramList=[['tv', epId, 1, 'title', 'server']]):
itemlist.append( itemlist.append(
item.clone(action="play", url=link['url'])) item.clone(action="play", url=link['url']))
@@ -72,10 +73,10 @@ def findvideos(item):
@support.scrape @support.scrape
def menu(item): def menu(item):
action = 'peliculas' action = 'peliculas'
if item.extra == 'genres': if item.args in ['genres','releases']:
data = support.match(item, patron=r'<a href="#">Genere<(.*?)</ul').match patronBlock = r'<nav class="' + item.args + r'">(?P<block>.*?)</nav'
patronMenu= r'<a href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)<' patronMenu= r'<a href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)<'
else: else:
patronBlock = r'class="main-header">(?P<block>.*?)headitems' 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() return locals()