diff --git a/channels/paramount.json b/channels/paramount.json
index 6a59a33a..cbc87415 100644
--- a/channels/paramount.json
+++ b/channels/paramount.json
@@ -1,7 +1,7 @@
{
"id": "paramount",
"name": "Paramount Network",
- "active": true,
+ "active": false,
"language": ["ita"],
"thumbnail": "paramount.png",
"banner": "paramount.png",
diff --git a/platformcode/infoplus.py b/platformcode/infoplus.py
index b5a0cc6a..ee38c076 100644
--- a/platformcode/infoplus.py
+++ b/platformcode/infoplus.py
@@ -84,8 +84,9 @@ class MainWindow(xbmcgui.WindowXMLDialog):
self.getControl(CAST).addItems(self.cast)
else:
self.getControl(CAST).setVisible(False)
- if Info.getProperty('rating'):
- self.getControl(RATING).setText(str(Info.getProperty('rating')))
+ if Info.getProperty('rating'): rating = str(Info.getProperty('rating'))
+ else: rating = 'N/A'
+ self.getControl(RATING).setText(rating)
getFocus(self)
def onClick(self, control_id):
@@ -102,9 +103,9 @@ class MainWindow(xbmcgui.WindowXMLDialog):
info = self.getControl(RECOMANDED).getSelectedItem()
self.close()
Trailer(info)
- elif control_id in [ACTORS]:
+ elif control_id in [ACTORS, CAST]:
self.close()
- Main(self.getControl(ACTORS).getSelectedItem())
+ Main(self.getControl(self.getFocusId()).getSelectedItem())
elif control_id in [RECOMANDED] and self.getControl(RECOMANDED).getSelectedPosition() > 0:
self.close()
Main(self.getControl(RECOMANDED).getSelectedItem())
diff --git a/resources/skins/Default/720p/InfoPlus.xml b/resources/skins/Default/720p/InfoPlus.xml
index 7d877f55..388018fe 100644
--- a/resources/skins/Default/720p/InfoPlus.xml
+++ b/resources/skins/Default/720p/InfoPlus.xml
@@ -40,12 +40,12 @@
- 310
- 590
- 100
- 100
- Infoplus/loading.png
- Conditional
+ 355
+ 490
+ 300
+ 10
+ white.png
+ Conditional
@@ -309,7 +309,7 @@
25
25
50
- 220
+ 240
Control.HasFocus(30500) | Control.HasFocus(30006) | Control.HasFocus(30007) | Control.HasFocus(30008)
50
@@ -318,7 +318,7 @@
60
- 30
+ 40
50
FFFFFFFF
00000000
@@ -328,7 +328,7 @@
center
- 110
+ 120
50
50
Infoplus/trailer.png
@@ -338,7 +338,7 @@
30008
- 170
+ 180
50
50
Infoplus/search.png
diff --git a/specials/community.py b/specials/community.py
index 8ed31190..53de1afb 100644
--- a/specials/community.py
+++ b/specials/community.py
@@ -53,7 +53,7 @@ def show_channels(item):
for key, channel in json['channels'].items():
path = filetools.dirname(channel['path']) # relative path
- channel_json = load_json(channel['path']) # read channel json
+ channel_json = load_json(channel) # read channel json
# retrieve information from json
thumbnail = relative('thumbnail', channel_json, path)
@@ -63,7 +63,7 @@ def show_channels(item):
itemlist.append(Item(channel=item.channel,
title=support.typo(channel['channel_name'],'bold'),
- url=channel['path'],
+ url=channel['url'],
thumbnail=thumbnail,
fanart=fanart,
plot=plot,
@@ -613,7 +613,7 @@ def load_json(item, no_order=False):
url = item.url
filterkey = item.filterkey
else:
- url = item
+ url = item['url'] if 'url' in item else item
filterkey = ''
try:
if url.startswith('http'):
@@ -639,9 +639,10 @@ def load_and_check(item):
json = jsontools.load(file.read())
for key, channel in json['channels'].items():
- if not 'checked' in channel:
+ if not 'check' in channel:
response = httptools.downloadpage(channel['path'], follow_redirects=True, timeout=5)
if response.success:
+ channel['url'] = channel['path']
channel['path'] = response.url
channel['channel_name'] = re.sub(r'\[[^\]]+\]', '', channel['channel_name'])
channel['check'] = True
diff --git a/specials/tvmoviedb.json b/specials/tvmoviedb.json
index 6798a390..9c9115e1 100644
--- a/specials/tvmoviedb.json
+++ b/specials/tvmoviedb.json
@@ -66,37 +66,6 @@
"@70014"
]
},
- {
- "id": "label1",
- "type": "label",
- "label": "",
- "enabled": false,
- "visible": true
- },
- {
- "id": "filmaff",
- "type": "list",
- "label": "@70428",
- "default": 0,
- "enabled": true,
- "visible": true,
- "lvalues": [
- "auto",
- "@70429",
- "@70430",
- "@70431",
- "@70432",
- "@70433",
- "@70434"
- ]
- },
- {
- "id": "label2",
- "type": "label",
- "label": "",
- "enabled": false,
- "visible": true
- },
{
"id": "usuariomal",
"type": "text",