Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/accounts/Keep2ShareCc.py
	module/plugins/captcha/OCR.py
	module/plugins/captcha/captcha.py
	module/plugins/crypter/DailymotionBatch.py
	module/plugins/crypter/DailymotionComFolder.py
	module/plugins/crypter/YoutubeBatch.py
	module/plugins/crypter/YoutubeComFolder.py
	module/plugins/internal/CaptchaService.py
	pyload/plugin/Extractor.py
	pyload/plugin/OCR.py
	pyload/plugin/account/DebridItaliaCom.py
	pyload/plugin/account/MegaRapidCz.py
	pyload/plugin/account/NoPremiumPl.py
	pyload/plugin/account/RapideoPl.py
	pyload/plugin/addon/AndroidPhoneNotify.py
	pyload/plugin/addon/Checksum.py
	pyload/plugin/addon/ClickAndLoad.py
	pyload/plugin/addon/DeleteFinished.py
	pyload/plugin/addon/DownloadScheduler.py
	pyload/plugin/addon/ExternalScripts.py
	pyload/plugin/addon/ExtractArchive.py
	pyload/plugin/addon/HotFolder.py
	pyload/plugin/addon/IRCInterface.py
	pyload/plugin/addon/JustPremium.py
	pyload/plugin/addon/MergeFiles.py
	pyload/plugin/addon/MultiHome.py
	pyload/plugin/addon/RestartFailed.py
	pyload/plugin/addon/RestartSlow.py
	pyload/plugin/addon/SkipRev.py
	pyload/plugin/addon/UnSkipOnFail.py
	pyload/plugin/addon/UpdateManager.py
	pyload/plugin/addon/WindowsPhoneNotify.py
	pyload/plugin/crypter/DDLMusicOrg.py
	pyload/plugin/crypter/DailymotionBatch.py
	pyload/plugin/crypter/DevhostSt.py
	pyload/plugin/crypter/EmbeduploadCom.py
	pyload/plugin/crypter/MultiloadCz.py
	pyload/plugin/crypter/YoutubeBatch.py
	pyload/plugin/extractor/SevenZip.py
	pyload/plugin/extractor/UnRar.py
	pyload/plugin/extractor/UnZip.py
	pyload/plugin/hook/BypassCaptcha.py
	pyload/plugin/hook/Captcha9Kw.py
	pyload/plugin/hook/CaptchaBrotherhood.py
	pyload/plugin/hook/DeathByCaptcha.py
	pyload/plugin/hook/ExpertDecoders.py
	pyload/plugin/hook/ImageTyperz.py
	pyload/plugin/hook/XFileSharingPro.py
	pyload/plugin/hoster/AlldebridCom.py
	pyload/plugin/hoster/CzshareCom.py
	pyload/plugin/hoster/EuroshareEu.py
	pyload/plugin/hoster/FastixRu.py
	pyload/plugin/hoster/FastshareCz.py
	pyload/plugin/hoster/GooIm.py
	pyload/plugin/hoster/MediafireCom.py
	pyload/plugin/hoster/MegaDebridEu.py
	pyload/plugin/hoster/NitroflareCom.py
	pyload/plugin/hoster/OverLoadMe.py
	pyload/plugin/hoster/PremiumTo.py
	pyload/plugin/hoster/PremiumizeMe.py
	pyload/plugin/hoster/RapidgatorNet.py
	pyload/plugin/hoster/RealdebridCom.py
	pyload/plugin/hoster/SimplyPremiumCom.py
	pyload/plugin/hoster/SimplydebridCom.py
	pyload/plugin/hoster/SmoozedCom.py
	pyload/plugin/hoster/SoundcloudCom.py
	pyload/plugin/hoster/UlozTo.py
	pyload/plugin/hoster/UploadableCh.py
	pyload/plugin/hoster/UploadedTo.py
	pyload/plugin/hoster/UploadheroCom.py
	pyload/plugin/hoster/VeehdCom.py
	pyload/plugin/hoster/VimeoCom.py
	pyload/plugin/hoster/ZeveraCom.py
	pyload/plugin/hoster/ZippyshareCom.py
	pyload/plugin/internal/BasePlugin.py
	pyload/plugin/internal/MultiHoster.py
	pyload/plugin/internal/SimpleDereferer.py
	pyload/plugin/internal/SimpleHoster.py
	pyload/plugin/internal/XFSHoster.py
	pyload/plugin/ocr/GigasizeCom.py
	pyload/plugin/ocr/LinksaveIn.py
	pyload/plugin/ocr/NetloadIn.py
	pyload/plugin/ocr/ShareonlineBiz.py

