Initial commit for SoundCloud

.gitignore

@@ -7,3 +7,5 @@ test.py
 /urls.txt
 *.flac
 /Downloads
+*.mp3
+StreamripDownloads

streamrip/cli.py

@@ -206,7 +206,7 @@ def config(ctx, **kwargs):
         config.reset()
 
     if kwargs["open"]:
-        click.secho(f"Opening {CONFIG_PATH}", fg='green')
+        click.secho(f"Opening {CONFIG_PATH}", fg="green")
         click.launch(CONFIG_PATH)
 
     if kwargs["qobuz"]:

streamrip/clients.py

@@ -4,7 +4,7 @@ import json
 import logging
 import time
 from abc import ABC, abstractmethod
-from pprint import pformat  # , pprint
+from pprint import pformat, pprint
 from typing import Generator, Sequence, Tuple, Union
 
 import click
@@ -50,6 +50,10 @@ QOBUZ_BASE = "https://www.qobuz.com/api.json/0.2"
 DEEZER_BASE = "https://api.deezer.com"
 DEEZER_DL = "http://dz.loaderapp.info/deezer"
 
+# SoundCloud
+SOUNDCLOUD_BASE = "https://api-v2.soundcloud.com"
+SOUNDCLOUD_CLIENT_ID = "a3e059563d7fd3372b49b37f00a00bcf"
+
 
 # ----------- Abstract Classes -----------------
 
@@ -639,3 +643,78 @@ class TidalClient(ClientInterface):
     def _api_post(self, url, data, auth=None):
         r = requests.post(url, data=data, auth=auth, verify=False).json()
         return r
+
+
+class SoundCloudClient(ClientInterface):
+    source = "soundcloud"
+
+    def __init__(self):
+        self.session = requests.Session()
+        self.session.headers.update(
+            {
+                "User-Agent": AGENT,
+            }
+        )
+
+    def login(self):
+        raise NotImplementedError
+
+    def get(self, id=None, url=None, media_type="track"):
+        assert media_type in ("track", "playlist", "album"), f"{media_type} not supported"
+        if media_type == 'album':
+            media_type = 'playlist'
+
+        if url is not None:
+            resp, status = self._get(f"resolve?url={url}")
+        elif id is not None:
+            resp, _ = self._get(f"tracks/{id}")
+        else:
+            raise Exception("Must provide id or url")
+
+        return resp
+
+    def get_file_url(self, track: dict, **kwargs) -> str:
+        if not track['streamable'] or track['policy'] == 'BLOCK':
+            raise Exception
+
+        if track['downloadable'] and track['has_downloads_left']:
+            resp, status = self._get("tracks/{id}/download")
+            return resp['redirectUri']
+
+        else:
+            url = None
+            for tc in track['media']['transcodings']:
+                fmt = tc['format']
+                if fmt['protocol'] == 'hls' and fmt['mime_type'] == 'audio/mpeg':
+                    url = tc['url']
+                    break
+
+            assert url is not None
+
+            resp, _ = self._get(url, no_base=True)
+            return resp['url']
+
+        pprint(resp)
+
+        if status in (401, 404):
+            raise Exception
+
+        return resp["redirectUri"]
+
+    def search(self, query: str, media_type='album'):
+        params = {'q': query}
+        resp, _ = self._get(f"search/{media_type}s", params=params)
+        return resp
+
+    def _get(self, path, params=None, no_base=False):
+        if params is None:
+            params = {}
+        params["client_id"] = SOUNDCLOUD_CLIENT_ID
+        if no_base:
+            url = path
+        else:
+            url = f"{SOUNDCLOUD_BASE}/{path}"
+
+        r = self.session.get(url, params=params)
+        print(r.text)
+        return r.json(), r.status_code

streamrip/core.py

@@ -71,9 +71,9 @@ class MusicDL(list):
                 f"Enter {capitalize(source)} password (will not show on screen):",
                 fg="green",
             )
-            self.config.file[source]["password"] = md5(getpass(
+            self.config.file[source]["password"] = md5(
-                prompt=""
+                getpass(prompt="").encode("utf-8")
-            ).encode('utf-8')).hexdigest()
+            ).hexdigest()
 
             self.config.save()
             click.secho(f'Credentials saved to config file at "{self.config._path}"')

streamrip/db.py

@@ -61,5 +61,5 @@ class MusicDB:
                 )
                 conn.commit()
             except sqlite3.Error as e:
-                if 'UNIQUE' not in str(e):
+                if "UNIQUE" not in str(e):
                     raise

streamrip/downloader.py

@@ -1,4 +1,5 @@
 import logging
+import sys
 import os
 import re
 import shutil
@@ -251,7 +252,7 @@ class Track:
 
         self.cover_path = os.path.join(self.folder, f"cover{hash(self.meta.album)}.jpg")
         logger.debug(f"Downloading cover from {self.cover_url}")
-        click.secho(f"\nDownloading cover art for {self!s}", fg='blue')
+        click.secho(f"\nDownloading cover art for {self!s}", fg="blue")
 
         if not os.path.exists(self.cover_path):
             tqdm_download(self.cover_url, self.cover_path)
