Use the playlist resolver also in custom stations

Author: enen92

resources/lib/api.py

@@ -130,6 +130,17 @@ def get_station_by_station_id(self, station_id, resolve_playlists=True, force_ht
         stations = (station, )
         return self.__format_stations_v2(stations)[0]
 
+    def internal_resolver(self, station, ):
+        if station.get('is_custom', False):
+            stream_url = station['stream_url']
+        else:
+            stream_url = station['streamUrl']
+
+        if self.__check_paylist(stream_url):
+            return self.__resolve_playlist(station)
+        else:
+            return station
+
     def get_top_stations(self, sizeperpage, pageindex):
         self.log(('get_top_stations started with '
                   'sizeperpage=%s, pageindex=%s') % (
@@ -250,7 +261,13 @@ def __resolve_playlist(self, station):
         self.log('__resolve_playlist started with station=%s'
                  % station['id'])
         servers = []
-        stream_url = station['streamUrl']
+
+        # Check if it is a custom station
+        if station.get('is_custom', False):
+            stream_url = station['stream_url']
+        else:
+            stream_url = station['streamUrl']
+
         if stream_url.lower().endswith('m3u'):
             response = self.__urlopen(stream_url)
             self.log('__resolve_playlist found .m3u file')

resources/lib/plugin.py

@@ -476,7 +476,7 @@ def sub_menu_entry(option, category, value, page=1):
 def get_stream_url(station_id):
     if my_stations.get(station_id, {}).get('is_custom', False):
         station = my_stations[station_id]
-        stream_url = station['stream_url']
+        stream_url = radio_api.internal_resolver(station)
         current_track = ''
     else:
         station = radio_api.get_station_by_station_id(