From 90f03a62f8e8c1bfaf100523c729bb0ca06503e1 Mon Sep 17 00:00:00 2001
From: Dexter Morgan <9434916+32Dexter@users.noreply.github.com>
Date: Mon, 3 Jun 2019 23:07:57 +0200
Subject: [PATCH] Add files via upload

---
 specials/community.py | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/specials/community.py b/specials/community.py
index b038beab..4a1e88e4 100644
--- a/specials/community.py
+++ b/specials/community.py
@@ -45,7 +45,6 @@ def show_channels(item):
                  "action": "remove_channel",
                  "channel": "community"}]
 
-
     path = os.path.join(config.get_data_path(), 'community_channels.json')
     file = open(path, "r")
     json = jsontools.load(file.read())
@@ -53,19 +52,22 @@ def show_channels(item):
     itemlist.append(Item(channel=item.channel, title=config.get_localized_string(70676), action='add_channel', thumbnail=get_thumb('add.png')))
 
     for key, channel in json['channels'].items():
-        if 'thumbnail' in channel:
-            thumbnail = channel['thumbnail']
-        else:
-            thumbnail = ''
 
-        if 'fanart' in channel:
-            fanart = channel['fanart']
-        else:
-            fanart = ''
+        file_path = channel ['path']
+        file_url = httptools.downloadpage(file_path, follow_redirects=True).data
+        json_url = jsontools.load(file_url)
+        thumbnail = json_url['thumbnail'] if 'thumbnail' in json_url else ''
+        fanart = json_url['fanart'] if 'fanart' in json_url else ''
 
-        itemlist.append(Item(channel=item.channel, title=channel['channel_name'], url=channel['path'],
-                             thumbnail=thumbnail, fanart=fanart, action='show_menu', channel_id = key, context=context))
-    return itemlist
+        itemlist.append(Item(channel=item.channel,
+                             title=channel['channel_name'],
+                             url=file_path,
+                             thumbnail=thumbnail,
+                             fanart=fanart,
+                             action='show_menu',
+                             channel_id = key,
+                             context=context))
+        return itemlist
 
 def load_json(item):
     logger.info()
@@ -127,6 +129,8 @@ def list_all(item):
         new_item = Item(channel=item.channel, title=title, quality=quality,
                         language=language, plot=plot, thumbnail=poster)
 
+        new_item.infoLabels['year'] = media['year'] if 'year' in media else ''
+        new_item.infoLabels['tmdb_id'] = media['tmdb_id'] if 'tmdb_id' in media else ''
 
         if 'movies_list' in json_data:
             new_item.url = media
@@ -134,10 +138,16 @@ def list_all(item):
             new_item.action = 'findvideos'
             if 'year' in media:
                 new_item.infoLabels['year'] = media['year']
+            if 'tmdb_id' in media:
+                new_item.infoLabels['tmdb_id'] = media['tmdb_id']
         else:
             new_item.url = media['seasons_list']
             new_item.contentSerieName = media['title']
             new_item.action = 'seasons'
+            if 'year' in media:
+                new_item.infoLabels['year'] = media['year']
+            if 'tmdb_id' in media:
+                new_item.infoLabels['tmdb_id'] = media['tmdb_id']
 
         itemlist.append(new_item)