Merge remote-tracking branch 'origin/master'

channels/vvvvid.py

@@ -206,7 +206,7 @@ def findvideos(item):
             if 'youtube' in url: item.url = url
             item.url = url.replace('manifest.f4m','master.m3u8').replace('http://','https://').replace('/z/','/i/')
             if 'https' not in item.url:
-                url = support.match('https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/playlist.m3u')
+                url = support.match('https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/playlist.m3u').data
                 url = url.split()[-1]
                 itemlist.append(
                     Item(action= 'play',

channelselector.py

@@ -108,7 +108,7 @@ def getchanneltypes(view="thumb_"):
 
 
     itemlist.append(Item(title=config.get_localized_string(70685), channel="community", action="mainlist", view=view,
-                         category=title, channel_type="all", thumbnail=get_thumb("channels_community.png", view),
+                         category=config.get_localized_string(70685), channel_type="all", thumbnail=get_thumb("channels_community.png", view),
                          viewmode="thumbnails"))
     return itemlist
 

core/tmdb.py

@@ -398,13 +398,13 @@ def set_infoLabels_item(item, seekTmdb=True, idioma_busqueda=def_lang, lock=None
                 if temporada:
                     # Actualizar datos
                     __leer_datos(otmdb_global)
-                    item.infoLabels['title'] = temporada['name'] if temporada.has_key('name') else ''
-                    if temporada.has_key('overview') and temporada['overview']:
+                    item.infoLabels['title'] = temporada['name'] if 'name' in temporada else ''
+                    if 'overview' in  temporada and temporada['overview']:
                         item.infoLabels['plot'] = temporada['overview']
-                    if temporada.has_key('air_date') and temporada['air_date']:
+                    if 'air_date' in temporada and temporada['air_date']:
                         date = temporada['air_date'].split('-')
                         item.infoLabels['aired'] = date[2] + "/" + date[1] + "/" + date[0]
-                    if temporada.has_key('poster_path') and temporada['poster_path']:
+                    if 'poster_path' in temporada and temporada['poster_path']:
                         item.infoLabels['poster_path'] = 'http://image.tmdb.org/t/p/original' + temporada['poster_path']
                         item.thumbnail = item.infoLabels['poster_path']
 
@@ -507,7 +507,7 @@ def find_and_set_infoLabels(item):
         title = title.replace(year, "").strip()
         item.infoLabels['year'] = year[1:-1]
 
-    if not item.infoLabels.get("tmdb_id"):
+    if not item.infoLabels.get("tmdb_id") or not item.infoLabels.get("tmdb_id")[0].isdigit():
         if not item.infoLabels.get("imdb_id"):
             otmdb_global = Tmdb(texto_buscado=title, tipo=tipo_busqueda, year=item.infoLabels['year'])
         else:

core/videolibrarytools.py

@@ -235,7 +235,7 @@ def save_movie(item):
     return 0, 0, -1
 
 def filter_list(episodelist, action=None, path=None):
-    if path: path = path.decode('utf8')
+    # if path: path = path.decode('utf8')
     # import xbmc
     # if xbmc.getCondVisibility('system.platform.windows') > 0: path = path.replace('smb:','').replace('/','\\')
     channel_prefs = {}

lib/generictools.py

@@ -164,7 +164,8 @@ def update_title(item):
                 item.channel = new_item.channel     #Restuaramos el nombre del canal, por si lo habíamos cambiado
             if item.tmdb_stat == True:
                 if new_item.contentSerieName:       #Si es serie...
-                    if config.get_setting("filter_languages", item.channel) >= 0:
+                    filter_languages =  config.get_setting("filter_languages", item.channel)
+                    if filter_languages and filter_languages >= 0:
                         item.title_from_channel = new_item.contentSerieName         #Guardo el título incial para Filtertools
                         item.contentSerieName = new_item.contentSerieName           #Guardo el título incial para Filtertools
                     else:

platformcode/config.py

@@ -374,7 +374,7 @@ def get_localized_category(categ):
     categories = {'movie': get_localized_string(30122), 'tvshow': get_localized_string(30123),
                   'anime': get_localized_string(30124), 'documentary': get_localized_string(30125),
                   'vos': get_localized_string(30136), 'sub-ita': get_localized_string(70566), 'adult': get_localized_string(30126),
-                  'direct': get_localized_string(30137), 'torrent': get_localized_string(70015)}
+                  'direct': get_localized_string(30137), 'torrent': get_localized_string(70015), 'live': get_localized_string(30138)}
     return categories[categ] if categ in categories else categ
 
 

resources/language/English/strings.po

@@ -245,6 +245,10 @@ msgctxt "#30137"
 msgid "Direct"
 msgstr ""
 
+msgctxt "#30138"
+msgid "Live"
+msgstr ""
+
 msgctxt "#30151"
 msgid "Watch the video"
 msgstr ""

resources/language/Italian/strings.po

@@ -245,6 +245,10 @@ msgctxt "#30137"
 msgid "Direct"
 msgstr "Diretto"
 
+msgctxt "#30138"
+msgid "Live"
+msgstr "Live"
+
 msgctxt "#30151"
 msgid "Watch the video"
 msgstr "Guarda il video"