@@ -573,7 +574,7 @@ class Tracklist(list):
         :type quality: int
         :rtype: Union[Picture, APIC]
         """
-        cover_type = {1: APIC, 2: Picture, 3: Picture, 4: Picture}
+        cover_type = {0: APIC, 1: APIC, 2: Picture, 3: Picture, 4: Picture}
 
         cover = cover_type.get(quality)
         if cover is Picture:
@@ -731,7 +732,6 @@ class Album(Tracklist):
                 "tracktotal": resp.get("numberOfTracks"),
             }
         elif client.source == "deezer":
-            logger.debug(pformat(resp))
             return {
                 "id": resp.get("id"),
                 "title": resp.get("title"),
@@ -752,6 +752,25 @@ class Album(Tracklist):
                 "sampling_rate": 44100,
                 "tracktotal": resp.get("track_total") or resp.get("nb_tracks"),
             }
+        elif client.source == 'soundcloud':
+            print(resp.keys())
+            return {
+                "id": resp['id'],
+                "title": resp['title'],
+                "_artist": resp['user']['username'],
+                "albumartist": resp['user']['username'],
+                "year": resp['created_at'][:4],
+                "cover_urls": {
+                    "small": resp['artwork_url'],
+                    "large": resp['artwork_url'].replace('large', 't500x500') if resp['artwork_url'] is not None else None
+                },
+                "url": resp['uri'],
+                "streamable": True,  # assume to be true for convenience
+                "quality": 0,  # always 128 kbps mp3
+                # no bit depth
+                # no sampling rate
+                "tracktotal": resp['track_count'],
+            }
 
         raise InvalidSourceError(client.source)
 
@@ -794,7 +813,7 @@ class Album(Tracklist):
 
     def download(
         self,
-        quality: int = 7,
+        quality: int = 3,
         parent_folder: Union[str, os.PathLike] = "StreamripDownloads",
         database: MusicDB = None,
         **kwargs,
@@ -829,7 +848,7 @@ class Album(Tracklist):
             logger.debug("Cover already downloaded: %s. Skipping", cover_path)
         else:
             click.secho("Downloading cover art", fg="magenta")
-            if kwargs.get("large_cover", False):
+            if kwargs.get("large_cover", True):
                 cover_url = self.cover_urls.get("large")
                 if self.client.source == "qobuz":
                     tqdm_download(cover_url.replace("600", "org"), cover_path)
@@ -847,7 +866,7 @@ class Album(Tracklist):
             else:
                 tqdm_download(self.cover_urls["small"], cover_path)
 
-        embed_cover = kwargs.get('embed_cover', True)  # embed by default
+        embed_cover = kwargs.get("embed_cover", True)  # embed by default
         if self.client.source != "deezer" and embed_cover:
             cover = self.get_cover_obj(cover_path, quality)
 
@@ -881,6 +900,7 @@ class Album(Tracklist):
             else:
                 fmt[key] = None
 
+        if fmt.get('sampling_rate', False):
             fmt["sampling_rate"] /= 1000
             # 48.0kHz -> 48kHz, 44.1kHz -> 44.1kHz
             if fmt["sampling_rate"] % 1 == 0.0:
@@ -891,7 +911,7 @@ class Album(Tracklist):
     def _get_formatted_folder(self, parent_folder: str) -> str:
         if self.bit_depth is not None and self.sampling_rate is not None:
             self.container = "FLAC"
-        elif self.client.source in ("qobuz", "deezer"):
+        elif self.client.source in ("qobuz", "deezer", "soundcloud"):
             self.container = "MP3"
         elif self.client.source == "tidal":
             self.container = "AAC"
@@ -983,7 +1003,7 @@ class Playlist(Tracklist):
         :type new_tracknumbers: bool
         """
         if self.client.source == "qobuz":
-            self.name = self.meta['name']
+            self.name = self.meta["name"]
             tracklist = self.meta["tracks"]["items"]
 
             def gen_cover(track):  # ?
@@ -993,7 +1013,7 @@ class Playlist(Tracklist):
                 return {"track": track, "album": track["album"]}
 
         elif self.client.source == "tidal":
-            self.name = self.meta['title']
+            self.name = self.meta["title"]
             tracklist = self.meta["tracks"]
 
             def gen_cover(track):
@@ -1007,7 +1027,7 @@ class Playlist(Tracklist):
                 }
 
         elif self.client.source == "deezer":
-            self.name = self.meta['title']
+            self.name = self.meta["title"]
             tracklist = self.meta["tracks"]
 
             def gen_cover(track):
@@ -1063,7 +1083,7 @@ class Playlist(Tracklist):
         for track in self:
             track.download(parent_folder=folder, quality=quality, database=database)
             if self.client.source != "deezer":
-                track.tag(embed_cover=kwargs.get('embed_cover', True))
+                track.tag(embed_cover=kwargs.get("embed_cover", True))
 
     @staticmethod
     def _parse_get_resp(item: dict, client: ClientInterface):
@@ -1079,7 +1099,7 @@ class Playlist(Tracklist):
         if client.source == "qobuz":
             return {
                 "name": item["name"],
-                "id": item['id'],
+                "id": item["id"],
             }
         elif client.source == "tidal":
             return {

streamrip/utils.py

@@ -108,7 +108,7 @@ def tqdm_download(url: str, filepath: str):
     r = requests.get(url, allow_redirects=True, stream=True)
     total = int(r.headers.get("content-length", 0))
     logger.debug(f"File size = {total}")
-    if total < 1000:
+    if total < 1000 and not url.endswith('jpg'):
         raise NonStreamable
 
     try: