Prefer HTTP streams setting + py2.6 fixes

Author: enen92

resources/language/English/strings.po

@@ -139,3 +139,7 @@ msgstr ""
 msgctxt "#30606"
 msgid "By country"
 msgstr ""
+
+msgctxt "#30607"
+msgid "Prefer HTTP streams over HTTS"
+msgstr ""

resources/lib/api.py

@@ -21,7 +21,8 @@
 import random
 import xbmc
 
-PY3 = sys.version_info.major >= 3
+# avoid using named attributes since they were introduced with python 2.7 only
+PY3 = sys.version_info[0] >= 3
 
 if PY3:
     from urllib.parse import urlencode
@@ -109,16 +110,27 @@ def get_stations_by_genre(self, genre, sorttype, sizeperpage, pageindex):
             raise ValueError('Bad category_type')
         return response.get('numberPages'), self.__format_stations_v2(response.get('categories')[0].get('matches'))
 
-    def get_station_by_station_id(self, station_id, resolve_playlists=True):
+    def get_station_by_station_id(self, station_id, resolve_playlists=True, force_http=False):
         self.log('get_station_by_station_id started with station_id=%s'
                  % station_id)
         path = 'v2/search/station'
         param = {'station': str(station_id)}
         station = self.__api_call(path, param)
 
         streams = station.get('streamUrls')
+
         if streams:
-            station['streamUrl'] = station.get('streamUrls')[0]['streamUrl']
+            station['streamUrl'] = streams[0].get('streamUrl')
+
+            if force_http:
+                for stream in streams:
+                    if "http://" in stream.get('streamUrl'):
+                        station['streamUrl'] = stream['streamUrl']
+                        break
+
+        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']):
             playlist_url = station['streamUrl']

resources/lib/plugin.py

@@ -439,20 +439,25 @@ def get_stream_url(station_id):
         stream_url = station['stream_url']
         current_track = ''
     else:
-        station = radio_api.get_station_by_station_id(station_id)
-        stream_url = station['stream_url']
-        current_track = station['current_track']
-    __log('get_stream_url result: %s' % stream_url)
-    return plugin.set_resolved_url(
-        listitem.ListItem(
-            label=station['name'],
-            label2=current_track,
-            path=stream_url,
-            icon=station['thumbnail'],
-            thumbnail=station['thumbnail'],
-            fanart=__get_plugin_fanart(),
+        station = radio_api.get_station_by_station_id(
+            station_id,
+            force_http=plugin.get_setting('prefer-http', bool)
+        )
+        if station:
+            stream_url = station['stream_url']
+            current_track = station['current_track']
+    if station:
+        __log('get_stream_url result: %s' % stream_url)
+        return plugin.set_resolved_url(
+            listitem.ListItem(
+                label=station['name'],
+                label2=current_track,
+                path=stream_url,
+                icon=station['thumbnail'],
+                thumbnail=station['thumbnail'],
+                fanart=__get_plugin_fanart(),
+            )
         )
-    )
 
 
 def __add_stations(stations, add_custom=False, browse_more=None):

resources/settings.xml

@@ -3,5 +3,6 @@
 	<category label="30601">
 		<setting id="language" type="enum" label="30300" lvalues="30301|30302|30303|30304" default="0" />
 		<setting id="hide-fanart" type="bool" label="30602" default="false"/>
+		<setting id="prefer-http" type="bool" label="30607" default="true"/>
 	</category>
 </settings>