(.*?)(\d+)((?:x\d+| ))(.*?)<\/b>(.*?)"
+# matches = scrapertoolsV2.find_multiple_matches(blocco, patron)
+
+# for t1, s, e, t2, scrapedurl in matches:
+
+# if "x" not in e:
+# e = s
+
+# if e == s:
+# s = None
+
+# if s is None:
+# s = "1"
+
+# if s.startswith('0'):
+# s = s.replace("0", "")
+
+# if e.startswith('x'):
+# e = e.replace("x", "")
+
+# scrapedtitle = t1 + s + "x" + e + " " + t2
+# itemlist.append(
+# Item(channel=item.channel,
+# contentType="episode",
+# action="findvideos",
+# items=s,
+# iteme=e,
+# fulltitle=scrapedtitle,
+# show=scrapedtitle,
+# title="[COLOR azure]" + scrapedtitle + "[/COLOR]",
+# url=scrapedurl,
+# thumbnail=item.scrapedthumbnail,
+# plot=item.scrapedplot,
+# folder=True))
+
+# if config.get_videolibrary_support() and len(itemlist) != 0:
+# itemlist.append(
+# Item(channel=item.channel,
+# title="[COLOR lightblue]%s[/COLOR]" % config.get_localized_string(30161),
+# url=item.url,
+# action="add_serie_to_library",
+# extra="episodios",
+# show=item.show))
+
+# return itemlist
+
+
+# def findvideos(item):
+# logger.info(" findvideos")
+
+# if item.contentType != "episode":
+# return findvideos_movie(item)
+
+# itemlist = servertools.find_video_items(data=item.url)
+# logger.info(itemlist)
+
+# for videoitem in itemlist:
+# videoitem.title = "".join([item.title, '[COLOR green][B]' + videoitem.title + '[/B][/COLOR]'])
+# videoitem.fulltitle = item.fulltitle
+# videoitem.thumbnail = item.thumbnail
+# videoitem.show = item.show
+# videoitem.plot = item.plot
+# videoitem.channel = item.channel
+# videoitem.contentType = item.contentType
+# videoitem.language = IDIOMAS['Italiano']
+
+# # Requerido para Filtrar enlaces
+
+# if checklinks:
+# itemlist = servertools.check_list_links(itemlist, checklinks_number)
+
+# # Requerido para FilterTools
+
+# # itemlist = filtertools.get_links(itemlist, item, list_language)
+
+# # Requerido para AutoPlay
+
+# autoplay.start(itemlist, item)
+
+# if item.contentType != 'episode':
+# if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+# itemlist.append(
+# Item(channel=item.channel, title='[COLOR yellow][B]Aggiungi alla videoteca[/B][/COLOR]', url=item.url,
+# action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle))
+
+# return itemlist
+
+
+# def findvideos_movie(item):
+# logger.info(" findvideos_movie")
+
+# # Carica la pagina
+
+# data = httptools.downloadpage(item.url).data
+
+# patron = r"]*?>[^<]*? [^<]+?"
+# matches = re.compile(patron, re.DOTALL).findall(data)
+# for scrapedurl in matches:
+# url, c = unshorten(scrapedurl)
+# data += url + '\n'
+
+# itemlist = servertools.find_video_items(data=data)
+
+# for videoitem in itemlist:
+# videoitem.title = "".join([item.title, '[COLOR green][B]' + videoitem.title + '[/B][/COLOR]'])
+# videoitem.fulltitle = item.fulltitle
+# videoitem.thumbnail = item.thumbnail
+# videoitem.show = item.show
+# videoitem.plot = item.plot
+# videoitem.channel = item.channel
+# videoitem.contentType = item.contentType
+
+# return itemlist
diff --git a/core/support.py b/core/support.py
index 0ee669f9..e5427fee 100644
--- a/core/support.py
+++ b/core/support.py
@@ -910,7 +910,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
videoitem.server = findS[2]
videoitem.title = findS[0]
item.title = item.contentTitle if config.get_localized_string(30161) in item.title else item.title
- videoitem.title = item.fulltitle + (typo(videoitem.title, '_ color kod []') if videoitem.title else "") + (typo(videoitem.quality, '_ color kod []') if videoitem.quality else "")
+ videoitem.title = item.title + (typo(videoitem.title, '_ color kod []') if videoitem.title else "") + (typo(videoitem.quality, '_ color kod []') if videoitem.quality else "")
videoitem.fulltitle = item.fulltitle
videoitem.show = item.show
videoitem.thumbnail = item.thumbnail
diff --git a/servers/vvvvid.py b/servers/vvvvid.py
index e66412a3..36e7d305 100644
--- a/servers/vvvvid.py
+++ b/servers/vvvvid.py
@@ -22,6 +22,11 @@ def test_video_exists(page_url):
data = httptools.downloadpage(page_url).data
if "Not Found" in data or "File was deleted" in data:
return False, "[VVVVID] The file does not exist or has been deleted"
+ else:
+ page_url = page_url.replace("/show/","/#!show/")
+ show_id = re.findall("#!show/([0-9]+)/", page_url)[0]
+ name = re.findall(show_id + "/(.+?)/", page_url)
+ if not name: return False, "[VVVVID] The file does not exist or has been deleted"
return True, ""
diff --git a/specials/news.py b/specials/news.py
index 0099ef87..10f7b68f 100644
--- a/specials/news.py
+++ b/specials/news.py
@@ -434,7 +434,7 @@ def get_title(item):
if item.quality:
title += support.typo(item.quality, '_ [] color kod')
- season_ = support.typo(config.get_localized_string(70736), '_ [] color white bold') if (type(item.args) != bool and 'season_completed' in item.news) else ''
+ season_ = support.typo(config.get_localized_string(70736), '_ [] color white bold') if (type(item.args) != bool and 'season_completed' in item.news and not item.episode) else ''
if season_:
title += season_
return title
|