From 4f6d2611e33f3c0a444a611f6bca095aa617bdba Mon Sep 17 00:00:00 2001
From: Alhaziel <alhaziel01@gmail.com>
Date: Thu, 12 Dec 2019 20:23:15 +0100
Subject: [PATCH] Fix Per Community Channels e link Diretti

---
 core/servertools.py   |  2 +-
 servers/directo.json  |  2 +-
 specials/community.py | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/servertools.py b/core/servertools.py
index 7b9095b1..17cb0dce 100644
--- a/core/servertools.py
+++ b/core/servertools.py
@@ -109,7 +109,7 @@ def get_servers_itemlist(itemlist, fnc=None, sort=False):
     for item in itemlist:
         # Asignamos "directo" en caso de que el server no se encuentre en pelisalcarta
         if not item.server and item.url:
-            item.server = config.get_localized_string(30137)
+            item.server = 'directo'
 
         if fnc:
             item.title = fnc(item)
diff --git a/servers/directo.json b/servers/directo.json
index 9aa55580..8e43c420 100644
--- a/servers/directo.json
+++ b/servers/directo.json
@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "((?:http://|https://).*?m3u8)",
+        "pattern": "((?:http://|https://).*?m3u8[^\"'\n]+)",
         "url": "\\1"
 
       },
diff --git a/specials/community.py b/specials/community.py
index 9dd6b1c8..48d66525 100644
--- a/specials/community.py
+++ b/specials/community.py
@@ -98,7 +98,6 @@ def show_menu(item):
     global list_data
     itemlist = []
     support.log()
-
     # If Second Level Menu
     if item.menu:
         menu = item.menu
@@ -333,7 +332,7 @@ def list_all(item):
             if inspect.stack()[1][3] != 'get_newest':
                 itemlist.append(
                     Item(channel=item.channel,
-                         action = item.action,
+                         action = 'list_all',
                          contentType=contentType,
                          title=typo(config.get_localized_string(30992), 'color kod bold'),
                          fulltitle= item.fulltitle,
@@ -342,6 +341,7 @@ def list_all(item):
                          args=item.args,
                          page=pag + 1,
                          path=item.path,
+                         media_type=item.media_type,
                          thumbnail=support.thumb()))
 
         if not 'generic_list' in json_data:
@@ -419,7 +419,7 @@ def list_filtered(item):
             if inspect.stack()[1][3] != 'get_newest':
                 itemlist.append(
                     Item(channel=item.channel,
-                         action = item.action,
+                         action = 'list_filtered',
                          contentType=contentType,
                          title=typo(config.get_localized_string(30992), 'color kod bold'),
                          fulltitle= item.fulltitle,
@@ -428,6 +428,7 @@ def list_filtered(item):
                          args=item.args,
                          page=pag + 1,
                          path=item.path,
+                         media_type=item.media_type,
                          thumbnail=support.thumb()))
 
         if not 'generic_list' in json_data:
@@ -580,7 +581,7 @@ def episodios(item):
         if inspect.stack()[1][3] != 'get_newest':
             itemlist.append(
                 Item(channel=item.channel,
-                     action = item.action,
+                     action = 'episodios',
                      contentType='episode',
                      title=typo(config.get_localized_string(30992), 'color kod bold'),
                      fulltitle= item.fulltitle,
@@ -588,6 +589,7 @@ def episodios(item):
                      url=item.url,
                      args=item.args,
                      page=pag + 1,
+                     media_type=item.media_type,
                      thumbnail=support.thumb(),
                      path=item.path))
 
@@ -737,10 +739,11 @@ def search(item, text):
 
 
 def load_links(item, itemlist, json_data, text):
-    support.log()
+    support.log(json_data)
 
     def links(item, itemlist, json_data, text):
         support.log()
+        # support.dbg()
         if "movies_list" in json_data: media_type= 'movies_list'
         elif "tvshows_list" in json_data: media_type = 'tvshows_list'
         elif "episodes_list" in json_data: media_type = 'episodes_list'