summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/SoundcloudCom.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster/SoundcloudCom.py')
-rw-r--r--module/plugins/hoster/SoundcloudCom.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/module/plugins/hoster/SoundcloudCom.py b/module/plugins/hoster/SoundcloudCom.py
index 258b63d75..854e98d54 100644
--- a/module/plugins/hoster/SoundcloudCom.py
+++ b/module/plugins/hoster/SoundcloudCom.py
@@ -2,14 +2,14 @@
import re
-from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
-from module.plugins.internal.utils import json
+from module.plugins.internal.SimpleHoster import SimpleHoster
+from module.plugins.internal.misc import json
class SoundcloudCom(SimpleHoster):
__name__ = "SoundcloudCom"
__type__ = "hoster"
- __version__ = "0.14"
+ __version__ = "0.15"
__status__ = "testing"
__pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w\-]+/[\w\-]+'
@@ -42,8 +42,9 @@ class SoundcloudCom(SimpleHoster):
client_id = "b45b1aa10f1ac2941910a7f0d10f8e28"
#: Url to retrieve the actual song url
- streams = json.loads(self.load("https://api.soundcloud.com/tracks/%s/streams" % song_id,
- get={'client_id': client_id}))
+ html = self.load("https://api.soundcloud.com/tracks/%s/streams" % song_id,
+ get={'client_id': client_id})
+ streams = json.loads(html)
regex = re.compile(r'[^\d]')
http_streams = sorted([(key, value) for key, value in streams.items() if key.startswith('http_')],
@@ -53,8 +54,5 @@ class SoundcloudCom(SimpleHoster):
self.log_debug("Streams found: %s" % (http_streams or "None"))
if http_streams:
- stream_name, self.link = http_streams[0 if self.get_config('quality') == "Higher" else -1]
+ stream_name, self.link = http_streams[0 if self.config.get('quality') == "Higher" else -1]
pyfile.name += '.' + stream_name.split('_')[1].lower()
-
-
-getInfo = create_getInfo(SoundcloudCom)