1 files changed, 44 insertions, 45 deletions

diff --git a/pyload/plugin/hoster/SoundcloudCom.py b/pyload/plugin/hoster/SoundcloudCom.py
index fd5d1ea6c..31aa7ba3c 100644
--- a/pyload/plugin/hoster/SoundcloudCom.py
+++ b/pyload/plugin/hoster/SoundcloudCom.py
@@ -1,57 +1,56 @@
 # -*- coding: utf-8 -*-
 
-import pycurl
 import re
 
-from pyload.plugin.Hoster import Hoster
+from module.plugin.internal.SimpleHoster import SimpleHoster
+from module.common.json_layer import json_loads
 
 
-class SoundcloudCom(Hoster):
+class SoundcloudCom(SimpleHoster):
     __name__    = "SoundcloudCom"
     __type__    = "hoster"
-    __version__ = "0.10"
+    __version__ = "0.11"
 
-    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/(?P<UID>.+?)/(?P<SID>.+)'
+    __pattern__ = r'https?://(?:www\.)?soundcloud\.com/[\w-]+/[\w-]+'
+    __config__  = [("use_premium", "bool"        , "Use premium account if available", True    ),
+                   ("quality"    , "Lower;Higher", "Quality"                         , "Higher")]
 
     __description__ = """SoundCloud.com hoster plugin"""
     __license__     = "GPLv3"
-    __authors__     = [("Peekayy", "peekayy.dev@gmail.com")]
-
-
-    def process(self, pyfile):
-        # default UserAgent of HTTPRequest fails for this hoster so we use this one
-        self.req.http.c.setopt(pycurl.USERAGENT, 'Mozilla/5.0')
-        self.html = self.load(pyfile.url)
-        m = re.search(r'<div class="haudio.*?large.*?" data-sc-track="(?P<ID>\d*)"', self.html)
-        songId = clientId = ""
-        if m:
-            songId = m.group('ID')
-        if len(songId) <= 0:
-            self.logError(_("Could not find song id"))
-            self.offline()
-        else:
-            m = re.search(r'"clientID":"(?P<CID>.*?)"', self.html)
-            if m:
-                clientId = m.group('CID')
-
-            if len(clientId) <= 0:
-                clientId = "b45b1aa10f1ac2941910a7f0d10f8e28"
-
-            m = re.search(r'<em itemprop="name">\s(?P<TITLE>.*?)\s</em>', self.html)
-            if m:
-                pyfile.name = m.group('TITLE') + ".mp3"
-            else:
-                pyfile.name = re.match(self.__pattern__, pyfile.url).group('SID') + ".mp3"
-
-            # url to retrieve the actual song url
-            self.html = self.load("https://api.sndcdn.com/i1/tracks/%s/streams" % songId, get={"client_id": clientId})
-            # getting streams
-            # for now we choose the first stream found in all cases
-            # it could be improved if relevant for this hoster
-            streams = [
-                (result.group('QUALITY'), result.group('URL'))
-                for result in re.finditer(r'"(?P<QUALITY>.*?)":"(?P<URL>.*?)"', self.html)
-            ]
-            self.logDebug("Found Streams", streams)
-            self.logDebug("Downloading", streams[0][0], streams[0][1])
-            self.download(streams[0][1])
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
+
+
+    NAME_PATTERN    = r'title" content="(?P<N>.+?)"'
+    OFFLINE_PATTERN = r'<title>"SoundCloud - Hear the world’s sounds"</title>'
+
+
+    def handleFree(self, pyfile):
+        try:
+            song_id = re.search(r'sounds:(\d+)"', self.html).group(1)
+
+        except Exception:
+            self.error(_("Could not find song id"))
+
+        try:
+            client_id = re.search(r'"clientID":"(.+?)"', self.html).group(1)
+
+        except Exception:
+            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}))
+
+        regex = re.compile(r'[^\d]')
+        http_streams = sorted([(key, value) for key, value in streams.iteritems() if key.startswith('http_')],
+                              key=lambda t: regex.sub(t[0], ''),
+                              reverse=True)
+
+        self.logDebug("Streams found: %s" % (http_streams or "None"))
+
+        if http_streams:
+            stream_name, self.link = http_streams[0 if self.getConfig('quality') == "Higher" else -1]
+            pyfile.name += '.' + stream_name.split('_')[1].lower()
+
+
+getInfo = create_getInfo(SoundcloudCom)