Avoid errors when the stream id or url cannot be determined

Author: enen92

resources/language/resource.language.en_gb/strings.po

@@ -155,3 +155,11 @@ msgstr ""
 msgctxt "#30607"
 msgid "Prefer HTTP streams over HTTS"
 msgstr ""
+
+msgctxt "#30608"
+msgid "Unable to get radio stream url"
+msgstr ""
+
+msgctxt "#30609"
+msgid "Sucessfully added to my stations!"
+msgstr ""

resources/language/resource.language.pt_pt/strings.po

@@ -147,12 +147,20 @@ msgstr ""
 
 msgctxt "#30605"
 msgid "Page (%s/%s) | Next >>"
-msgstr ""
+msgstr "Página (%s/%s) | Próxima >>"
 
 msgctxt "#30606"
 msgid "By country"
-msgstr ""
+msgstr "Por país"
 
 msgctxt "#30607"
 msgid "Prefer HTTP streams over HTTS"
-msgstr ""
+msgstr "Preferir streams HTTP ao inves de HTTPS"
+
+msgctxt "#30608"
+msgid "Unable to get radio stream url"
+msgstr "Incapaz de determinar o endereço da stream de rádio"
+
+msgctxt "#30609"
+msgid "Sucessfully added to my stations!"
+msgstr "Adicionado com sucesso à lista de estações!"

resources/lib/api.py

@@ -117,6 +117,7 @@ def get_station_by_station_id(self, station_id, resolve_playlists=True, force_ht
 
         if not station.get('streamUrl'):
             self.log('Unable to detect a playable stream for station')
+            
             return None
 
         if resolve_playlists and self.__check_paylist(station['streamUrl']):

resources/lib/plugin.py

@@ -33,7 +33,9 @@
     'most_popular': 30603,
     'az': 30604,
     'next_page': 30605,
-    'by_country': 30606
+    'by_country': 30606,
+    'error_stream': 30608,
+    'station_add_success': 30609
 }
 
 SORT_TYPES = {
@@ -205,8 +207,12 @@ def custom_my_station(station_id):
 @plugin.route('/stations/my/add/<station_id>')
 def add_to_my_stations(station_id):
     station = radio_api.get_station_by_station_id(station_id)
-    my_stations[station_id] = station
-    my_stations.sync()
+    if station:
+        my_stations[station_id] = station
+        my_stations.sync()
+        plugin.notify("Radio", _('station_add_success'), image=plugin.icon)
+    else:
+        plugin.notify("Radio", _('error_stream'), image=plugin.icon)
 
 
 @plugin.route('/stations/my/del/<station_id>')
@@ -506,7 +512,8 @@ def sub_menu_entry(option, category, value, page=1):
 
 @plugin.route('/station/<station_id>')
 def get_stream_url(station_id):
-    if my_stations.get(station_id, {}).get('is_custom', False):
+    station = my_stations.get(station_id, {})
+    if station and station.get('is_custom', False):
         station = my_stations[station_id]
         stream_url = radio_api.internal_resolver(station)
         current_track = ''
@@ -518,6 +525,8 @@ def get_stream_url(station_id):
         if station:
             stream_url = station['stream_url']
             current_track = station['current_track']
+        else:
+            plugin.notify("Radio", _('error_stream'), image=plugin.icon)
     if station:
         __log('get_stream_url result: %s' % stream_url)
         resolved_listitem = listitem.ListItem(
@@ -536,63 +545,64 @@ def __add_stations(stations, add_custom=False, browse_more=None):
     items = []
     my_station_ids = my_stations.keys()
     for i, station in enumerate(stations):
-        station_id = str(station['id'])
-        if not station_id in my_station_ids:
-            context_menu = [(
-                _('add_to_my_stations'),
-                'RunPlugin(%s)' % plugin.url_for('add_to_my_stations',
-                                                      station_id=station_id),
-            )]
-        else:
-            context_menu = [(
-                _('remove_from_my_stations'),
-                'RunPlugin(%s)' % plugin.url_for('del_from_my_stations',
-                                                      station_id=station_id),
-            )]
-        if station.get('is_custom', False):
-            context_menu.append((
-                _('edit_custom_station'),
-                'RunPlugin(%s)' % plugin.url_for('custom_my_station',
-                                                      station_id=station_id),
-            ))
+        if station:
+            station_id = station.get('id')
+            if station_id and not station_id in my_station_ids:
+                context_menu = [(
+                    _('add_to_my_stations'),
+                    'RunPlugin(%s)' % plugin.url_for('add_to_my_stations',
+                                                        station_id=station_id),
+                )]
+            elif station_id and station_id in my_station_ids:
+                context_menu = [(
+                    _('remove_from_my_stations'),
+                    'RunPlugin(%s)' % plugin.url_for('del_from_my_stations',
+                                                        station_id=station_id),
+                )]
+            if station.get('is_custom', False):
+                context_menu.append((
+                    _('edit_custom_station'),
+                    'RunPlugin(%s)' % plugin.url_for('custom_my_station',
+                                                        station_id=station_id),
+                ))
 
-        items.append({
-            'label': station.get('name', ''),
-            'thumbnail': station['thumbnail'],
-            'fanart': __get_plugin_fanart(),
-            'info': {
-                'title': station.get('name', ''),
-                'rating': (10.0 - 0.0)*((float(station.get('rating', 0.0))-30.000)/(1.0-30.000)), # linear interpolation
-                'genre': station.get('genre', ''),
-                'size': int(station.get('bitrate', 0)),
-                'comment': station.get('description', ''),
-                'count': i,
-            },
-            'context_menu': context_menu,
-            'path': plugin.url_for(
-                'get_stream_url',
-                station_id=station_id,
-            ),
-            'is_playable': True,
-            'properties': {
-                'StationName': station.get('name', '') # Matrix++ only
-            },
-            'offscreen': True
-        })
-    if add_custom:
-        items.append({
-            'label': _('add_custom'),
-            'path': plugin.url_for('custom_my_station', station_id='new'),
-        })
+            items.append({
+                'label': station.get('name', ''),
+                'thumbnail': station['thumbnail'],
+                'fanart': __get_plugin_fanart(),
+                'info': {
+                    'title': station.get('name', ''),
+                    'rating': (10.0 - 0.0)*((float(station.get('rating', 0.0))-30.000)/(1.0-30.000)), # linear interpolation
+                    'genre': station.get('genre', ''),
+                    'size': int(station.get('bitrate', 0)),
+                    'comment': station.get('description', ''),
+                    'count': i,
+                },
+                'context_menu': context_menu,
+                'path': plugin.url_for(
+                    'get_stream_url',
+                    station_id=station_id,
+                ),
+                'is_playable': True,
+                'properties': {
+                    'StationName': station.get('name', '') # Matrix++ only
+                },
+                'offscreen': True
+            })
+        if add_custom:
+            items.append({
+                'label': _('add_custom'),
+                'path': plugin.url_for('custom_my_station', station_id='new'),
+            })
 
-    if browse_more:
-        items.append({
-            'label': '[B]%s[/B]' % _('next_page') % (browse_more['page'], browse_more['total_pages']),
-            'path': browse_more['url'],
-            'icon': browse_more['icon'],
-            'fanart': browse_more['fanart'],
-            'offscreen': True
-        })
+        if browse_more:
+            items.append({
+                'label': '[B]%s[/B]' % _('next_page') % (browse_more['page'], browse_more['total_pages']),
+                'path': browse_more['url'],
+                'icon': browse_more['icon'],
+                'fanart': browse_more['fanart'],
+                'offscreen': True
+            })
 
 
     finish_kwargs = {