Master

.gitignore

@@ -2,3 +2,5 @@ env/
 *.DS_Store
 *.pyc
 *.bak
+build/
+dist/

.travis.yml

@@ -1,9 +1,12 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
 # command to install dependencies
 install:
-  - "pip install -r requirements.txt"
+# - "pip install -r requirements.txt"
+  - "pip install setuptools --upgrade; python setup.py install"
 # command to run tests
 script: nosetests

README.md

@@ -1,9 +1,9 @@
 ![SoundScrape!](http://i.imgur.com/nHAt2ow.png)
 
-SoundScrape [![Build Status](https://travis-ci.org/Miserlou/SoundScrape.svg)](https://travis-ci.org/Miserlou/SoundScrape) [![PyPI](https://img.shields.io/pypi/dm/SoundScrape.svg?style=flat)]()
+SoundScrape [![Build Status](https://travis-ci.org/Miserlou/SoundScrape.svg)](https://travis-ci.org/Miserlou/SoundScrape) [![Python 2](https://img.shields.io/badge/Python-2-brightgreen.svg)](https://pypi.python.org/pypi/soundscrape/) [![Python 3](https://img.shields.io/badge/Python-3-brightgreen.svg)](https://pypi.python.org/pypi/soundscrape/) [![PyPI](https://img.shields.io/pypi/v/soundscrape.svg)](https://pypi.python.org/pypi/SoundScrape)
 ==============
 
-**SoundScrape** makes it super easy to download artists from SoundCloud (and Bandcamp) - even those which don't have download links! It automatically creates ID3 tags as well (including album art), which is handy.
+**SoundScrape** makes it super easy to download artists from SoundCloud (and Bandcamp and MixCloud) - even those which don't have download links! It automatically creates ID3 tags as well (including album art), which is handy.
 
 Usage
 ---------
@@ -14,6 +14,12 @@ First, install it:
 pip install soundscrape
 ```
 
+Note that if you are having problems, please first try updating to the latest version:
+
+```bash
+pip install soundscrape --upgrade
+```
+
 Then, just call soundscrape and the name of the artist you want to scrape:
 
 ```bash
@@ -85,10 +91,25 @@ By default, SoundScrape will try to rip everything it can. However, if you only
 soundscrape sly-dogg -d
 ```
 
+Keep Preview Tracks
+--------
+
+By default, SoundScrape will skip the 30-second preview tracks that SoundCloud now provides. You can choose to keep these preview snippets with the *-k* argument.
+
+```bash
+soundscrape chromeo -k
+```
+
 Folders
 --------
 
-By default, SoundScrape aims to act like _wget_, downloading in place in the current directory. With the *-f* argument, however, SoundScrape acts more like a download manager and sorts songs in to ./ARTIST_NAME/ARTIST_NAME_SONG_TITLE.mp3 format. It will also skip previously downloaded tracks.
+By default, SoundScrape aims to act like _wget_, downloading in place in the current directory. With the *-f* argument, however, SoundScrape acts more like a download manager and sorts songs into the following format:
+
+```
+./ARTIST_NAME - ALBUM_NAME/SONG_NUMBER - SONG_TITLE.mp3
+```
+
+It will also skip previously downloaded tracks.
 
 ```bash
 soundscrape murdercitydevils -f
@@ -99,10 +120,51 @@ Bandcamp
 
 SoundScrape can also pull down albums from Bandcamp. For Bandcamp pages, use the *-b* argument along with an artist's username or a specific URL. It only downloads one album at a time. This works with all of the other arguments, except *-d* as Bandcamp streams only come at one bitrate, as far as I can tell.
 
+Note: Currently, when using the *-n* argument, the limit is evaluated for each album separately.
+
 ```bash
 soundscrape warsaw -b -f
 ```
 
+This also works for non-Bandcamp URLs that are hosted on Bandcamp:
+
+```bash
+soundscrape -b http://music.monstercat.com/
+```
+
+Note that the full URL must be included.
+
+Mixcloud
+--------
+
+SoundScrape can also grab mixes from Mixcloud. This feature is extremely expermental and is in no way guaranteed to work!
+
+Finds the original mp3 of a mix and grabs that (with tags and album art) if it can, or else just gets the raw m4a stream.
+
+Mixcloud currently only takes an invidiual mix. Capacity for a whole artist's profile due shortly.
+
+```bash
+soundscrape https://www.mixcloud.com/corenewsuploads/flume-essential-mix-2015-10-03/ -of
+```
+
+Audiomack
+--------
+
+Just for fun, SoundScrape can also download individual songs from Audiomack. Not that you'd ever want to.
+
+```bash
+soundscrape -a http://www.audiomack.com/song/bottomfeedermusic/top-shottas
+```
+
+MusicBed
+--------
+
+For some strange reason, it also works for MusicBed.com. Thanks @brachna for this feature.
+
+```bash
+soundscrape https://www.musicbed.com/albums/be-still/2828
+```
+
 Opening Files
 --------
 

requirements.txt

@@ -1,11 +1,11 @@
 args>=0.1.0
 clint>=0.3.2
-demjson==2.2.2
-fudge==1.0.3
-mutagen==1.31
-nose==1.3.7
-requests[security]>=2.1.0
-simplejson==3.3.1
+demjson>=2.2.2
+fudge>=1.0.3
+nose>=1.3.7
+requests[security]>=2.9.0
+setuptools>=18.0.0
+simplejson>=3.3.1
 soundcloud>=0.4.1
-wheel==0.24.0
-wsgiref==0.1.2
+wheel>=0.24.0
+mutagen>=1.31.0

setup.py

@@ -1,8 +1,24 @@
 import os
+import setuptools
+import soundscrape
+import sys
+
 from setuptools import setup
 
+# To support 2/3 installation
+setup_version = int(setuptools.__version__.split('.')[0])
+if setup_version < 18:
+    print("Please upgrade your setuptools to install SoundScrape: ")
+    print("pip install -U pip wheel setuptools")
+    quit()
+
 # Set external files
-README = open(os.path.join(os.path.dirname(__file__), 'README.md')).read()
+try:
+    from pypandoc import convert
+    README = convert('README.md', 'rst')	 
+except ImportError:
+    README = open(os.path.join(os.path.dirname(__file__), 'README.md')).read()
+
 with open(os.path.join(os.path.dirname(__file__), 'requirements.txt')) as f:
     required = f.read().splitlines()
 
@@ -11,9 +27,10 @@
 
 setup(
     name='soundscrape',
-    version='0.17.2',
+    version=soundscrape.__version__,
     packages=['soundscrape'],
     install_requires=required,
+    extras_require={ ':python_version < "3.0"': [ 'wsgiref>=0.1.2', ], },    
     include_package_data=True,
     license='MIT License',
     description='Scrape an artist from SoundCloud',
@@ -31,8 +48,10 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],

soundscrape/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.30.2'