Fix the sky.fm URL handlers

scripts/digitallyimported-radio/diservice.py

@@ -12,6 +12,7 @@ class DigitallyImportedService(DigitallyImportedServiceBase):
   ICON_FILENAME = "icon-small.png"
   SERVICE_NAME = "DigitallyImported"
   SERVICE_DESCRIPTION = "Digitally Imported"
+  URL_SCHEME = "digitallyimported"
 
   # These have to be in the same order as in the settings dialog
   PLAYLISTS = [

scripts/digitallyimported-radio/servicebase.py

@@ -11,15 +11,16 @@ import operator
 import os.path
 
 class DigitallyImportedUrlHandler(clementine.UrlHandler):
-  def __init__(self, service):
+  def __init__(self, url_scheme, service):
     clementine.UrlHandler.__init__(self, service)
+    self.url_scheme = url_scheme
     self.service = service
 
     self.last_original_url = None
     self.task_id = None
 
   def scheme(self):
-    return "digitallyimported"
+    return self.url_scheme
 
   def StartLoading(self, original_url):
     result = clementine.UrlHandler.LoadResult()
@@ -82,6 +83,7 @@ class DigitallyImportedServiceBase(clementine.RadioService):
   SERVICE_NAME = None
   SERVICE_DESCRIPTION = None
   PLAYLISTS = []
+  URL_SCHEME = None
 
   SETTINGS_GROUP = "digitally_imported"
 
@@ -90,7 +92,7 @@ class DigitallyImportedServiceBase(clementine.RadioService):
   def __init__(self, model):
     clementine.RadioService.__init__(self, self.SERVICE_NAME, model)
 
-    self.url_handler = DigitallyImportedUrlHandler(self)
+    self.url_handler = DigitallyImportedUrlHandler(self.URL_SCHEME, self)
     clementine.player.RegisterUrlHandler(self.url_handler)
 
     self.network = clementine.NetworkAccessManager(self)
@@ -190,7 +192,7 @@ class DigitallyImportedServiceBase(clementine.RadioService):
       song = clementine.Song()
       song.set_title(stream["name"])
       song.set_artist(self.SERVICE_DESCRIPTION)
-      song.set_url(QUrl("digitallyimported://%s" % stream["key"]))
+      song.set_url(QUrl("%s://%s" % (self.URL_SCHEME, stream["key"])))
 
       item = QStandardItem(QIcon(":last.fm/icon_radio.png"), stream["name"])
       item.setData(stream["description"], PyQt4.QtCore.Qt.ToolTipRole)

scripts/digitallyimported-radio/skyservice.py

@@ -14,6 +14,7 @@ class SkyFmService(DigitallyImportedServiceBase):
   ICON_FILENAME = "icon-sky.png"
   SERVICE_NAME = "SKY.fm"
   SERVICE_DESCRIPTION = "SKY.fm"
+  URL_SCHEME = "skyfm"
 
   HASHKEY_RE = re.compile(r'hashKey\s*=\s*\'([0-9a-f]+)\'')