From 076ac4cec75d7a0b45a8c71b5ee9ba92790facde Mon Sep 17 00:00:00 2001
From: Alhaziel <alhaziel01@gmail.com>
Date: Sat, 21 Sep 2019 19:55:02 +0200
Subject: [PATCH] AnimeWorld Supporto a VVVVID

---
 channels/animeworld.json | 12 ++++++------
 channels/animeworld.py   | 24 ++++++------------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/channels/animeworld.json b/channels/animeworld.json
index dc4702b0..44dc8d9e 100644
--- a/channels/animeworld.json
+++ b/channels/animeworld.json
@@ -1,12 +1,12 @@
 {
-    "id": "animeworld", 
-    "name": "AnimeWorld", 
-    "active": true, 
-    "adult": false, 
-    "language": ["ita", "vos", "vosi"],
+    "id": "animeworld",
+    "name": "AnimeWorld",
+    "active": true,
+    "adult": false,
+    "language": ["ita", "vos"],
     "thumbnail": "animeworld.png",
     "banner": "animeworld.png",
-    "categories": ["anime"],
+    "categories": ["anime", "vos"],
     "settings": [
         {
             "id": "order",
diff --git a/channels/animeworld.py b/channels/animeworld.py
index fcfbfa82..59c36771 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -124,21 +124,12 @@ def peliculas(item):
 @support.scrape
 def episodios(item):
     anime=True
-    patronBlock= r'server  active(?P<block>.*?)server  hidden '
+    patronBlock= r'<div class="server\s*active\s*"(?P<block>.*?)</ul>'
     patron = r'<li><a [^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+" href="(?P<url>[^"]+)"[^>]+>(?P<episode>[^<]+)<'
     def itemHook(item):
         item.title += support.typo(item.fulltitle,'-- bold')
         return item
     action='findvideos'
-    def itemlistHook(itemlist):
-        if len(itemlist) == 0:
-            itemlist.append(
-                support.Item(
-                    channel=item.channel,
-                    title=support.typo('VVVVID NON SUPPORTATO','bold'),
-                    folder=False
-                    ))
-        return itemlist
     return locals()
 
 
@@ -155,17 +146,14 @@ def findvideos(item):
         ID = support.scrapertoolsV2.find_single_match(str(block),r'<a data-id="([^"]+)" data-base="' + (number if number else '1') + '"')
         support.log('ID= ',serverid)
         if id:
-            if serverid == '26': # IF VVVVID
-                itemlist.append(
-                    support.Item(
-                        channel=item.channel,
-                        title=support.typo('VVVVID NON SUPPORTATO','bold'),
-                        folder=False))
-                return itemlist
-
+            if serverid == '26':
+                matches = support.match(item, r'<a href="([^"]+)"', url='%s/ajax/episode/serverPlayer?id=%s' % (host, item.url.split('/')[-1]))[0]
+                for url in matches:
+                        videoData += '\n' + url
             else:
                 dataJson = support.httptools.downloadpage('%s/ajax/episode/info?id=%s&server=%s&ts=%s' % (host, ID, serverid, int(time.time())), headers=[['x-requested-with', 'XMLHttpRequest']]).data
                 json = jsontools.load(dataJson)
+                support.log(json)
                 if 'keepsetsu' in json['grabber']:
                     matches = support.match(item, r'<iframe\s*src="([^"]+)"', url=json['grabber'])[0]
                     for url in matches: