From bf70737555a951b995a696009f43a7d1ad68636d Mon Sep 17 00:00:00 2001
From: Alhaziel01 <alhaziel01@gmail.com>
Date: Mon, 22 Mar 2021 10:32:10 +0100
Subject: [PATCH] Fix Animeworl e Casacinema

---
 channels/animeworld.py | 2 +-
 channels/casacinema.py | 4 ++--
 core/servertools.py    | 2 +-
 servers/vupplayer.json | 2 +-
 servers/vupplayer.py   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/channels/animeworld.py b/channels/animeworld.py
index eeb1466a..5d3895a4 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -211,5 +211,5 @@ def findvideos(item):
                 json = jsontools.load(dataJson)
                 title = support.match(json['grabber'], patron=r'server\d+.([^.]+)', string=True).match
                 if title: itemlist.append(item.clone(action="play", title=title, url=json['grabber'].split('=')[-1], server='directo'))
-                else: itemlist.append(item.clone(action="play", title=name, url=json['grabber'], server=name))
+                else: urls.append(json['grabber'])
     return support.server(item, urls, itemlist)
diff --git a/channels/casacinema.py b/channels/casacinema.py
index 8d432968..a43c5a86 100644
--- a/channels/casacinema.py
+++ b/channels/casacinema.py
@@ -133,14 +133,14 @@ def episodios(item):
     action = 'findvideos'
     item.contentType = 'tvshow'
     blacklist = ['']
-    patron = r'(?P<episode>\d+(?:&#215;|×)?\d+\-\d+|\d+(?:&#215;|×)\d+)[;]?(?:(?P<title>[^<]+)<(?P<url>.*?)|(\2[ ])(?:<(\3.*?)))(?:<br />|</p>)'
+    patron = r'(?P<episode>\d+(?:&#215;|×)?\d+\-\d+|\d+(?:&#215;|×)\d+)[;]?(?:(?P<title>[^<]+)<(?P<data>.*?)|(\2[ ])(?:<(\3.*?)))(?:<br />|</p>)'
     patronBlock = r'<strong>(?P<block>(?:.+?Stagione*.+?(?P<lang>[Ii][Tt][Aa]|[Ss][Uu][Bb][\-]?[iI][tT][aA]))?(?:.+?|</strong>)(/?:</span>)?</p>.*?</p>)'
     return locals()
 
 
 def findvideos(item):
     if item.contentType != 'movie':
-        links = support.match(item.url, patron=r'href="([^"]+)"').matches
+        links = support.match(item.data, patron=r'href="([^"]+)"').matches
     else:
         matchData = item.data if item.data else item
         links = support.match(matchData, patron=r'(?:SRC|href)="([^"]+)"', patronBlock=r'<div class="col-md-10">(.+?)<div class="ads">').matches
diff --git a/core/servertools.py b/core/servertools.py
index 3674654c..e461c358 100644
--- a/core/servertools.py
+++ b/core/servertools.py
@@ -68,7 +68,7 @@ def find_video_items(item=None, data=None):
 
     # Find the links to the videos
     for label, url, server, thumbnail in findvideos(data):
-        title = config.get_localized_string(70206) % label
+        title = label
         itemlist.append(
             item.clone(title=title, action="play", url=url, thumbnail=thumbnail, server=server, folder=False))
 
diff --git a/servers/vupplayer.json b/servers/vupplayer.json
index 6df012d8..f4c13606 100644
--- a/servers/vupplayer.json
+++ b/servers/vupplayer.json
@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "vup.to/((?:embed-)?[a-z0-9]+)",
+        "pattern": "(?:vupload.com|vup.to)/((?:embed-)?[a-z0-9]+)",
         "url": "https://vup.to/\\1.html"
       }
     ]
diff --git a/servers/vupplayer.py b/servers/vupplayer.py
index 6df91c7f..53832f78 100644
--- a/servers/vupplayer.py
+++ b/servers/vupplayer.py
@@ -10,7 +10,7 @@ def test_video_exists(page_url):
     global data
     data = page.data
     if page.code == 404 or 'File is no longer available' in data:
-        return False, config.get_localized_string(70449) % "VUP"
+        return False, config.get_localized_string(70449) % "VUP Player"
     return True, ""