Release v0.5.6

Updated changelog
OS X Notification fix
2026-09-10 08:41:41 +01:00 · 2015-06-08 11:42:21 -07:00 · 2015-06-08 11:37:51 -07:00 · 2015-06-02 09:02:29 +12:00 · 2015-05-22 20:26:05 -07:00 · 2015-05-22 20:25:40 -07:00
28 changed files with 1032 additions and 322 deletions
@@ -1,5 +1,45 @@
 # Changelog
 ## v0.5.6
 Released 08 June 2015
 Highlights:
 * Added: Metacritic scores
 * Added: Series support (e.g. Cafe Del Mar, Now That's What I Call Music, etc)
 * Added: Filter out clean/edited/censored releases (#2198)
 * Added: Button on the log page to toggle verbose/debug logging
 * Fixed: Connecting to SABnzbd over https with python >= 2.7.9
 * Fixed: Email Notifications with SSL
 * Fixed: Don't limit musicbrainz results to first 100
 * Fixed: nzbget url fix
 * Fixed: OSX Notifications
 * Improved: Cuesplit, allow wav, ape to be split
 * Improved: Moved the 'freeze db' option to the advanced->misc. tab
 * Improved: Moved kickass searching to json api, so it doesn't throw 404 errors anymore when there are no results
 * Improved: SSL for headphones indexer
 * Improved: Disable update dialog box if check_github is diabled
 The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.5...v0.5.6).
 ## v0.5.5
 Released 04 May 2015
 Highlights:
 * Added: force ID3v2.3 during post processing (#2121)
 * Added: MusicBrainz authentication (#2125)
 * Added: Email notifications (addresses #1045)
 * Fixed: Kickass url updated to kickass.to (#2119)
 * Fixed: Piratebay returning 0 bytes for all files
 * Fixed: Albums stopped automatically refreshing when adding an artist
 * Fixed: Min/max sizes for target bitrate
 * Fixed: Don't filter any results if looking for a specific download
 * Fixed: Sort by size in the specific download table
 * Fixed: Deal with beets recommendation.none correctly
 * Improved: Close dialog window automatically when choosing a specific download
 * Improved: Move some repetitive log messages to debug level
 The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.4...v0.5.5).
 ## v0.5.4
 Released 05 February 2015
@@ -337,6 +337,21 @@
        });
    }
    jQuery.extend( jQuery.fn.dataTableExt.oSort, {
 		"title-numeric-pre": function ( a ) {
 			var x = a.match(/title="*(-?[0-9\.]+)/)[1];
 			return parseFloat( x );
 		},
 		"title-numeric-asc": function ( a, b ) {
 			return ((a < b) ? -1 : ((a > b) ? 1 : 0));
 		},
        "title-numeric-desc": function ( a, b ) {
            return ((a < b) ? 1 : ((a > b) ? -1 : 0));
        }
    } );
 	$(document).ready(function()	{
 		getAlbumInfo();
 		initThisPage();
@@ -70,6 +70,7 @@
 				<th id="albumname">Name</th>
 				<th id="reldate">Date</th>
 				<th id="type">Type</th>
 				<th id="score">Metacritic</th>
 				<th id="status">Status</th>
 				<th id="have">Have</th>
 				<th id="bitrate">Bitrate</th>
@@ -125,6 +126,7 @@
 				<td id="albumname"><a href="albumPage?AlbumID=${album['AlbumID']}">${album['AlbumTitle']}</a></td>
 				<td id="reldate">${album['ReleaseDate']}</td>
 				<td id="type">${album['Type']}</td>
 				<td id="score">${album['CriticScore']}/${album['UserScore']}</td>
 				<td id="status">${album['Status']}
 				%if album['Status'] == 'Skipped' or album['Status'] == 'Ignored':
 					[<a href="#" onclick="doAjaxCall('queueAlbum?AlbumID=${album['AlbumID']}&ArtistID=${album['ArtistID']}',$(this),'table')" data-success="'${album['AlbumTitle']}' added to Wanted list">want</a>]
@@ -218,7 +220,7 @@
 							$("li:gt(4)", this).hide(); /* :gt() is zero-indexed */
 							$("li:nth-child(5)", this).after("<br><li class='more'><a href='#'>More...</a></li>"); /* :nth-child() is one-indexed */
 						  });
-						  $("li.more a").live("click", function() {
+						  $("li.more").on("click", 'a', function() {
 							var li = $(this).parents("li:first");
 							li.parent().children().show();
 							li.remove();
@@ -283,6 +285,7 @@
 				{ "sType": "date" },
 				null,
 				null,
 				null,
 				{ "sType": "title-numeric"},
 				null,
 				null
@@ -31,12 +31,12 @@
 <body>
 	<div id="container">
 		<div id="ajaxMsg" class="ajaxMsg"></div>
-		% if not headphones.CURRENT_VERSION:
+		% if headphones.CONFIG.CHECK_GITHUB and not headphones.CURRENT_VERSION:
 			<div id="updatebar">
 				You're running an unknown version of Headphones. <a href="update">Update</a> or
 				<a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
 			</div>
-		% elif headphones.CURRENT_VERSION != headphones.LATEST_VERSION and headphones.COMMITS_BEHIND > 0 and headphones.INSTALL_TYPE != 'win':
+		% elif headphones.CONFIG.CHECK_GITHUB and headphones.CURRENT_VERSION != headphones.LATEST_VERSION and headphones.COMMITS_BEHIND > 0 and headphones.INSTALL_TYPE != 'win':
 			<div id="updatebar">
 				A <a href="https://github.com/${headphones.CONFIG.GIT_USER}/headphones/compare/${headphones.CURRENT_VERSION}...${headphones.LATEST_VERSION}"> newer version</a> is available. You're ${headphones.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
 			</div>
@@ -62,6 +62,7 @@
 					<select name="type" id="search_type">
 						<option value="artist">Artist</option>
 						<option value="album">Album</option>
 						<option value="series">Series</option>
 					</select>
 					<input type="submit" value="Search"/>
 				</form>
@@ -429,7 +429,7 @@
                                        <input class="hppass" type="password" value="${config['hppass']}" size="20">
                                    </div>
                                    <div class="row">
-                                        <a href="http://headphones.codeshy.com/vip" id="vipserver" target="_blank">Don't have an account? Sign up!</a>
+                                        <a href="https://headphones.codeshy.com/vip" id="vipserver" target="_blank">Don't have an account? Sign up!</a>
                                    </div>
                                </div>
                            </fieldset>
@@ -724,6 +724,12 @@
                                    <input type="text" name="required_words" value="${config['required_words']}" size="50">
                                    <small>Results without these words in the title will be filtered out. You can use OR: 'flac OR lossless OR alac, vinyl'</small>
                                </div>
                                <div class="row checkbox left clearfix">
                                    <label title="Filter out releases that contain the words 'clean','edited' or 'censored', as long as those words aren't in the search term">
                                        Ignore clean/censored releases
                                        <input type="checkbox" name="ignore_clean_releases" id="ignore_clean_releases" value="1" ${config['ignore_clean_releases']} />
                                    </label>
                                </div>
                            </fieldset>
                        </td>
                        <td>
@@ -736,10 +742,6 @@
                                    </label>
                                </div>
                                <div class="row checkbox left clearfix">
                                    <label title="Freeze the database, so new artists won't be added automatically. Use this if Headphones adds artists because due to wrong snatches. This check is skipped when the folder name is appended with release group ID.">
                                        Freeze database for adding new artist
                                        <input type="checkbox" name="freeze_db" id="freeze_db" value="1" ${config['freeze_db']} />
                                    </label>
                                    <label>
                                        Move downloads to Destination Folder
                                        <input type="checkbox" name="move_files" id="move_files" value="1" ${config['move_files']} />
@@ -786,6 +788,10 @@
                                        Embed lyrics
                                        <input type="checkbox" name="embed_lyrics" value="1" ${config['embed_lyrics']}>
                                    </label>
                                    <label title="Use ID3v2.3 instead of ID3v2.4">
                                        Tag using ID3v2.3
                                        <input type="checkbox" name="idtag" value="1" ${config['idtag']}>
                                    </label>
                                </div>
                                <div class="row">
                                    <label>
@@ -1104,6 +1110,42 @@
                                </div>
                            </fieldset>
                           <fieldset>
                                <h3>Email</h3>
                                <div class="row checkbox">
                                    <input type="checkbox" name="email_enabled" id="email" value="1" ${config['email_enabled']} /><label>Enable Email Notifications</label>
                                </div>
                                <div id="email_options">
                                    <div class="row">
                                        <label>From</label><input type="text" name="email_from" value="${config['email_from']}" size="254">
                                    </div>
                                    <div class="row">
                                        <label>To</label><input type="text" name="email_to" value="${config['email_to']}" size="254">
                                    </div>
                                    <div class="row">
                                        <label>SMTP Server</label><input type="text" name="email_smtp_server" value="${config['email_smtp_server']}" size="254">
                                    </div>
                                    <div class="row">
                                        <label>SMTP User</label><input type="text" name="email_smtp_user" value="${config['email_smtp_user']}" size="254">
                                    </div>
                                    <div class="row">
                                        <label>SMTP Password</label><input type="password" name="email_smtp_password" value="${config['email_smtp_password']}" size="50">
                                    </div>
                                    <div class="row checkbox">
                                        <input type="text" class="override-float" name="email_smtp_port" value="${config['email_smtp_port']}" size="4"><label>SMTP Port</label>
                                    </div>
                                    <div class="row checkbox">
                                        <input type="checkbox" name="email_ssl" value="1" ${config['email_ssl']} /><label>SSL</label>
                                    </div>
                                    <div class="row checkbox">
                                        <input type="checkbox" name="email_tls" value="1" ${config['email_tls']} /><label>TLS</label>
                                    </div>
                                    <div class="row checkbox">
                                        <input type="checkbox" name="email_onsnatch" value="1" ${config['email_onsnatch']} /><label>Notify on snatch?</label>
                                    </div>
                                </div>
                            </fieldset>
                            <fieldset>
                            </td>
                    </tr>
@@ -1331,6 +1373,12 @@
                                           name="autowant_manually_added" value="1" ${config['autowant_manually_added']} />
                                    <label>Automatically mark manually added albums as wanted</label>
                                </div>
                                <div class="row left checkbox">
                                    <label title="Freeze the database, so new artists won't be added automatically. Use this if Headphones adds artists because due to wrong snatches. This check is skipped when the folder name is appended with release group ID.">
                                        Don't add new artists when post-processing albums
                                        <input type="checkbox" name="freeze_db" id="freeze_db" value="1" ${config['freeze_db']} />
                                    </label>
                                </div>
                                <div class="row">
                                    <label>Folder Permissions</label>
                                    <input type="text" name="folder_permissions" value="${config['folder_permissions']}" size="7">
@@ -1416,6 +1464,17 @@
                                    <div class="row">
                                        <label>Port</label><input type="text" name="customport" value="${config['customport']}" size="8">
                                    </div>
                                    <div class="row checkbox">
                                        <input type="checkbox" name="customauth" id="customauth" value="1" ${config['customauth']} /><label>Requires Authentication</label>
                                    </div>
                                    <div id="customauth_options">
                                        <div class="row">
                                            <label>Username</label><input type="text" class="customuser" name="customuser" value="${config['customuser']}" size="20">
                                        </div>
                                        <div class="row">
                                            <label>Password</label><input type="password" class="custompass" name="custompass" value="${config['custompass']}" size="15"><br>
                                        </div>
                                    </div>
                                    <div class="row">
                                        <label>Sleep Interval</label><input type="text" name="customsleep" value="${config['customsleep']}" size="4">
                                    </div>
@@ -1427,7 +1486,7 @@
                                    </div>
                                    <div class="row">
                                        <label>Password</label><input type="password" class="hppass" name="hppass" value="${config['hppass']}" size="15"><br>
-                                        <a href="http://headphones.codeshy.com/vip" id="vipserver" target="_blank">Get an Account!</a>
+                                        <a href="https://headphones.codeshy.com/vip" id="vipserver" target="_blank">Get an Account!</a>
                                    </div>
                                </div>
                            </fieldset>
@@ -1525,6 +1584,25 @@
                    }
                    $('#api_key').val(data);
            });
        });
                if ($("#customauth").is(":checked"))
                        {
                            $("#customauth_options").show();
                        }
                else
                        {
                            $("#customauth_options").hide();
                        }
                $("#customauth").click(function(){
                        if ($("#customauth").is(":checked"))
                        {
                            $("#customauth_options").slideDown();
                        }
                        else
                        {
                            $("#customauth_options").slideUp();
                        }
                });
                if ($("#enable_https").is(":checked"))
                        {
@@ -1866,6 +1944,26 @@
                        }
                });
               if ($("#email").is(":checked"))
                        {
                            $("#email_options").show();
                        }
                else
                        {
                            $("#email_options").hide();
                        }
                $("#email").click(function(){
                        if ($("#email").is(":checked"))
                        {
                            $("#email_options").slideDown();
                        }
                        else
                        {
                            $("#email_options").slideUp();
                        }
                });
                if ($("#songkick").is(":checked"))
                        {
                            $("#songkickoptions").show();
@@ -2074,6 +2172,7 @@
                initConfigCheckbox("#use_whatcd");
                initConfigCheckbox("#api_enabled");
                initConfigCheckbox("#enable_https");
                initConfigCheckbox("#customauth");
                $('#twitterStep1').click(function () {
@@ -1445,6 +1445,7 @@ div#artistheader h2 a {
 #album_table td#albumname,
 #album_table td#reldate,
 #album_table td#type,
 #album_table td#score,
 #track_table td#duration,
 #upcoming_table td#select,
 #upcoming_table td#status,
@@ -1455,6 +1456,7 @@ div#artistheader h2 a {
 }
 #album_table td#status,
 #album_table td#bitrate,
 #album_table td#score,
 #album_table td#albumformat,
 #album_table td#wantlossless {
  font-size: 13px;
@@ -52,12 +52,15 @@
                fileid = 'torrent'
            if item['URL'].find('rutracker') != -1:
                fileid = 'torrent'
            folder = 'Folder: ' + item['FolderName']
        %>
 			<tr class="grade${grade}">
 				<td id="dateadded">${item['DateAdded']}</td>
 				<td id="filename">${cgi.escape(item['Title'], quote=True)} [<a href="${item['URL']}">${fileid}</a>]<a href="albumPage?AlbumID=${item['AlbumID']}">[album page]</a></td>
 				<td id="size">${helpers.bytes_to_mb(item['Size'])}</td>
-				<td id="status">${item['Status']}</td>
+				<td title="${folder}" id="status">${item['Status']}</td>
 				<td id="action">[<a href="#" onclick="doAjaxCall('queueAlbum?AlbumID=${item['AlbumID']}&redirect=history', $(this),'table')"  data-success="Retrying download of '${cgi.escape(item['Title'], quote=True)}'">retry</a>][<a href="#" onclick="doAjaxCall('queueAlbum?AlbumID=${item['AlbumID']}&new=True&redirect=history',$(this),'table')"  data-success="Looking for a new version of '${cgi.escape(item['Title'], quote=True)}'">new</a>]</td>
 				<td id="delete"><a href="#" onclick="doAjaxCall('clearhistory?date_added=${item['DateAdded']}&title=${cgi.escape(item['Title'], quote=True)}',$(this),'table')" data-success="${cgi.escape(item['Title'], quote=True)} cleared from history"><img src="interfaces/default/images/trashcan.png" height="18" width="18" id="trashcan" title="Clear this item from the history"></a>
 			</tr>
@@ -7,6 +7,7 @@
    <div id="subhead_container">
        <div id="subhead_menu">
            <a class="menu_link_edit" href="clearLogs"><i class="fa fa-trash-o"></i> Clear log</a>
            <a class="menu_link_edit" href="toggleVerbose"><i class="fa fa-pencil"></i> Toggle Debug Log</a>
        </div>
    </div>
 </%def>
@@ -17,8 +17,12 @@
                    <th id="reldate">Date</th>
                    <th id="scoresmall">Score</th>
                    <th id="mbrelid" style="display:none;"</th>
-                %else:
+                %elif type == 'artist':
                    <th id="artistname">Artist Name</th>
                    <th id="score">Score</th>
                %else:
                    <th id="seriesname">Series Name</th>
                    <th id="type">Type</th>
                    <th id="score">Score</th>
 				%endif
                <th id="mb"></th>
@@ -40,8 +44,10 @@
 				<tr class="grade${grade}">
 				%if type == 'album':
 					<td id="albumart" style=" text-align: center; vertical-align: middle;"><div id="artistImg"><img title="${result['albumid']}" class="albumArt" height="50" width="50" onerror="tryCCA(this, '${caa_group_url}')"></div></td>
-                %else:
+                %elif type == 'artist':
 					<td id="albumart"><div id="artistImg"><img title="${result['id']}" class="albumArt" height="50" width="50"></div></td>
                %else:
                    <td id="albumart"></td>
 				%endif
 				%if type == 'album':
 					<td id="albumname"><a href="addReleaseById?rid=${result['albumid']}&rgid=${result['rgid']}" title="${albuminfo}">${result['title']}</a></td>
@@ -52,9 +58,14 @@
                    <td id="score"><a href="${result['albumurl']} "title="View on MusicBrainz"><div class="bar"><div class="score" style="width: ${result['score']}px">${result['score']}</div></div></a></td>
                    <td id="musicbrainz" style=" text-align: center; line-height: 0; vertical-align: middle;"><a href="${result['albumurl']}"><img src="interfaces/default/images/MusicBrainz_Album_Icon.png" title="View on MusicBrainz" height="20" width="20"></a></td>
                    <td id="mbrelid" style="display:none;">${result['albumid']}</td>
-                %else:
+                %elif type == 'artist':
                    <td id="artistname"><a href="addArtist?artistid=${result['id']}" title="${result['uniquename']}">${result['uniquename']}</a></td>
                    <td id="score"><a href="${result['url']} "title="View on MusicBrainz"><div class="bar"><div class="score" style="width: ${result['score']}px">${result['score']}</div></div></a></td>
                    <td id="musicbrainz" style=" text-align: center; line-height: 0; vertical-align: middle;"><a href="${result['url']}"><img src="interfaces/default/images/MusicBrainz_Artist_Icon.png" title="View on MusicBrainz" height="20" width="20"></a></td>
                %else:
                    <td id="seriesname"><a href="addSeries?seriesid=${result['id']}" title="${result['uniquename']}">${result['uniquename']}</a></td>
                    <td id="type">${result['type']}</td>
                    <td id="score"><a href="${result['url']} "title="View on MusicBrainz"><div class="bar"><div class="score" style="width: ${result['score']}px">${result['score']}</div></div></a></td>
                    <td id="musicbrainz" style=" text-align: center; line-height: 0; vertical-align: middle;"><a href="${result['url']}"><img src="interfaces/default/images/MusicBrainz_Artist_Icon.png" title="View on MusicBrainz" height="20" width="20"></a></td>
 				%endif
 				</tr>
@@ -176,7 +176,7 @@ def initialize(config_file):
                             version_lock_file, e)
        # Check for new versions
-        if CONFIG.CHECK_GITHUB_ON_STARTUP:
+        if CONFIG.CHECK_GITHUB and CONFIG.CHECK_GITHUB_ON_STARTUP:
            try:
                LATEST_VERSION = versioncheck.checkGithub()
            except:
@@ -288,6 +288,7 @@ def initialize_scheduler():
        schedule_job(updater.dbUpdate, 'MusicBrainz Update', hours=hours, minutes=0)
        #Update check
        if CONFIG.CHECK_GITHUB:
            if CONFIG.CHECK_GITHUB_INTERVAL:
                minutes = CONFIG.CHECK_GITHUB_INTERVAL
            else:
@@ -352,12 +353,12 @@ def dbcheck():
    conn = sqlite3.connect(DB_FILE)
    c = conn.cursor()
    c.execute(
-        'CREATE TABLE IF NOT EXISTS artists (ArtistID TEXT UNIQUE, ArtistName TEXT, ArtistSortName TEXT, DateAdded TEXT, Status TEXT, IncludeExtras INTEGER, LatestAlbum TEXT, ReleaseDate TEXT, AlbumID TEXT, HaveTracks INTEGER, TotalTracks INTEGER, LastUpdated TEXT, ArtworkURL TEXT, ThumbURL TEXT, Extras TEXT)')
+        'CREATE TABLE IF NOT EXISTS artists (ArtistID TEXT UNIQUE, ArtistName TEXT, ArtistSortName TEXT, DateAdded TEXT, Status TEXT, IncludeExtras INTEGER, LatestAlbum TEXT, ReleaseDate TEXT, AlbumID TEXT, HaveTracks INTEGER, TotalTracks INTEGER, LastUpdated TEXT, ArtworkURL TEXT, ThumbURL TEXT, Extras TEXT, Type TEXT)')
    # ReleaseFormat here means CD,Digital,Vinyl, etc. If using the default
    # Headphones hybrid release, ReleaseID will equal AlbumID (AlbumID is
    # releasegroup id)
    c.execute(
-        'CREATE TABLE IF NOT EXISTS albums (ArtistID TEXT, ArtistName TEXT, AlbumTitle TEXT, AlbumASIN TEXT, ReleaseDate TEXT, DateAdded TEXT, AlbumID TEXT UNIQUE, Status TEXT, Type TEXT, ArtworkURL TEXT, ThumbURL TEXT, ReleaseID TEXT, ReleaseCountry TEXT, ReleaseFormat TEXT, SearchTerm TEXT)')
+        'CREATE TABLE IF NOT EXISTS albums (ArtistID TEXT, ArtistName TEXT, AlbumTitle TEXT, AlbumASIN TEXT, ReleaseDate TEXT, DateAdded TEXT, AlbumID TEXT UNIQUE, Status TEXT, Type TEXT, ArtworkURL TEXT, ThumbURL TEXT, ReleaseID TEXT, ReleaseCountry TEXT, ReleaseFormat TEXT, SearchTerm TEXT, CriticScore TEXT, UserScore TEXT)')
    # Format here means mp3, flac, etc.
    c.execute(
        'CREATE TABLE IF NOT EXISTS tracks (ArtistID TEXT, ArtistName TEXT, AlbumTitle TEXT, AlbumASIN TEXT, AlbumID TEXT, TrackTitle TEXT, TrackDuration, TrackID TEXT, TrackNumber INTEGER, Location TEXT, BitRate INTEGER, CleanName TEXT, Format TEXT, ReleaseID TEXT)')
@@ -583,6 +584,21 @@ def dbcheck():
    except sqlite3.OperationalError:
        c.execute('ALTER TABLE albums ADD COLUMN SearchTerm TEXT DEFAULT NULL')
    try:
        c.execute('SELECT CriticScore from albums')
    except sqlite3.OperationalError:
        c.execute('ALTER TABLE albums ADD COLUMN CriticScore TEXT DEFAULT NULL')
    try:
        c.execute('SELECT UserScore from albums')
    except sqlite3.OperationalError:
        c.execute('ALTER TABLE albums ADD COLUMN UserScore TEXT DEFAULT NULL')
    try:
        c.execute('SELECT Type from artists')
    except sqlite3.OperationalError:
        c.execute('ALTER TABLE artists ADD COLUMN Type TEXT DEFAULT NULL')
    conn.commit()
    c.close()
@@ -44,9 +44,12 @@ _CONFIG_DEFINITIONS = {
    'CUE_SPLIT': (int, 'General', 1),
    'CUE_SPLIT_FLAC_PATH': (str, 'General', ''),
    'CUE_SPLIT_SHNTOOL_PATH': (str, 'General', ''),
    'CUSTOMAUTH': (int, 'General', 0),
    'CUSTOMHOST': (str, 'General', 'localhost'),
    'CUSTOMPASS': (str, 'General', ''),
    'CUSTOMPORT': (int, 'General', 5000),
    'CUSTOMSLEEP': (int, 'General', 1),
    'CUSTOMUSER': (str, 'General', ''),
    'DELETE_LOSSLESS_FILES': (int, 'General', 1),
    'DESTINATION_DIR': (str, 'General', ''),
    'DETECT_BITRATE': (int, 'General', 0),
@@ -54,6 +57,16 @@ _CONFIG_DEFINITIONS = {
    'DOWNLOAD_SCAN_INTERVAL': (int, 'General', 5),
    'DOWNLOAD_TORRENT_DIR': (str, 'General', ''),
    'DO_NOT_OVERRIDE_GIT_BRANCH': (int, 'General', 0),
    'EMAIL_ENABLED': (int, 'Email', 0),
    'EMAIL_FROM': (str, 'Email', ''),
    'EMAIL_TO': (str, 'Email', ''),
    'EMAIL_SMTP_SERVER': (str, 'Email', ''),
    'EMAIL_SMTP_USER': (str, 'Email', ''),
    'EMAIL_SMTP_PASSWORD': (str, 'Email', ''),
    'EMAIL_SMTP_PORT': (int, 'Email', 25),
    'EMAIL_SSL': (int, 'Email', 0),
    'EMAIL_TLS': (int, 'Email', 0),
    'EMAIL_ONSNATCH': (int, 'Email', 0),
    'EMBED_ALBUM_ART': (int, 'General', 0),
    'EMBED_LYRICS': (int, 'General', 0),
    'ENABLE_HTTPS': (int, 'General', 0),
@@ -92,6 +105,8 @@ _CONFIG_DEFINITIONS = {
    'HTTP_PROXY': (int, 'General', 0),
    'HTTP_ROOT': (str, 'General', '/'),
    'HTTP_USERNAME': (str, 'General', ''),
    'IDTAG': (int, 'Beets', 0),
    'IGNORE_CLEAN_RELEASES': (int, 'General', 0),
    'IGNORED_WORDS': (str, 'General', ''),
    'IGNORED_FOLDERS': (list, 'Advanced', []),
    'IGNORED_FILES': (list, 'Advanced', []),
@@ -62,9 +62,7 @@ WAVE_FILE_TYPE_BY_EXTENSION = {
    '.flac': 'Free Lossless Audio Codec'
 }
-# TODO: Only alow flac for now
+#SHNTOOL_COMPATIBLE = ("Free Lossless Audio Codec", "Waveform Audio", "Monkey's Audio")
 #SHNTOOL_COMPATIBLE = ('Waveform Audio', 'WavPack', 'Free Lossless Audio Codec')
 SHNTOOL_COMPATIBLE = ('Free Lossless Audio Codec')
 # TODO: Make this better!
 # this module-level variable is bad. :(
@@ -109,10 +107,10 @@ def split_baby(split_file, split_cmd):
        env['PATH'] += os.pathsep + headphones.CONFIG.CUE_SPLIT_FLAC_PATH
    process = subprocess.Popen(split_cmd, startupinfo=startupinfo,
                               stdin=open(os.devnull, 'rb'), stdout=subprocess.PIPE,
                               stderr=subprocess.PIPE, env=env)
    stdout, stderr = process.communicate()
    if process.returncode:
        logger.error('Split failed for %s', split_file.decode(headphones.SYS_ENCODING, 'replace'))
        out = stdout if stdout else stderr
@@ -592,11 +590,10 @@ def split(albumpath):
            splitter = 'shntool'
    if splitter == 'shntool' and not check_splitter(splitter):
-            raise ValueError('Command not found, ensure shntool with FLAC or xld (OS X) installed')
+            raise ValueError('Command not found, ensure shntool or xld installed')
-    # Determine if file can be split (only flac allowed for shntool)
+    # Determine if file can be split
-    if 'xld' in splitter and wave.name_ext not in WAVE_FILE_TYPE_BY_EXTENSION.keys() or \
+    if wave.name_ext not in WAVE_FILE_TYPE_BY_EXTENSION.keys():
            wave.type not in SHNTOOL_COMPATIBLE:
        raise ValueError('Cannot split, audio file has unsupported extension')
    # Split with xld
@@ -640,7 +637,7 @@ def split(albumpath):
        cmd.extend(['-f'])
        cmd.extend([SPLIT_FILE_NAME])
        cmd.extend(['-o'])
-        cmd.extend(['flac'])
+        cmd.extend([wave.name_ext.lstrip('.')])
        cmd.extend([wave.name])
        split = split_baby(wave.name, cmd)
        os.remove(SPLIT_FILE_NAME)
@@ -652,9 +649,9 @@ def split(albumpath):
                logger.info('Tagging %s...', t.name)
                t.tag()
-        # rename FLAC files
+        # rename files
-        if split and CUE_META.count_tracks() == len(base_dir.tracks(ext='.flac', split=True)):
+        if split and CUE_META.count_tracks() == len(base_dir.tracks(ext=wave.name_ext, split=True)):
-            for t in base_dir.tracks(ext='.flac', split=True):
+            for t in base_dir.tracks(ext=wave.name_ext, split=True):
                if t.name != t.filename():
                    logger.info('Renaming %s to %s...', t.name, t.filename())
                    os.rename(t.name, t.filename())
@@ -173,15 +173,15 @@ def piratesize(size):
    factor = float(split[0])
    unit = split[1].upper()
-    if unit == 'MiB':
+    if unit == 'MIB':
        size = factor * 1048576
    elif unit == 'MB':
        size = factor * 1000000
-    elif unit == 'GiB':
+    elif unit == 'GIB':
        size = factor * 1073741824
    elif unit == 'GB':
        size = factor * 1000000000
-    elif unit == 'KiB':
+    elif unit == 'KIB':
        size = factor * 1024
    elif unit == 'KB':
        size = factor * 1000
@@ -519,7 +519,7 @@ def get_downloaded_track_list(albumpath):
    return downloaded_track_list
-def preserve_torrent_direcory(albumpath):
+def preserve_torrent_directory(albumpath):
    """
    Copy torrent directory to headphones-modified to keep files for seeding.
    """
@@ -13,7 +13,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with Headphones.  If not, see <http://www.gnu.org/licenses/>.
-from headphones import logger, helpers, db, mb, lastfm
+from headphones import logger, helpers, db, mb, lastfm, metacritic
 from beets.mediafile import MediaFile
@@ -111,7 +111,7 @@ def addArtistIDListToDB(artistidlist):
        addArtisttoDB(artistid)
-def addArtisttoDB(artistid, extrasonly=False, forcefull=False):
+def addArtisttoDB(artistid, extrasonly=False, forcefull=False, type="artist"):
    # Putting this here to get around the circular import. We're using this to update thumbnails for artist/albums
    from headphones import cache
@@ -142,11 +142,18 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False):
                        "Status": "Loading",
                        "IncludeExtras": headphones.CONFIG.INCLUDE_EXTRAS,
                        "Extras": headphones.CONFIG.EXTRAS}
        if type=="series":
            newValueDict['Type'] = "series"
    else:
        newValueDict = {"Status": "Loading"}
        if dbartist["Type"] == "series":
            type = "series"
    myDB.upsert("artists", newValueDict, controlValueDict)
    if type=="series":
        artist = mb.getSeries(artistid)
    else:
        artist = mb.getArtist(artistid, extrasonly)
    if artist and artist.get('artist_name') in blacklisted_special_artist_names:
@@ -488,6 +495,9 @@ def addArtisttoDB(artistid, extrasonly=False, forcefull=False):
    logger.info(u"Seeing if we need album art for: %s" % artist['artist_name'])
    cache.getThumb(ArtistID=artistid)
    logger.info(u"Fetching Metacritic reviews for: %s" % artist['artist_name'])
    metacritic.update(artist['artist_name'], artist['releasegroups'])
    if errors:
        logger.info("[%s] Finished updating artist: %s but with errors, so not marking it as updated in the database" % (artist['artist_name'], artist['artist_name']))
    else:
@@ -47,6 +47,8 @@ def startmb():
    elif headphones.CONFIG.MIRROR == "custom":
        mbhost = headphones.CONFIG.CUSTOMHOST
        mbport = int(headphones.CONFIG.CUSTOMPORT)
        mbuser = headphones.CONFIG.CUSTOMUSER
        mbpass = headphones.CONFIG.CUSTOMPASS
        sleepytime = int(headphones.CONFIG.CUSTOMSLEEP)
    elif headphones.CONFIG.MIRROR == "headphones":
        mbhost = "144.76.94.239"
@@ -69,12 +71,16 @@ def startmb():
        mb_lock.minimum_delta = sleepytime
    # Add headphones credentials
-    if headphones.CONFIG.MIRROR == "headphones":
+    if headphones.CONFIG.MIRROR == "headphones" or headphones.CONFIG.CUSTOMAUTH:
-        if not mbuser and mbpass:
+        if not mbuser or not mbpass:
-            logger.warn("No username or password set for VIP server")
+            logger.warn("No username or password set for MusicBrainz server")
        else:
            musicbrainzngs.hpauth(mbuser, mbpass)
    # Let us know if we disable custom authentication
    if not headphones.CONFIG.CUSTOMAUTH and headphones.CONFIG.MIRROR == "custom":
        musicbrainzngs.disable_hpauth()
    logger.debug('Using the following server values: MBHost: %s, MBPort: %i, Sleep Interval: %i', mbhost, mbport, sleepytime)
    return True
@@ -129,7 +135,6 @@ def findArtist(name, limit=1):
                     })
     return artistlist
 def findRelease(name, limit=1, artist=None):
    releaselist = []
    releaseResults = None
@@ -207,12 +212,45 @@ def findRelease(name, limit=1, artist=None):
                    })
    return releaselist
 def findSeries(name, limit=1):
     serieslist = []
     seriesResults = None
     chars = set('!?*-')
     if any((c in chars) for c in name):
         name = '"' + name + '"'
     criteria = {'series': name.lower()}
     with mb_lock:
         try:
             seriesResults = musicbrainzngs.search_series(limit=limit, **criteria)['series-list']
         except musicbrainzngs.WebServiceError as e:
             logger.warn('Attempt to query MusicBrainz for %s failed (%s)' % (name, str(e)))
             mb_lock.snooze(5)
     if not seriesResults:
         return False
     for result in seriesResults:
         if 'disambiguation' in result:
             uniquename = unicode(result['name'] + " (" + result['disambiguation'] + ")")
         else:
             uniquename = unicode(result['name'])
         serieslist.append({
                     'uniquename': uniquename,
                     'name': unicode(result['name']),
                     'type': unicode(result['type']),
                     'id': unicode(result['id']),
                     'url': unicode("http://musicbrainz.org/series/" + result['id']),#probably needs to be changed
                     'score': int(result['ext:score'])
                     })
     return serieslist
 def getArtist(artistid, extrasonly=False):
    artist_dict = {}
    artist = None
    try:
-        limit = 200
+        limit = 100
        with mb_lock:
            artist = musicbrainzngs.get_artist_by_id(artistid)['artist']
        newRgs = None
@@ -282,7 +320,7 @@ def getArtist(artistid, extrasonly=False):
            mb_extras_list = []
            try:
-                limit = 200
+                limit = 100
                newRgs = None
                while newRgs is None or len(newRgs) >= limit:
                    with mb_lock:
@@ -310,6 +348,38 @@ def getArtist(artistid, extrasonly=False):
    artist_dict['releasegroups'] = releasegroups
    return artist_dict
 def getSeries(seriesid):
    series_dict = {}
    series = None
    try:
        with mb_lock:
            series = musicbrainzngs.get_series_by_id(seriesid,includes=['release-group-rels'])['series']
    except musicbrainzngs.WebServiceError as e:
        logger.warn('Attempt to retrieve series information from MusicBrainz failed for seriesid: %s (%s)' % (seriesid, str(e)))
        mb_lock.snooze(5)
    except Exception as e:
        pass
    if not series:
        return False
    if 'disambiguation' in series:
        series_dict['artist_name'] = unicode(series['name'] + " (" + unicode(series['disambiguation']) + ")")
    else:
        series_dict['artist_name'] = unicode(series['name'])
    releasegroups = []
    for rg in series['release_group-relation-list']:
        releasegroup = rg['release-group']
        releasegroups.append({
            'title':releasegroup['title'],
            'date':releasegroup['first-release-date'],
            'id':releasegroup['id'],
            'type':rg['type']
            })
    series_dict['releasegroups'] = releasegroups
    return series_dict
 def getReleaseGroup(rgid):
    """
@@ -0,0 +1,58 @@
 #  This file is part of Headphones.
 #
 #  Headphones is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
 #  Headphones is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
 #  along with Headphones.  If not, see <http://www.gnu.org/licenses/>.
 import re
 import headphones
 from headphones import db, helpers, logger, request
 def update(artist_name,release_groups):
    """ Pretty simple and crude function to find the artist page on metacritic,
    then parse that page to get critic & user scores for albums"""
    # First let's modify the artist name to fit the metacritic convention. 
    # We could just do a search, then take the top result, but at least this will
    # cut down on api calls. If it's ineffective then we'll switch to search
    replacements = {" & " : " ", "." : ""}
    mc_artist_name = helpers.replace_all(artist_name.lower(),replacements)
    mc_artist_name = mc_artist_name.replace(" ","-")
    url = "http://www.metacritic.com/person/" + mc_artist_name + "?filter-options=music&sort_options=date&num_items=100"
    res = request.request_soup(url, parser='html.parser')
    try:
        rows = res.tbody.find_all('tr')
    except:
        logger.info("Unable to get metacritic scores for: %s" % artist_name)
        return
    myDB = db.DBConnection()
    for row in rows:
        title = row.a.string
        for rg in release_groups:
            if rg['title'].lower() == title.lower():
                scores = row.find_all("span")
                critic_score = scores[0].string
                user_score = scores[1].string
                controlValueDict = {"AlbumID": rg['id']}
                newValueDict = {'CriticScore':critic_score,'UserScore':user_score}
                myDB.upsert("albums", newValueDict, controlValueDict)
@@ -34,6 +34,11 @@ import json
 import oauth2 as oauth
 import pythontwitter as twitter
 from email.mime.text import MIMEText
 import smtplib
 import email.utils
 class GROWL(object):
    """
    Growl notifications, for OS X.
@@ -727,23 +732,32 @@ class OSX_NOTIFY(object):
            self.objc = __import__("objc")
            self.AppKit = __import__("AppKit")
        except:
            logger.warn('OS X Notification: Cannot import objc or AppKit')
            return False
    def swizzle(self, cls, SEL, func):
        old_IMP = getattr(cls, SEL, None)
        if old_IMP is None:
            old_IMP = cls.instanceMethodForSelector_(SEL)
        def wrapper(self, *args, **kwargs):
            return func(self, old_IMP, *args, **kwargs)
-        new_IMP = self.objc.selector(wrapper, selector=old_IMP.selector,
+
-            signature=old_IMP.signature)
+        new_IMP = self.objc.selector(
-        self.objc.classAddMethod(cls, SEL, new_IMP)
+            wrapper,
            selector=old_IMP.selector,
            signature=old_IMP.signature
        )
        self.objc.classAddMethod(cls, SEL.encode(), new_IMP)
    def notify(self, title, subtitle=None, text=None, sound=True, image=None):
        try:
-            self.swizzle(self.objc.lookUpClass('NSBundle'),
+            self.swizzle(
-                b'bundleIdentifier',
+                self.objc.lookUpClass('NSBundle'),
-                self.swizzled_bundleIdentifier)
+                'bundleIdentifier',
                self.swizzled_bundleIdentifier
            )
            NSUserNotification = self.objc.lookUpClass('NSUserNotification')
            NSUserNotificationCenter = self.objc.lookUpClass('NSUserNotificationCenter')
@@ -827,3 +841,34 @@ class SubSonicNotifier(object):
        # Invoke request
        request.request_response(self.host + "musicFolderSettings.view?scanNow",
            auth=(self.username, self.password))
 class Email(object):
    def notify(self, subject, message):
        message = MIMEText(message, 'plain', "utf-8")
        message['Subject'] = subject
        message['From'] = email.utils.formataddr(('Headphones', headphones.CONFIG.EMAIL_FROM))
        message['To'] = headphones.CONFIG.EMAIL_TO
        try:
            if (headphones.CONFIG.EMAIL_SSL):
                mailserver = smtplib.SMTP_SSL(headphones.CONFIG.EMAIL_SMTP_SERVER, headphones.CONFIG.EMAIL_SMTP_PORT)
            else:
                mailserver = smtplib.SMTP(headphones.CONFIG.EMAIL_SMTP_SERVER, headphones.CONFIG.EMAIL_SMTP_PORT)
            if (headphones.CONFIG.EMAIL_TLS):
                mailserver.starttls()
            mailserver.ehlo()
            if headphones.CONFIG.EMAIL_SMTP_USER:
                mailserver.login(headphones.CONFIG.EMAIL_SMTP_USER, headphones.CONFIG.EMAIL_SMTP_PASSWORD)
            mailserver.sendmail(headphones.CONFIG.EMAIL_FROM, headphones.CONFIG.EMAIL_TO, message.as_string())
            mailserver.quit()
            return True
        except Exception, e:
            logger.warn('Error sending Email: %s' % e)
            return False
@@ -32,20 +32,20 @@ from headphones import logger
 def sendNZB(nzb):
    addToTop = False
-    nzbgetXMLrpc = "%(username)s:%(password)s@%(host)s/xmlrpc"
+    nzbgetXMLrpc = "%(protocol)s://%(username)s:%(password)s@%(host)s/xmlrpc"
-    if headphones.CONFIG.NZBGET_HOST is None:
+    if not headphones.CONFIG.NZBGET_HOST:
        logger.error(u"No NZBget host found in configuration. Please configure it.")
        return False
    if headphones.CONFIG.NZBGET_HOST.startswith('https://'):
-        nzbgetXMLrpc = 'https://' + nzbgetXMLrpc
+        protocol = 'https'
-        headphones.CONFIG.NZBGET_HOST.replace('https://', '', 1)
+        host = headphones.CONFIG.NZBGET_HOST.replace('https://', '', 1)
    else:
-        nzbgetXMLrpc = 'http://' + nzbgetXMLrpc
+        protocol = 'http'
-        headphones.CONFIG.NZBGET_HOST.replace('http://', '', 1)
+        host = headphones.CONFIG.NZBGET_HOST.replace('http://', '', 1)
-    url = nzbgetXMLrpc % {"host": headphones.CONFIG.NZBGET_HOST, "username": headphones.CONFIG.NZBGET_USERNAME, "password": headphones.CONFIG.NZBGET_PASSWORD}
+    url = nzbgetXMLrpc % {"protocol": protocol, "host": host, "username": headphones.CONFIG.NZBGET_USERNAME, "password": headphones.CONFIG.NZBGET_PASSWORD}
    nzbGetRPC = xmlrpclib.ServerProxy(url)
    try:
@@ -23,6 +23,7 @@ import itertools
 import headphones
 from beets import autotag
 from beets import config as beetsconfig
 from beets.mediafile import MediaFile, FileTypeError, UnreadableFileError
 from beetsplug import lyrics as beetslyrics
@@ -34,7 +35,7 @@ postprocessor_lock = threading.Lock()
 def checkFolder():
-    logger.info("Checking download folder for completed downloads (only snatched ones).")
+    logger.debug("Checking download folder for completed downloads (only snatched ones).")
    with postprocessor_lock:
        myDB = db.DBConnection()
@@ -48,7 +49,7 @@ def checkFolder():
                    download_dir = headphones.CONFIG.DOWNLOAD_TORRENT_DIR
                album_path = os.path.join(download_dir, album['FolderName']).encode(headphones.SYS_ENCODING, 'replace')
-                logger.info("Checking if %s exists" % album_path)
+                logger.debug("Checking if %s exists" % album_path)
                if os.path.exists(album_path):
                    logger.info('Found "' + album['FolderName'] + '" in ' + album['Kind'] + ' download folder. Verifying....')
@@ -56,7 +57,7 @@ def checkFolder():
            else:
                logger.info("No folder name found for " + album['Title'])
-    logger.info("Checking download folder finished.")
+    logger.debug("Checking download folder finished.")
 def verify(albumid, albumpath, Kind=None, forced=False):
@@ -187,15 +188,9 @@ def verify(albumid, albumpath, Kind=None, forced=False):
    # Split cue
    if headphones.CONFIG.CUE_SPLIT and downloaded_cuecount and downloaded_cuecount >= len(downloaded_track_list):
        if headphones.CONFIG.KEEP_TORRENT_FILES and Kind == "torrent":
-            albumpath = helpers.preserve_torrent_direcory(albumpath)
+            albumpath = helpers.preserve_torrent_directory(albumpath)
        if albumpath and helpers.cue_split(albumpath):
            downloaded_track_list = helpers.get_downloaded_track_list(albumpath)
        else:
            myDB.action('UPDATE snatched SET status = "Unprocessed" WHERE status NOT LIKE "Seed%" and AlbumID=?', [albumid])
            processed = re.search(r' \(Unprocessed\)(?:\[\d+\])?', albumpath)
            if not processed:
                renameUnprocessedFolder(albumpath, tag="Unprocessed")
            return
    # test #1: metadata - usually works
    logger.debug('Verifying metadata...')
@@ -306,7 +301,7 @@ def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list,
                if any(files.lower().endswith('.' + x.lower()) for x in headphones.MEDIA_FORMATS):
                    downloaded_track_list.append(os.path.join(r, files))
-    # Check if files are valid media files and are writeable, before the steps
+    # Check if files are valid media files and are writable, before the steps
    # below are executed. This simplifies errors and prevents unfinished steps.
    for downloaded_track in downloaded_track_list:
        try:
@@ -336,7 +331,7 @@ def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list,
                    fp.seek(0)
            except IOError as e:
                logger.debug("Write check exact error: %s", e)
-                logger.error("Track file is not writeable. This is required " \
+                logger.error("Track file is not writable. This is required " \
                    "for some post processing steps: %s. Not continuing.",
                    downloaded_track.decode(headphones.SYS_ENCODING, "replace"))
                return
@@ -513,6 +508,12 @@ def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list,
        mpc = notifiers.MPC()
        mpc.notify()
    if headphones.CONFIG.EMAIL_ENABLED:
        logger.info(u"Sending Email notification")
        email = notifiers.Email()
        subject = release['ArtistName'] + ' - ' + release['AlbumTitle']
        email.notify(subject, "Download and Postprocessing completed")
 def embedAlbumArt(artwork, downloaded_track_list):
    logger.info('Embedding album art')
@@ -858,7 +859,7 @@ def correctMetadata(albumid, release, downloaded_track_list):
        except Exception as e:
            logger.error('Error getting recommendation: %s. Not writing metadata', e)
            return
-        if str(rec) == 'recommendation.none':
+        if str(rec) == 'Recommendation.none':
            logger.warn('No accurate album match found for %s, %s -  not writing metadata', release['ArtistName'], release['AlbumTitle'])
            return
@@ -874,6 +875,14 @@ def correctMetadata(albumid, release, downloaded_track_list):
        autotag.apply_metadata(info, mapping)
        # Set ID3 tag version
        if headphones.CONFIG.IDTAG:
            beetsconfig['id3v23'] = True
            logger.debug("Using ID3v2.3")
        else:
            beetsconfig['id3v23'] = False
            logger.debug("Using ID3v2.4")
        for item in items:
            try:
                item.write()
@@ -1053,6 +1062,8 @@ def renameUnprocessedFolder(path, tag):
 def forcePostProcess(dir=None, expand_subfolders=True, album_dir=None):
    logger.info('Force checking download folder for completed downloads')
    ignored = 0
    if album_dir:
@@ -95,7 +95,7 @@ def request_response(url, method="get", auto_raise=True,
            "host is up and running.")
    except requests.Timeout:
        logger.error(
-            "Request timed out. The remote host did not respond timely.")
+            "Request timed out. The remote host did not respond in a timely manner.")
    except requests.HTTPError as e:
        if e.response is not None:
            if e.response.status_code >= 500:
@@ -20,19 +20,21 @@
 import MultipartPostHandler
 import headphones
 import cookielib
 import urllib2
 import httplib
 import urllib
 import ast
 from headphones.common import USER_AGENT
-from headphones import logger
+from headphones import logger, helpers, request
 from headphones import helpers
-def sendNZB(nzb):
+def sab_api_call(request_type=None, params={}, **kwargs):
-    params = {}
+    if not headphones.CONFIG.SAB_HOST.startswith('http'):
        headphones.CONFIG.SAB_HOST = 'http://' + headphones.CONFIG.SAB_HOST
    if headphones.CONFIG.SAB_HOST.endswith('/'):
        headphones.CONFIG.SAB_HOST = headphones.CONFIG.SAB_HOST[0:len(headphones.CONFIG.SAB_HOST) - 1]
    url = headphones.CONFIG.SAB_HOST + "/" + "api?"
    if headphones.CONFIG.SAB_USERNAME:
        params['ma_username'] = headphones.CONFIG.SAB_USERNAME
@@ -40,9 +42,24 @@ def sendNZB(nzb):
        params['ma_password'] = headphones.CONFIG.SAB_PASSWORD
    if headphones.CONFIG.SAB_APIKEY:
        params['apikey'] = headphones.CONFIG.SAB_APIKEY
-    if headphones.CONFIG.SAB_CATEGORY:
+    
    if request_type=='send_nzb' and headphones.CONFIG.SAB_CATEGORY:
        params['cat'] = headphones.CONFIG.SAB_CATEGORY
    params['output']='json'
    response = request.request_json(url, params=params, **kwargs)
    if not response:
        logger.error("Error connecting to SABnzbd on url: %s" % headphones.CONFIG.SAB_HOST)
        return False
    else:
        logger.debug("Successfully connected to SABnzbd on url: %s" % headphones.CONFIG.SAB_HOST)
        return response
 def sendNZB(nzb):
    params = {}
    # if it's a normal result we just pass SAB the URL
    if nzb.resultType == "nzb":
        # for newzbin results send the ID to sab specifically
@@ -62,102 +79,41 @@ def sendNZB(nzb):
        # Sanitize the file a bit, since we can only use ascii chars with MultiPartPostHandler
        nzbdata = helpers.latinToAscii(nzb.extraInfo[0])
        params['mode'] = 'addfile'
-        multiPartParams = {"nzbfile": (helpers.latinToAscii(nzb.name) + ".nzb", nzbdata)}
+        files = {"nzbfile": (helpers.latinToAscii(nzb.name) + ".nzb", nzbdata)}
-
+        headers = {'User-Agent': USER_AGENT}
    if not headphones.CONFIG.SAB_HOST.startswith('http'):
        headphones.CONFIG.SAB_HOST = 'http://' + headphones.CONFIG.SAB_HOST
    if headphones.CONFIG.SAB_HOST.endswith('/'):
        headphones.CONFIG.SAB_HOST = headphones.CONFIG.SAB_HOST[0:len(headphones.CONFIG.SAB_HOST) - 1]
    url = headphones.CONFIG.SAB_HOST + "/" + "api?" + urllib.urlencode(params)
    try:
    logger.info("Attempting to connect to SABnzbd on url: %s" % headphones.CONFIG.SAB_HOST)
    if nzb.resultType == "nzb":
-            f = urllib.urlopen(url)
+        response = sab_api_call('send_nzb', params=params)
    elif nzb.resultType == "nzbdata":
        cookies = cookielib.CookieJar()
-            opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookies),
+        response = sab_api_call('send_nzb', params=params, method="post", files=files, cookies=cookies, headers=headers)
                                          MultipartPostHandler.MultipartPostHandler)
-            req = urllib2.Request(url,
+    if not response:
                                  multiPartParams,
                                  headers={'User-Agent': USER_AGENT})
            f = opener.open(req)
    except (EOFError, IOError) as e:
        logger.error(u"Unable to connect to SAB with URL: %s" % url)
        return False
    except httplib.InvalidURL as e:
        logger.error(u"Invalid SAB host, check your config. Current host: %s" % headphones.CONFIG.SAB_HOST)
        return False
    except Exception as e:
        logger.error(u"Error: " + str(e))
        return False
    if f is None:
        logger.info(u"No data returned from SABnzbd, NZB not sent")
        return False
-    try:
+    if response['status']:
-        result = f.readlines()
+        logger.info(u"NZB sent to SABnzbd successfully")
    except Exception as e:
        logger.info(u"Error trying to get result from SAB, NZB not sent: ")
        return False
    if len(result) == 0:
        logger.info(u"No data returned from SABnzbd, NZB not sent")
        return False
    sabText = result[0].strip()
    logger.info(u"Result text from SAB: " + sabText)
    if sabText == "ok":
        logger.info(u"NZB sent to SAB successfully")
        return True
    elif sabText == "Missing authentication":
        logger.info(u"Incorrect username/password sent to SAB, NZB not sent")
        return False
    else:
-        logger.info(u"Unknown failure sending NZB to sab. Return text is: " + sabText)
+        logger.error(u"Error sending NZB to SABnzbd: %s" % response['error'])
        return False
 def checkConfig():
    params = {'mode': 'get_config',
-               'section': 'misc'
+               'section': 'misc',
               }
-    if headphones.CONFIG.SAB_USERNAME:
+    config_options = sab_api_call(params=params)
        params['ma_username'] = headphones.CONFIG.SAB_USERNAME
    if headphones.CONFIG.SAB_PASSWORD:
        params['ma_password'] = headphones.CONFIG.SAB_PASSWORD
    if headphones.CONFIG.SAB_APIKEY:
        params['apikey'] = headphones.CONFIG.SAB_APIKEY
-    if not headphones.CONFIG.SAB_HOST.startswith('http'):
+    if not config_options:
        headphones.CONFIG.SAB_HOST = 'http://' + headphones.CONFIG.SAB_HOST
    if headphones.CONFIG.SAB_HOST.endswith('/'):
        headphones.CONFIG.SAB_HOST = headphones.CONFIG.SAB_HOST[0:len(headphones.CONFIG.SAB_HOST) - 1]
    url = headphones.CONFIG.SAB_HOST + "/" + "api?" + urllib.urlencode(params)
    try:
        f = urllib.urlopen(url).read()
    except Exception:
        logger.warn("Unable to read SABnzbd config file - cannot determine renaming options (might affect auto & forced post processing)")
        return (0, 0)
-    config_options = ast.literal_eval(f)
+    replace_spaces = config_options['config']['misc']['replace_spaces']
-
+    replace_dots = config_options['config']['misc']['replace_dots']
    replace_spaces = config_options['misc']['replace_spaces']
    replace_dots = config_options['misc']['replace_dots']
    return (replace_spaces, replace_dots)
@@ -225,7 +225,7 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False):
    myDB = db.DBConnection()
    albumlength = myDB.select('SELECT sum(TrackDuration) from tracks WHERE AlbumID=?', [album['AlbumID']])[0][0]
-    if headphones.CONFIG.PREFER_TORRENTS == 0:
+    if headphones.CONFIG.PREFER_TORRENTS == 0 and not choose_specific_download:
        if NZB_PROVIDERS and NZB_DOWNLOADERS:
            results = searchNZB(album, new, losslessOnly, albumlength)
@@ -233,7 +233,7 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False):
        if not results and TORRENT_PROVIDERS:
            results = searchTorrent(album, new, losslessOnly, albumlength)
-    elif headphones.CONFIG.PREFER_TORRENTS == 1:
+    elif headphones.CONFIG.PREFER_TORRENTS == 1 and not choose_specific_download:
        if TORRENT_PROVIDERS:
            results = searchTorrent(album, new, losslessOnly, albumlength)
@@ -247,10 +247,10 @@ def do_sorted_search(album, new, losslessOnly, choose_specific_download=False):
        torrent_results = None
        if NZB_PROVIDERS and NZB_DOWNLOADERS:
-            nzb_results = searchNZB(album, new, losslessOnly, albumlength)
+            nzb_results = searchNZB(album, new, losslessOnly, albumlength, choose_specific_download)
        if TORRENT_PROVIDERS:
-            torrent_results = searchTorrent(album, new, losslessOnly, albumlength)
+            torrent_results = searchTorrent(album, new, losslessOnly, albumlength, choose_specific_download)
        if not nzb_results:
            nzb_results = []
@@ -306,9 +306,9 @@ def more_filtering(results, album, albumlength, new):
            targetsize = albumlength / 1000 * int(headphones.CONFIG.PREFERRED_BITRATE) * 128
            logger.info('Target size: %s' % helpers.bytes_to_mb(targetsize))
            if headphones.CONFIG.PREFERRED_BITRATE_LOW_BUFFER:
-                low_size_limit = targetsize - (targetsize * int(headphones.CONFIG.PREFERRED_BITRATE_LOW_BUFFER) / 100)
+                low_size_limit =  targetsize * int(headphones.CONFIG.PREFERRED_BITRATE_LOW_BUFFER) / 100
            if headphones.CONFIG.PREFERRED_BITRATE_HIGH_BUFFER:
-                high_size_limit = targetsize + (targetsize * int(headphones.CONFIG.PREFERRED_BITRATE_HIGH_BUFFER) / 100)
+                high_size_limit = targetsize * int(headphones.CONFIG.PREFERRED_BITRATE_HIGH_BUFFER) / 100
                if headphones.CONFIG.PREFERRED_BITRATE_ALLOW_LOSSLESS:
                    allow_lossless = True
@@ -321,8 +321,10 @@ def more_filtering(results, album, albumlength, new):
        normalizedResultTitle = removeDisallowedFilenameChars(result[0])
        artistTitleCount = normalizedResultTitle.count(normalizedAlbumArtist)
-        if normalizedAlbumArtist in normalizedAlbumTitle and artistTitleCount < 2:
+        # WHAT DOES THIS DO?
-            continue
+        #if normalizedAlbumArtist in normalizedAlbumTitle and artistTitleCount < 2:
        #    logger.info("Removing %s from %s" % (result[0], result[3]))
        #    continue
        if low_size_limit and (int(result[1]) < low_size_limit):
            logger.info("%s from %s is too small for this album - not considering it. (Size: %s, Minsize: %s)", result[0], result[3], helpers.bytes_to_mb(result[1]), helpers.bytes_to_mb(low_size_limit))
@@ -400,7 +402,7 @@ def sort_search_results(resultlist, album, new, albumlength):
                finallist = sorted(newlist, key=lambda title: (-title[5], title[6]))
                if not len(finallist) and len(flac_list) and headphones.CONFIG.PREFERRED_BITRATE_ALLOW_LOSSLESS:
-                    logger.info("Since there were no appropriate lossy matches (and at least one lossless match, going to use lossless instead")
+                    logger.info("Since there were no appropriate lossy matches (and at least one lossless match), going to use lossless instead")
                    finallist = sorted(flac_list, key=lambda title: (title[5], int(title[1])), reverse=True)
        except Exception:
            logger.exception('Unhandled exception')
@@ -429,7 +431,7 @@ def get_year_from_release_date(release_date):
    return year
-def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
+def searchNZB(album, new=False, losslessOnly=False, albumlength=None, choose_specific_download=False):
    reldate = album['ReleaseDate']
    year = get_year_from_release_date(reldate)
@@ -441,6 +443,8 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
    # Use the provided search term if available, otherwise build a search term
    if album['SearchTerm']:
        term = album['SearchTerm']
    elif album['Type'] == 'part of':
        term = cleanalbum + " " + year
    else:
        # FLAC usually doesn't have a year for some reason so leave it out.
        # Various Artist albums might be listed as VA, so I'll leave that out too
@@ -481,7 +485,7 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
            categories = "3030"
        # Request results
-        logger.info('Parsing results from Headphones Indexer')
+        logger.info('Searching Headphones Indexer with search term: %s' % term)
        headers = {'User-Agent': USER_AGENT}
        params = {
@@ -493,7 +497,7 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
        }
        data = request.request_feed(
-            url="http://indexer.codeshy.com/api",
+            url="https://indexer.codeshy.com/api",
            params=params, headers=headers,
            auth=(headphones.CONFIG.HPUSER, headphones.CONFIG.HPPASS)
        )
@@ -552,7 +556,7 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
                    categories = categories + ",4050"
            # Request results
-            logger.info('Parsing results from %s', newznab_host[0])
+            logger.info('Parsing results from %s using search term: %s' % (newznab_host[0],term))
            headers = {'User-Agent': USER_AGENT}
            params = {
@@ -600,9 +604,6 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
            categories = "3030"
            logger.info("Album type is audiobook/spokenword. Using audiobook category")
        # Request results
        logger.info('Requesting from nzbs.org')
        headers = {'User-Agent': USER_AGENT}
        params = {
            "t": "search",
@@ -618,7 +619,7 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
            timeout=5
        )
-        logger.info('Parsing results from nzbs.org')
+        logger.info('Parsing results from nzbs.org using search term: %s' % term)
        # Process feed
        if data:
            if not len(data.entries):
@@ -650,7 +651,7 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
            logger.info("Album type is audiobook/spokenword. Searching all music categories")
        # Request results
-        logger.info('Parsing results from omgwtfnzbs')
+        logger.info('Parsing results from omgwtfnzbs using search term: %s' % term)
        headers = {'User-Agent': USER_AGENT}
        params = {
@@ -691,7 +692,7 @@ def searchNZB(album, new=False, losslessOnly=False, albumlength=None):
    results = [result for result in resultlist if verifyresult(result[0], artistterm, term, losslessOnly)]
    # Additional filtering for size etc
-    if results:
+    if results and not choose_specific_download:
        results = more_filtering(results, album, albumlength, new)
    return results
@@ -946,7 +947,11 @@ def send_to_downloader(data, bestqual, album):
        b2msg = 'From ' + provider + '<br></br>' + name
        boxcar = notifiers.BOXCAR()
        boxcar.notify('Headphones snatched: ' + title, b2msg, rgid)
-
+    if headphones.CONFIG.EMAIL_ENABLED and headphones.CONFIG.EMAIL_ONSNATCH:
        logger.info(u"Sending Email notification")
        email = notifiers.Email()
        message = 'Snatched from ' + provider + '. ' + name
        email.notify(title, message)
 def verifyresult(title, artistterm, term, lossless):
@@ -995,6 +1000,13 @@ def verifyresult(title, artistterm, term, lossless):
                logger.info("Removed '%s' from results because it doesn't contain required word: '%s'", title, each_word)
                return False
    if headphones.CONFIG.IGNORE_CLEAN_RELEASES:
        for each_word in ['clean','edited','censored']:
            logger.debug("Checking if '%s' is in search result: '%s'", each_word, title)
            if each_word.lower() in title.lower() and each_word.lower() not in term.lower():
                logger.info("Removed '%s' from results because it contains clean album word: '%s'", title, each_word)
                return False
    tokens = re.split('\W', term, re.IGNORECASE | re.UNICODE)
    for token in tokens:
@@ -1014,7 +1026,7 @@ def verifyresult(title, artistterm, term, lossless):
    return True
-def searchTorrent(album, new=False, losslessOnly=False, albumlength=None):
+def searchTorrent(album, new=False, losslessOnly=False, albumlength=None, choose_specific_download=False):
    global gazelle  # persistent what.cd api object to reduce number of login attempts
    # rutracker login
@@ -1040,7 +1052,8 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None):
    # of these torrent providers are just using cleanartist/cleanalbum terms
    if album['SearchTerm']:
        term = album['SearchTerm']
-
+    elif album['Type'] == 'part of':
        term = cleanalbum + " " + year
    else:
        # FLAC usually doesn't have a year for some reason so I'll leave it out
        # Various Artist albums might be listed as VA, so I'll leave that out too
@@ -1092,10 +1105,10 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None):
        if headphones.CONFIG.KAT_PROXY_URL:
            providerurl = fix_url(set_proxy(headphones.CONFIG.KAT_PROXY_URL))
        else:
-            providerurl = fix_url("https://kickass.so")
+            providerurl = fix_url("https://kickass.to")
        # Build URL
-        providerurl = providerurl + "/usearch/" + ka_term
+        providerurl = providerurl + "/json.php?"
        # Pick category for torrents
        if headphones.CONFIG.PREFERRED_QUALITY == 3 or losslessOnly:
@@ -1109,28 +1122,27 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None):
            maxsize = 300000000
        # Requesting content
-        logger.info("Searching KAT using term: %s", ka_term)
+        logger.info("Searching %s using term: %s" % (provider,ka_term))
        params = {
-            "categories[0]": "music",
+            "q": ka_term + "+category:music",
            "field": "seeders",
-            "sorder": "desc",
+            "sorder": "desc"
            "rss": "1"
        }
-        data = request.request_feed(url=providerurl, params=params)
+        data = request.request_json(url=providerurl, params=params)
        # Process feed
        if data:
-            if not len(data.entries):
+            if not data['list']:
-                logger.info("No results found")
+                logger.info("No results found on %s using search term: %s" % (provider, ka_term))
            else:
-                for item in data.entries:
+                for item in data['list']:
                    try:
                        rightformat = True
                        title = item['title']
-                        seeders = item['torrent_seeds']
+                        seeders = item['seeds']
-                        url = item['links'][1]['href']
+                        url = item['torrentLink']
-                        size = int(item['links'][1]['length'])
+                        size = int(item['size'])
                        if format == "2":
                            torrent = request.request_content(url)
@@ -1179,7 +1191,7 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None):
            query_items.append('bitrate:"%s"' % bitrate)
        # Requesting content
-        logger.info('Parsing results from Waffles')
+        logger.info('Parsing results from Waffles.fm')
        params = {
            "uid": headphones.CONFIG.WAFFLES_UID,
@@ -1367,7 +1379,7 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None):
            rows = data.select('table tbody tr')
            if not rows:
-                logger.info("No results found")
+                logger.info("No results found from The Pirate Bay using term: %s" % tpb_term)
            else:
                for item in rows:
                    try:
@@ -1521,7 +1533,7 @@ def searchTorrent(album, new=False, losslessOnly=False, albumlength=None):
    results = [result for result in resultlist if verifyresult(result[0], artistterm, term, losslessOnly)]
    # Additional filtering for size etc
-    if results:
+    if results and not choose_specific_download:
        results = more_filtering(results, album, albumlength, new)
    return results
@@ -145,8 +145,10 @@ class WebInterface(object):
            raise cherrypy.HTTPRedirect("home")
        if type == 'artist':
            searchresults = mb.findArtist(name, limit=100)
-        else:
+        elif type == 'album':
            searchresults = mb.findRelease(name, limit=100)
        else:
            searchresults = mb.findSeries(name, limit=100)
        return serve_template(templatename="searchresults.html", title='Search Results for: "' + name + '"', searchresults=searchresults, name=name, type=type)
    @cherrypy.expose
@@ -156,6 +158,13 @@ class WebInterface(object):
        thread.join(1)
        raise cherrypy.HTTPRedirect("artistPage?ArtistID=%s" % artistid)
    @cherrypy.expose
    def addSeries(self, seriesid):
        thread = threading.Thread(target=importer.addArtisttoDB, args=[seriesid, False, False, "series"])
        thread.start()
        thread.join(1)
        raise cherrypy.HTTPRedirect("artistPage?ArtistID=%s" % seriesid)
    @cherrypy.expose
    def getExtras(self, ArtistID, newstyle=False, **kwargs):
        # if calling this function without the newstyle, they're using the old format
@@ -374,6 +383,9 @@ class WebInterface(object):
          myDB = db.DBConnection()
          album = myDB.action('SELECT * from albums WHERE AlbumID=?', [AlbumID]).fetchone()
          searcher.send_to_downloader(data, bestqual, album)
          return json.dumps({'result':'success'})
        else:
          return json.dumps({'result':'failure'})
    @cherrypy.expose
    def unqueueAlbum(self, AlbumID, ArtistID):
@@ -877,6 +889,7 @@ class WebInterface(object):
        cherrypy.response.headers['Content-type'] = 'application/json'
        return json_albums
    @cherrypy.expose
    def getArtistjson(self, ArtistID, **kwargs):
        myDB = db.DBConnection()
        artist = myDB.action('SELECT * FROM artists WHERE ArtistID=?', [ArtistID]).fetchone()
@@ -1001,6 +1014,7 @@ class WebInterface(object):
            "preferred_words": headphones.CONFIG.PREFERRED_WORDS,
            "ignored_words": headphones.CONFIG.IGNORED_WORDS,
            "required_words": headphones.CONFIG.REQUIRED_WORDS,
            "ignore_clean_releases": checked(headphones.CONFIG.IGNORE_CLEAN_RELEASES),
            "torrentblackhole_dir": headphones.CONFIG.TORRENTBLACKHOLE_DIR,
            "download_torrent_dir": headphones.CONFIG.DOWNLOAD_TORRENT_DIR,
            "numberofseeders": headphones.CONFIG.NUMBEROFSEEDERS,
@@ -1142,6 +1156,9 @@ class WebInterface(object):
            "customhost": headphones.CONFIG.CUSTOMHOST,
            "customport": headphones.CONFIG.CUSTOMPORT,
            "customsleep": headphones.CONFIG.CUSTOMSLEEP,
            "customauth": checked(headphones.CONFIG.CUSTOMAUTH),
            "customuser": headphones.CONFIG.CUSTOMUSER,
            "custompass": headphones.CONFIG.CUSTOMPASS,
            "hpuser": headphones.CONFIG.HPUSER,
            "hppass": headphones.CONFIG.HPPASS,
            "songkick_enabled": checked(headphones.CONFIG.SONGKICK_ENABLED),
@@ -1151,7 +1168,18 @@ class WebInterface(object):
            "cache_sizemb": headphones.CONFIG.CACHE_SIZEMB,
            "file_permissions": headphones.CONFIG.FILE_PERMISSIONS,
            "folder_permissions": headphones.CONFIG.FOLDER_PERMISSIONS,
-            "mpc_enabled": checked(headphones.CONFIG.MPC_ENABLED)
+            "mpc_enabled": checked(headphones.CONFIG.MPC_ENABLED),
            "email_enabled": checked(headphones.CONFIG.EMAIL_ENABLED),
            "email_from": headphones.CONFIG.EMAIL_FROM,
            "email_to": headphones.CONFIG.EMAIL_TO,
            "email_smtp_server": headphones.CONFIG.EMAIL_SMTP_SERVER,
            "email_smtp_user": headphones.CONFIG.EMAIL_SMTP_USER,
            "email_smtp_password": headphones.CONFIG.EMAIL_SMTP_PASSWORD,
            "email_smtp_port": int(headphones.CONFIG.EMAIL_SMTP_PORT),
            "email_ssl": checked(headphones.CONFIG.EMAIL_SSL),
            "email_tls": checked(headphones.CONFIG.EMAIL_TLS),
            "email_onsnatch": checked(headphones.CONFIG.EMAIL_ONSNATCH),
            "idtag": checked(headphones.CONFIG.IDTAG)
        }
        # Need to convert EXTRAS to a dictionary we can pass to the config:
@@ -1188,7 +1216,7 @@ class WebInterface(object):
        checked_configs = [
            "launch_browser", "enable_https", "api_enabled", "use_blackhole", "headphones_indexer", "use_newznab", "newznab_enabled",
            "use_nzbsorg", "use_omgwtfnzbs", "use_kat", "use_piratebay", "use_oldpiratebay", "use_mininova", "use_waffles", "use_rutracker",
-            "use_whatcd", "preferred_bitrate_allow_lossless", "detect_bitrate", "freeze_db", "cue_split", "move_files", "rename_files",
+            "use_whatcd", "preferred_bitrate_allow_lossless", "detect_bitrate", "ignore_clean_releases", "freeze_db", "cue_split", "move_files", "rename_files",
            "correct_metadata", "cleanup_files", "keep_nfo", "add_album_art", "embed_album_art", "embed_lyrics", "replace_existing_folders",
            "file_underscores", "include_extras", "autowant_upcoming", "autowant_all", "autowant_manually_added", "keep_torrent_files", "music_encoder",
            "encoderlossless", "encoder_multicore", "delete_lossless_files", "growl_enabled", "growl_onsnatch", "prowl_enabled",
@@ -1196,7 +1224,7 @@ class WebInterface(object):
            "nma_enabled", "nma_onsnatch", "pushalot_enabled", "pushalot_onsnatch", "synoindex_enabled", "pushover_enabled",
            "pushover_onsnatch", "pushbullet_enabled", "pushbullet_onsnatch", "subsonic_enabled", "twitter_enabled", "twitter_onsnatch",
            "osx_notify_enabled", "osx_notify_onsnatch", "boxcar_enabled", "boxcar_onsnatch", "songkick_enabled", "songkick_filter_enabled",
-            "mpc_enabled"
+            "mpc_enabled", "email_enabled", "email_ssl", "email_tls", "email_onsnatch", "customauth", "idtag"
        ]
        for checked_config in checked_configs:
            if checked_config not in kwargs:
@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
  <key>Label</key>
-  <string>com.headphones.headphones</string>
+  <string>headphones</string>
  <key>ProgramArguments</key>
  <array>
       <!-- Modify these two lines if you need to to reflect your python location and Headphones install location -->
       <string>/usr/bin/python</string>
-       <string>/Applications/Headphones/headphones.py</string>
+       <string>/Applications/Headphones/Headphones.py</string>
       <string>--quiet</string>
       <string>--daemon</string>
       <string>--nolaunch</string>
  </array>
  <key>RunAtLoad</key>
  <true/>
  <key>KeepAlive</key>
  <true/>
 </dict>
 </plist>
@@ -1 +1,2 @@
 from musicbrainzngs.musicbrainz import *
 from musicbrainzngs.caa import *
@@ -0,0 +1,177 @@
 # This file is part of the musicbrainzngs library
 # Copyright (C) Alastair Porter, Wieland Hoffmann, and others
 # This file is distributed under a BSD-2-Clause type license.
 # See the COPYING file for more information.
 __all__ = [
    'set_caa_hostname', 'get_image_list', 'get_release_group_image_list',
    'get_release_group_image_front', 'get_image_front', 'get_image_back',
    'get_image'
    ]
 import json
 from musicbrainzngs import compat
 from musicbrainzngs import musicbrainz
 hostname = "coverartarchive.org"
 def set_caa_hostname(new_hostname):
    """Set the base hostname for Cover Art Archive requests.
    Defaults to 'coverartarchive.org'."""
    global hostname
    hostname = new_hostname
 def _caa_request(mbid, imageid=None, size=None, entitytype="release"):
    """ Make a CAA request.
    :param imageid: ``front``, ``back`` or a number from the listing obtained
                    with :meth:`get_image_list`.
    :type imageid: str
    :param size: 250, 500
    :type size: str or None
    :param entitytype: ``release`` or ``release-group``
    :type entitytype: str
    """
    # Construct the full URL for the request, including hostname and
    # query string.
    path = [entitytype, mbid]
    if imageid and size:
        path.append("%s-%s" % (imageid, size))
    elif imageid:
        path.append(imageid)
    url = compat.urlunparse((
        'http',
        hostname,
        '/%s' % '/'.join(path),
        '',
        '',
        ''
    ))
    musicbrainz._log.debug("GET request for %s" % (url, ))
    # Set up HTTP request handler and URL opener.
    httpHandler = compat.HTTPHandler(debuglevel=0)
    handlers = [httpHandler]
    opener = compat.build_opener(*handlers)
    # Make request.
    req = musicbrainz._MusicbrainzHttpRequest("GET", url, None)
    # Useragent isn't needed for CAA, but we'll add it if it exists
    if musicbrainz._useragent != "":
        req.add_header('User-Agent', musicbrainz._useragent)
        musicbrainz._log.debug("requesting with UA %s" % musicbrainz._useragent)
    resp = musicbrainz._safe_read(opener, req, None)
    # TODO: The content type declared by the CAA for JSON files is
    # 'applicaiton/octet-stream'. This is not useful to detect whether the
    # content is JSON, so default to decoding JSON if no imageid was supplied.
    # http://tickets.musicbrainz.org/browse/CAA-75
    if imageid:
        # If we asked for an image, return the image
        return resp
    else:
        # Otherwise it's json
        return json.loads(resp)
 def get_image_list(releaseid):
    """Get the list of cover art associated with a release.
    The return value is the deserialized response of the `JSON listing
    <http://musicbrainz.org/doc/Cover_Art_Archive/API#.2Frelease.2F.7Bmbid.7D.2F>`_
    returned by the Cover Art Archive API.
    If an error occurs then a musicbrainz.ResponseError will
    be raised with one of the following HTTP codes:
    * 400: `Releaseid` is not a valid UUID
    * 404: No release exists with an MBID of `releaseid`
    * 503: Ratelimit exceeded
    """
    return _caa_request(releaseid)
 def get_release_group_image_list(releasegroupid):
    """Get the list of cover art associated with a release group.
    The return value is the deserialized response of the `JSON listing
    <http://musicbrainz.org/doc/Cover_Art_Archive/API#.2Frelease-group.2F.7Bmbid.7D.2F>`_
    returned by the Cover Art Archive API.
    If an error occurs then a musicbrainz.ResponseError will
    be raised with one of the following HTTP codes:
    * 400: `Releaseid` is not a valid UUID
    * 404: No release exists with an MBID of `releaseid`
    * 503: Ratelimit exceeded
    """
    return _caa_request(releasegroupid, entitytype="release-group")
 def get_release_group_image_front(releasegroupid, size=None):
    """Download the front cover art for a release group.
    The `size` argument and the possible error conditions are the same as for
    :meth:`get_image`.
    """
    return get_image(releasegroupid, "front", size=size,
                              entitytype="release-group")
 def get_image_front(releaseid, size=None):
    """Download the front cover art for a release.
    The `size` argument and the possible error conditions are the same as for
    :meth:`get_image`.
    """
    return get_image(releaseid, "front", size=size)
 def get_image_back(releaseid, size=None):
    """Download the back cover art for a release.
    The `size` argument and the possible error conditions are the same as for
    :meth:`get_image`.
    """
    return get_image(releaseid, "back", size=size)
 def get_image(mbid, coverid, size=None, entitytype="release"):
    """Download cover art for a release. The coverart file to download
    is specified by the `coverid` argument.
    If `size` is not specified, download the largest copy present, which can be
    very large.
    If an error occurs then a musicbrainz.ResponseError will be raised with one
    of the following HTTP codes:
    * 400: `Releaseid` is not a valid UUID or `coverid` is invalid
    * 404: No release exists with an MBID of `releaseid`
    * 503: Ratelimit exceeded
    :param coverid: ``front``, ``back`` or a number from the listing obtained with
                    :meth:`get_image_list`
    :type coverid: int or str
    :param size: 250, 500 or None. If it is None, the largest available picture
                 will be downloaded. If the image originally uploaded to the
                 Cover Art Archive was smaller than the requested size, only
                 the original image will be returned.
    :type size: str or None
    :param entitytype: The type of entity for which to download the cover art.
                       This is either ``release`` or ``release-group``.
    :type entitytype: str
    :return: The binary image data
    :type: str
    """
    if isinstance(coverid, int):
        coverid = "%d" % (coverid, )
    if isinstance(size, int):
        size = "%d" % (size, )
    return _caa_request(mbid, coverid, size=size, entitytype=entitytype)
@@ -36,6 +36,22 @@ NS_MAP = {"http://musicbrainz.org/ns/mmd-2.0#": "ws2",
          "http://musicbrainz.org/ns/ext#-2.0": "ext"}
 _log = logging.getLogger("musicbrainzngs")
 def get_error_message(error):
    """ Given an error XML message from the webservice containing
    <error><text>x</text><text>y</text></error>, return a list
    of [x, y]"""
    try:
        tree = util.bytes_to_elementtree(error)
        root = tree.getroot()
        errors = []
        if root.tag == "error":
            for ch in root:
                if ch.tag == "text":
                    errors.append(ch.text)
        return errors
    except ET.ParseError:
        return None
 def make_artist_credit(artists):
    names = []
    for artist in artists:
@@ -123,6 +139,7 @@ def parse_message(message):
                      "place": parse_place,
                      "release": parse_release,
                      "release-group": parse_release_group,
                      "series": parse_series,
                      "recording": parse_recording,
                      "work": parse_work,
                      "url": parse_url,
@@ -138,6 +155,7 @@ def parse_message(message):
                      "place-list": parse_place_list,
                      "release-list": parse_release_list,
                      "release-group-list": parse_release_group_list,
                      "series-list": parse_series_list,
                      "recording-list": parse_recording_list,
                      "work-list": parse_work_list,
                      "url-list": parse_url_list,
@@ -297,7 +315,7 @@ def parse_relation_list(rl):
 def parse_relation(relation):
    result = {}
    attribs = ["type", "type-id"]
-    elements = ["target", "direction", "begin", "end", "ended"]
+    elements = ["target", "direction", "begin", "end", "ended", "ordering-key"]
    inner_els = {"area": parse_area,
                 "artist": parse_artist,
                 "label": parse_label,
@@ -305,6 +323,7 @@ def parse_relation(relation):
                 "recording": parse_recording,
                 "release": parse_release,
                 "release-group": parse_release_group,
                 "series": parse_series,
                 "attribute-list": parse_element_list,
                 "work": parse_work,
                 "target": parse_relation_target
@@ -324,6 +343,8 @@ def parse_release(release):
                 "label-info-list": parse_label_info_list,
                 "medium-list": parse_medium_list,
                 "release-group": parse_release_group,
                 "tag-list": parse_tag_list,
                 "user-tag-list": parse_tag_list,
                 "relation-list": parse_relation_list,
                 "annotation": parse_annotation,
                 "cover-art-archive": parse_caa,
@@ -408,6 +429,22 @@ def parse_recording(recording):
    return result
 def parse_series_list(sl):
    return [parse_series(s) for s in sl]
 def parse_series(series):
    result = {}
    attribs = ["id", "type", "ext:score"]
    elements = ["name", "disambiguation"]
    inner_els = {"alias-list": parse_alias_list,
                 "relation-list": parse_relation_list,
                 "annotation": parse_annotation}
    result.update(parse_attributes(attribs, series))
    result.update(parse_elements(elements, inner_els, series))
    return result
 def parse_external_id_list(pl):
    return [parse_attributes(["id"], p)["id"] for p in pl]
@@ -427,13 +464,28 @@ def parse_work(work):
                 "alias-list": parse_alias_list,
                 "iswc-list": parse_element_list,
                 "relation-list": parse_relation_list,
-                 "annotation": parse_response_message}
+                 "annotation": parse_response_message,
                 "attribute-list": parse_work_attribute_list
    }
    result.update(parse_attributes(attribs, work))
    result.update(parse_elements(elements, inner_els, work))
    return result
 def parse_work_attribute_list(wal):
    return [parse_work_attribute(wa) for wa in wal]
 def parse_work_attribute(wa):
    result = {}
    attribs = ["type"]
    result.update(parse_attributes(attribs, wa))
    result["attribute"] = wa.text
    return result
 def parse_url_list(ul):
    return [parse_url(u) for u in ul]
@@ -617,45 +669,40 @@ def make_barcode_request(release2barcode):
    return ET.tostring(root, "utf-8")
-def make_tag_request(artist2tags, recording2tags):
+def make_tag_request(**kwargs):
    NS = "http://musicbrainz.org/ns/mmd-2.0#"
    root = ET.Element("{%s}metadata" % NS)
-    rec_list = ET.SubElement(root, "{%s}recording-list" % NS)
+    for entity_type in ['artist', 'label', 'place', 'recording', 'release', 'release_group', 'work']:
-    for rec, tags in recording2tags.items():
+        entity_tags = kwargs.pop(entity_type + '_tags', None)
-        rec_xml = ET.SubElement(rec_list, "{%s}recording" % NS)
+        if entity_tags is not None:
-        rec_xml.set("{%s}id" % NS, rec)
+            e_list = ET.SubElement(root, "{%s}%s-list" % (NS, entity_type.replace('_', '-')))
-        taglist = ET.SubElement(rec_xml, "{%s}user-tag-list" % NS)
+            for e, tags in entity_tags.items():
-        for tag in tags:
+                e_xml = ET.SubElement(e_list, "{%s}%s" % (NS, entity_type.replace('_', '-')))
-            usertag_xml = ET.SubElement(taglist, "{%s}user-tag" % NS)
+                e_xml.set("{%s}id" % NS, e)
-            name_xml = ET.SubElement(usertag_xml, "{%s}name" % NS)
+                taglist = ET.SubElement(e_xml, "{%s}user-tag-list" % NS)
            name_xml.text = tag
    art_list = ET.SubElement(root, "{%s}artist-list" % NS)
    for art, tags in artist2tags.items():
        art_xml = ET.SubElement(art_list, "{%s}artist" % NS)
        art_xml.set("{%s}id" % NS, art)
        taglist = ET.SubElement(art_xml, "{%s}user-tag-list" % NS)
                for tag in tags:
                    usertag_xml = ET.SubElement(taglist, "{%s}user-tag" % NS)
                    name_xml = ET.SubElement(usertag_xml, "{%s}name" % NS)
                    name_xml.text = tag
    if kwargs.keys():
        raise TypeError("make_tag_request() got an unexpected keyword argument '%s'" % kwargs.popitem()[0])
    return ET.tostring(root, "utf-8")
-def make_rating_request(artist2rating, recording2rating):
+def make_rating_request(**kwargs):
    NS = "http://musicbrainz.org/ns/mmd-2.0#"
    root = ET.Element("{%s}metadata" % NS)
-    rec_list = ET.SubElement(root, "{%s}recording-list" % NS)
+    for entity_type in ['artist', 'label', 'recording', 'release_group', 'work']:
-    for rec, rating in recording2rating.items():
+        entity_ratings = kwargs.pop(entity_type + '_ratings', None)
-        rec_xml = ET.SubElement(rec_list, "{%s}recording" % NS)
+        if entity_ratings is not None:
-        rec_xml.set("{%s}id" % NS, rec)
+            e_list = ET.SubElement(root, "{%s}%s-list" % (NS, entity_type.replace('_', '-')))
-        rating_xml = ET.SubElement(rec_xml, "{%s}user-rating" % NS)
+            for e, rating in entity_ratings.items():
-        rating_xml.text = str(rating)
+                e_xml = ET.SubElement(e_list, "{%s}%s" % (NS, entity_type.replace('_', '-')))
-    art_list = ET.SubElement(root, "{%s}artist-list" % NS)
+                e_xml.set("{%s}id" % NS, e)
-    for art, rating in artist2rating.items():
+                rating_xml = ET.SubElement(e_xml, "{%s}user-rating" % NS)
        art_xml = ET.SubElement(art_list, "{%s}artist" % NS)
        art_xml.set("{%s}id" % NS, art)
        rating_xml = ET.SubElement(art_xml, "{%s}user-rating" % NS)
                rating_xml.text = str(rating)
    if kwargs.keys():
        raise TypeError("make_rating_request() got an unexpected keyword argument '%s'" % kwargs.popitem()[0])
    return ET.tostring(root, "utf-8")
@@ -11,25 +11,25 @@ import socket
 import hashlib
 import locale
 import sys
-import base64
+import json
 import xml.etree.ElementTree as etree
 from xml.parsers import expat
-from warnings import warn, simplefilter
+from warnings import warn
 from musicbrainzngs import mbxml
 from musicbrainzngs import util
 from musicbrainzngs import compat
 import base64
 _version = "0.6devMODIFIED"
 _log = logging.getLogger("musicbrainzngs")
-# turn on DeprecationWarnings below
+LUCENE_SPECIAL = r'([+\-&|!(){}\[\]\^"~*?:\\\/])'
 simplefilter(action="once", category=DeprecationWarning)
 # Constants for validation.
-RELATABLE_TYPES = ['area', 'artist', 'label', 'place', 'recording', 'release', 'release-group', 'url', 'work']
+RELATABLE_TYPES = ['area', 'artist', 'label', 'place', 'recording', 'release', 'release-group', 'series', 'url', 'work']
 RELATION_INCLUDES = [entity + '-rels' for entity in RELATABLE_TYPES]
 TAG_INCLUDES = ["tags", "user-tags"]
 RATING_INCLUDES = ["ratings", "user-ratings"]
@@ -43,6 +43,9 @@ VALID_INCLUDES = {
    ] + RELATION_INCLUDES + TAG_INCLUDES + RATING_INCLUDES,
    'annotation': [
    ],
    'instrument': [
    ],
    'label': [
        "releases", # Subqueries
@@ -59,20 +62,23 @@ VALID_INCLUDES = {
        "artists", "labels", "recordings", "release-groups", "media",
        "artist-credits", "discids", "puids", "isrcs",
        "recording-level-rels", "work-level-rels", "annotation", "aliases"
-    ] + RELATION_INCLUDES,
+    ] + TAG_INCLUDES + RELATION_INCLUDES,
    'release-group': [
        "artists", "releases", "discids", "media",
        "artist-credits", "annotation", "aliases"
    ] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
    'series': [
        "annotation", "aliases"
    ] + RELATION_INCLUDES,
    'work': [
        "artists", # Subqueries
        "aliases", "annotation"
    ] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
    'url': RELATION_INCLUDES,
-    'discid': [
+    'discid': [ # Discid should be the same as release
        "artists", "labels", "recordings", "release-groups", "media",
        "artist-credits", "discids", "puids", "isrcs",
-        "recording-level-rels", "work-level-rels"
+        "recording-level-rels", "work-level-rels", "annotation", "aliases"
    ] + RELATION_INCLUDES,
    'isrc': ["artists", "releases", "puids", "isrcs"],
    'iswc': ["artists"],
@@ -93,7 +99,8 @@ VALID_RELEASE_TYPES = [
    "nat",
    "album", "single", "ep", "broadcast", "other", # primary types
    "compilation", "soundtrack", "spokenword", "interview", "audiobook",
-    "live", "remix", "dj-mix", "mixtape/street", "demo", # secondary types
+    "live", "remix", "dj-mix", "mixtape/street", # secondary types
    "demo", # headphones
 ]
 #: These can be used to filter whenever releases or release-groups are involved
 VALID_RELEASE_STATUSES = ["official", "promotion", "bootleg", "pseudo-release"]
@@ -101,6 +108,10 @@ VALID_SEARCH_FIELDS = {
    'annotation': [
        'entity', 'name', 'text', 'type'
    ],
    'area': [
        'aid', 'area', 'alias', 'begin', 'comment', 'end', 'ended',
        'iso', 'iso1', 'iso2', 'iso3', 'type'
    ],
    'artist': [
        'arid', 'artist', 'artistaccent', 'alias', 'begin', 'comment',
        'country', 'end', 'ended', 'gender', 'ipi', 'sortname', 'tag', 'type',
@@ -133,12 +144,20 @@ VALID_SEARCH_FIELDS = {
        'rgid', 'script', 'secondarytype', 'status', 'tag', 'tracks',
        'tracksmedium', 'type'
    ],
    'series': [
        'alias', 'comment', 'sid', 'series', 'type'
    ],
    'work': [
        'alias', 'arid', 'artist', 'comment', 'iswc', 'lang', 'tag',
        'type', 'wid', 'work', 'workaccent'
    ],
 }
 # Constants
 class AUTH_YES: pass
 class AUTH_NO: pass
 class AUTH_IFSET: pass
 # Exceptions.
@@ -271,6 +290,7 @@ user = password = ""
 hostname = "musicbrainz.org"
 _client = ""
 _useragent = ""
 mb_auth = False
 def auth(u, p):
 	"""Set the username and password to be used in subsequent queries to
@@ -284,9 +304,16 @@ def hpauth(u, p):
    """Set the username and password to be used in subsequent queries to
    the MusicBrainz XML API that require authentication.
    """
-    global hpuser, hppassword
+    global hpuser, hppassword, mb_auth
    hpuser = u
    hppassword = p
    mb_auth = True
 def disable_hpauth():
    """Disable the authentication for MusicBrainz XML API
    """
    global mb_auth
    mb_auth = False
 def set_useragent(app, version, contact=None):
    """Set the User-Agent to be used for requests to the MusicBrainz webservice.
@@ -551,28 +578,33 @@ def set_format(fmt="xml"):
    """Sets the format that should be returned by the Web Service.
    The server currently supports `xml` and `json`.
-    When you set the format to anything different from the default,
+    This method will set a default parser for the specified format,
-    you need to provide your own parser with :func:`set_parser`.
+    but you can modify it with :func:`set_parser`.
    .. warning:: The json format used by the server is different from
        the json format returned by the `musicbrainzngs` internal parser
-        when using the `xml` format!
+        when using the `xml` format! This format may change at any time.
    """
    global ws_format
-    if fmt not in ["xml", "json"]:
+    if fmt == "xml":
        raise ValueError("invalid format: %s" % fmt)
    else:
        ws_format = fmt
        set_parser() # set to default
    elif fmt == "json":
        ws_format = fmt
        warn("The json format is non-official and may change at any time")
        set_parser(json.loads)
    else:
        raise ValueError("invalid format: %s" % fmt)
@_rate_limit
-def _mb_request(path, method='GET', auth_required=False, client_required=False,
+def _mb_request(path, method='GET', auth_required=AUTH_NO,
-                args=None, data=None, body=None):
+                client_required=False, args=None, data=None, body=None):
    """Makes a request for the specified `path` (endpoint) on /ws/2 on
    the globally-specified hostname. Parses the responses and returns
    the resulting object.  `auth_required` and `client_required` control
-    whether exceptions should be raised if the client and
+    whether exceptions should be raised if the username/password and
-    username/password are left unspecified, respectively.
+    client are left unspecified, respectively.
    """
    global parser_fun
@@ -618,11 +650,19 @@ def _mb_request(path, method='GET', auth_required=False, client_required=False,
    handlers = [httpHandler]
    # Add credentials if required.
-    if auth_required:
+    add_auth = False
    if auth_required == AUTH_YES:
        _log.debug("Auth required for %s" % url)
        if not user:
            raise UsageError("authorization required; "
                             "use auth(user, pass) first")
        add_auth = True
    if auth_required == AUTH_IFSET and user:
        _log.debug("Using auth for %s because user and pass is set" % url)
        add_auth = True
    if add_auth:
        passwordMgr = _RedirectPasswordMgr()
        authHandler = _DigestAuthHandler(passwordMgr)
        authHandler.add_password("musicbrainz.org", (), user, password)
@@ -634,8 +674,9 @@ def _mb_request(path, method='GET', auth_required=False, client_required=False,
    req = _MusicbrainzHttpRequest(method, url, data)
    req.add_header('User-Agent', _useragent)
    # Add headphones credentials
-    if hostname == '144.76.94.239:8181':
+    if mb_auth:
        base64string = base64.encodestring('%s:%s' % (hpuser, hppassword)).replace('\n', '')
        req.add_header("Authorization", "Basic %s" % base64string)
@@ -650,16 +691,19 @@ def _mb_request(path, method='GET', auth_required=False, client_required=False,
    return parser_fun(resp)
-def _is_auth_required(entity, includes):
+def _get_auth_type(entity, id, includes):
    """ Some calls require authentication. This returns
    True if a call does, False otherwise
    """
    if "user-tags" in includes or "user-ratings" in includes:
-		return True
+        return AUTH_YES
    elif entity.startswith("collection"):
-		return True
+        if not id:
            return AUTH_YES
        else:
-		return False
+            return AUTH_IFSET
    else:
        return AUTH_NO
 def _do_mb_query(entity, id, includes=[], params={}):
 	"""Make a single GET call to the MusicBrainz XML API. `entity` is a
@@ -673,7 +717,7 @@ def _do_mb_query(entity, id, includes=[], params={}):
 	if not isinstance(includes, list):
 		includes = [includes]
 	_check_includes(entity, includes)
-	auth_required = _is_auth_required(entity, includes)
+	auth_required = _get_auth_type(entity, id, includes)
 	args = dict(params)
 	if len(includes) > 0:
 		inc = " ".join(includes)
@@ -696,8 +740,8 @@ def _do_mb_search(entity, query='', fields={},
 	if query:
 		clean_query = util._unicode(query)
 		if fields:
-			clean_query = re.sub(r'([+\-&|!(){}\[\]\^"~*?:\\])',
+			clean_query = re.sub(LUCENE_SPECIAL, r'\\\1',
-					r'\\\1', clean_query)
+					     clean_query)
 			if strict:
 				query_parts.append('"%s"' % clean_query)
 			else:
@@ -713,11 +757,11 @@ def _do_mb_search(entity, query='', fields={},
 		elif key == "puid":
 			warn("PUID support was removed from server\n"
 			     "the 'puid' field is ignored",
-			     DeprecationWarning, stacklevel=2)
+			     Warning, stacklevel=2)
 		# Escape Lucene's special characters.
 		value = util._unicode(value)
-		value = re.sub(r'([+\-&|!(){}\[\]\^"~*?:\\\/])', r'\\\1', value)
+		value = re.sub(LUCENE_SPECIAL, r'\\\1', value)
 		if value:
 			if strict:
 				query_parts.append('%s:"%s"' % (key, value))
@@ -744,18 +788,18 @@ def _do_mb_search(entity, query='', fields={},
 def _do_mb_delete(path):
 	"""Send a DELETE request for the specified object.
 	"""
-	return _mb_request(path, 'DELETE', True, True)
+	return _mb_request(path, 'DELETE', AUTH_YES, True)
 def _do_mb_put(path):
 	"""Send a PUT request for the specified object.
 	"""
-	return _mb_request(path, 'PUT', True, True)
+	return _mb_request(path, 'PUT', AUTH_YES, True)
 def _do_mb_post(path, body):
 	"""Perform a single POST call for an endpoint with a specified
 	request body.
 	"""
-	return _mb_request(path, 'POST', True, True, body=body)
+	return _mb_request(path, 'POST', AUTH_YES, True, body=body)
 # The main interface!
@@ -780,6 +824,15 @@ def get_artist_by_id(id, includes=[], release_status=[], release_type=[]):
                                           release_status, release_type)
    return _do_mb_query("artist", id, includes, params)
@_docstring('instrument')
 def get_instrument_by_id(id, includes=[], release_status=[], release_type=[]):
    """Get the instrument with the MusicBrainz `id` as a dict with an 'artist' key.
    *Available includes*: {includes}"""
    params = _check_filter_and_make_params("instrument", includes,
                                           release_status, release_type)
    return _do_mb_query("instrument", id, includes, params)
@_docstring('label')
 def get_label_by_id(id, includes=[], release_status=[], release_type=[]):
    """Get the label with the MusicBrainz `id` as a dict with a 'label' key.
@@ -828,6 +881,13 @@ def get_release_group_by_id(id, includes=[],
                                           release_status, release_type)
    return _do_mb_query("release-group", id, includes, params)
@_docstring('series')
 def get_series_by_id(id, includes=[]):
    """Get the series with the MusicBrainz `id` as a dict with a 'series' key.
    *Available includes*: {includes}"""
    return _do_mb_query("series", id, includes)
@_docstring('work')
 def get_work_by_id(id, includes=[]):
    """Get the work with the MusicBrainz `id` as a dict with a 'work' key.
@@ -852,6 +912,13 @@ def search_annotations(query='', limit=None, offset=None, strict=False, **fields
    *Available search fields*: {fields}"""
    return _do_mb_search('annotation', query, fields, limit, offset, strict)
@_docstring('area')
 def search_areas(query='', limit=None, offset=None, strict=False, **fields):
    """Search for areas and return a dict with an 'area-list' key.
    *Available search fields*: {fields}"""
    return _do_mb_search('area', query, fields, limit, offset, strict)
@_docstring('artist')
 def search_artists(query='', limit=None, offset=None, strict=False, **fields):
    """Search for artists and return a dict with an 'artist-list' key.
@@ -890,6 +957,13 @@ def search_release_groups(query='', limit=None, offset=None,
    *Available search fields*: {fields}"""
    return _do_mb_search('release-group', query, fields, limit, offset, strict)
@_docstring('series')
 def search_series(query='', limit=None, offset=None, strict=False, **fields):
    """Search for series and return a dict with a 'series-list' key.
    *Available search fields*: {fields}"""
    return _do_mb_search('series', query, fields, limit, offset, strict)
@_docstring('work')
 def search_works(query='', limit=None, offset=None, strict=False, **fields):
    """Search for works and return a dict with a 'work-list' key.
@@ -899,18 +973,25 @@ def search_works(query='', limit=None, offset=None, strict=False, **fields):
 # Lists of entities
-@_docstring('release')
+@_docstring('discid')
-def get_releases_by_discid(id, includes=[], toc=None, cdstubs=True):
+def get_releases_by_discid(id, includes=[], toc=None, cdstubs=True, media_format=None):
-    """Search for releases with a :musicbrainz:`Disc ID`.
+    """Search for releases with a :musicbrainz:`Disc ID` or table of contents.
    When a `toc` is provided and no release with the disc ID is found,
    a fuzzy search by the toc is done.
    The `toc` should have to same format as :attr:`discid.Disc.toc_string`.
    When a `toc` is provided, the format of the discid itself is not
    checked server-side, so any value may be passed if searching by only
    `toc` is desired.
    If no toc matches in musicbrainz but a :musicbrainz:`CD Stub` does,
    the CD Stub will be returned. Prevent this from happening by
    passing `cdstubs=False`.
    By default only results that match a format that allows discids
    (e.g. CD) are included. To include all media formats, pass
    `media_format='all'`.
    The result is a dict with either a 'disc' , a 'cdstub' key
    or a 'release-list' (fuzzy match with TOC).
    A 'disc' has a 'release-list' and a 'cdstub' key has direct 'artist'
@@ -923,6 +1004,8 @@ def get_releases_by_discid(id, includes=[], toc=None, cdstubs=True):
        params["toc"] = toc
    if not cdstubs:
        params["cdstubs"] = "no"
    if media_format:
        params["media-format"] = media_format
    return _do_mb_query("discid", id, includes, params)
@_docstring('recording')
@@ -932,7 +1015,7 @@ def get_recordings_by_echoprint(echoprint, includes=[], release_status=[],
    (not available on server)"""
    warn("Echoprints were never introduced\n"
         "and will not be found (404)",
-         DeprecationWarning, stacklevel=2)
+         Warning, stacklevel=2)
    raise ResponseError(cause=compat.HTTPError(
                                            None, 404, "Not Found", None, None))
@@ -943,7 +1026,7 @@ def get_recordings_by_puid(puid, includes=[], release_status=[],
    (not available on server)"""
    warn("PUID support was removed from the server\n"
         "and no PUIDs will be found (404)",
-         DeprecationWarning, stacklevel=2)
+         Warning, stacklevel=2)
    raise ResponseError(cause=compat.HTTPError(
                                            None, 404, "Not Found", None, None))
@@ -1108,7 +1191,7 @@ def submit_puids(recording_puids):
    """
    warn("PUID support was dropped at the server\n"
         "nothing will be submitted",
-         DeprecationWarning, stacklevel=2)
+         Warning, stacklevel=2)
    return {'message': {'text': 'OK'}}
 def submit_echoprints(recording_echoprints):
@@ -1117,7 +1200,7 @@ def submit_echoprints(recording_echoprints):
    """
    warn("Echoprints were never introduced\n"
         "nothing will be submitted",
-         DeprecationWarning, stacklevel=2)
+         Warning, stacklevel=2)
    return {'message': {'text': 'OK'}}
 def submit_isrcs(recording_isrcs):
@@ -1131,20 +1214,29 @@ def submit_isrcs(recording_isrcs):
    query = mbxml.make_isrc_request(rec2isrcs)
    return _do_mb_post("recording", query)
-def submit_tags(artist_tags={}, recording_tags={}):
+def submit_tags(**kwargs):
    """Submit user tags.
-    Artist or recording parameters are of the form:
+    Takes parameters named e.g. 'artist_tags', 'recording_tags', etc.,
    and of the form:
    {entity_id1: [tag1, ...], ...}
    The user's tags for each entity will be set to that list, adding or
    removing tags as necessary. Submitting an empty list for an entity
    will remove all tags for that entity by the user.
    """
-    query = mbxml.make_tag_request(artist_tags, recording_tags)
+    query = mbxml.make_tag_request(**kwargs)
    return _do_mb_post("tag", query)
-def submit_ratings(artist_ratings={}, recording_ratings={}):
+def submit_ratings(**kwargs):
    """Submit user ratings.
-    Artist or recording parameters are of the form:
+    Takes parameters named e.g. 'artist_ratings', 'recording_ratings', etc.,
    and of the form:
    {entity_id1: rating, ...}
    Ratings are numbers from 0-100, at intervals of 20 (20 per 'star').
    Submitting a rating of 0 will remove the user's rating.
    """
-    query = mbxml.make_rating_request(artist_ratings, recording_ratings)
+    query = mbxml.make_rating_request(**kwargs)
    return _do_mb_post("rating", query)
 def add_releases_to_collection(collection, releases=[]):
Author	SHA1	Message	Date
rembo10	c5ad7c98e2	Release v0.5.6	2015-06-08 11:42:21 -07:00
rembo10	4b8222d792	Updated changelog	2015-06-08 11:37:51 -07:00
Ade	a3524ef8aa	OS X Notification fix	2015-06-02 09:02:29 +12:00
rembo10	49ab8aa67d	Merge branch 'develop' of https://github.com/rembo10/headphones into develop	2015-05-22 20:26:05 -07:00
rembo10	fa85639efb	Hide update bar if github checking is turned off	2015-05-22 20:25:40 -07:00
rembo10	84bca81a9a	Update CHANGELOG.md	2015-05-22 20:23:17 -07:00
Ade	206ea72a27	mb demo	2015-05-23 08:59:56 +12:00
rembo10	cc2aceb3d8	Fix for nzbget connection url (#2135 )	2015-05-21 19:14:58 -07:00
rembo10	00b95aa6c3	Merge branch 'master' of https://github.com/rembo10/headphones into develop	2015-05-21 18:37:15 -07:00
rembo10	a7632cc1e5	For series, use series name + year as search term	2015-05-21 18:36:58 -07:00
rembo10	39f07025c6	Removed a check from postprocessor normalizedAlbumArtist/artistTitleCount, fixed some logging	2015-05-20 10:26:04 -07:00
rembo10	658cb0403f	Added support for series (initial stages - needs some cleanup)	2015-05-19 23:53:14 -07:00
rembo10	db1519bcea	Updated musicbrainz library	2015-05-19 20:26:50 -07:00
rembo10	885d1cc77c	Updated the codeshy.com links to point to https	2015-05-19 18:15:05 -07:00
rembo10	4005becd0a	Updated changelog	2015-05-19 18:06:44 -07:00
rembo10	4c16b53c2a	SSL for headphones indexer	2015-05-19 17:50:54 -07:00
rembo10	93dbf13d88	Few metacritic changes. Formatting on artist page, css & fixed replacements in artist name	2015-05-19 16:23:43 -07:00
Bas Stottelaar	c5dd1a9002	Merge pull request #2223 from MattTavares/patch-1 Fixed for spelling "writable" in postprocessor.py	2015-05-19 10:12:20 +02:00
rembo10	18af7d6392	Updated changelog	2015-05-17 13:54:02 -07:00
rembo10	dbeb31d4fe	Initial commit for fetching metacritic scores. Needs better presentation	2015-05-17 13:53:08 -07:00
rembo10	0fb9234ebc	Updated changelog	2015-05-16 20:47:55 -07:00
rembo10	6e4cec829a	Updated some sabnzbd logging	2015-05-16 20:40:49 -07:00
rembo10	5a433c42e7	Moved kickass search to json, updated some searcher log messages	2015-05-16 20:26:05 -07:00
rembo10	f808dd131b	Fixed a couple log messages in sab.py to make it a little less redundant and fixed some log grammar in requests.py	2015-05-16 19:40:13 -07:00
rembo10	1bbf9a2318	Updated osx init script to prevent crashing on yosemite	2015-05-16 19:32:40 -07:00
rembo10	ccff70d9c4	Capitalized Headphones.py in osx init script	2015-05-15 20:58:09 -07:00
Ade	0347ca1bcc	Various - Email SSL - History, show Folder Name when hovering over Status - Cuesplit, allow wav, ape to be split - mb, possible fix for #2181	2015-05-16 09:02:38 +12:00
Matthew Tavares	23564c14f9	Fixed for spelling "writable"	2015-05-14 10:24:00 -05:00
rembo10	93fca13510	Don't check for status when doing sabnzbd api call	2015-05-11 17:46:24 -07:00
rembo10	1a39066cfc	Updated changelog to reflect the sab.py https fix	2015-05-06 00:04:35 -07:00
rembo10	70b1574aa6	Updated sab.py to use the requests library. Should fix #2208	2015-05-06 00:02:11 -07:00
rembo10	898f814dce	Update CHANGELOG.md	2015-05-04 21:09:10 -07:00
rembo10	9d425d33ab	Added button to toggle verbose/debug logging	2015-05-04 20:58:53 -07:00
rembo10	c6b0f58074	Moved the 'freeze db' option to advanced->misc. tab	2015-05-04 20:55:00 -07:00
rembo10	78b3802f8f	Added option to ignore clean/censored releases (#2198 )	2015-05-04 20:50:16 -07:00
rembo10	833b90ccff	Release v0.5.5	2015-05-04 19:43:37 -07:00
rembo10	c27a381286	Update CHANGELOG.md	2015-05-04 19:37:23 -07:00
rembo10	ad29b43836	Needed to capitalize beets recommendation.none	2015-03-20 17:29:43 -07:00
rembo10	5cd9c51410	Move 'checking folder' message to debug level. Show it if forced	2015-03-15 18:28:38 -07:00
rembo10	6476d42371	Return some json when picking a specific download so we can close the dialog box on success/failure	2015-03-14 00:27:59 -07:00
rembo10	a48d9006ad	Fix to get size sorting working again when choosing a specific download	2015-03-14 00:04:14 -07:00
rembo10	c5c2057859	Return everything if they're looking for a specific download	2015-03-13 23:43:29 -07:00
rembo10	1889ab4825	Fix for min/max sizes with target bitrate (wrong calculation)	2015-03-12 14:14:06 -07:00
rembo10	0c81560f2c	uggh, indentation	2015-03-09 17:05:28 -07:00
rembo10	26005d6584	expose getArtistjson so we can automatically update albums when updating an artist	2015-03-09 17:03:25 -07:00
rembo10	b0b0bcbdb7	Fix for piratebay returning size as 0 bytes for all results	2015-03-06 10:02:04 -08:00
Bas Stottelaar	546099fa2d	Updated Changelog.md	2015-02-19 20:15:08 +01:00
Bas Stottelaar	c53fde6dca	Merge remote-tracking branch 'origin/master' into develop * origin/master: Release v0.5.4 Added API call getSnatched Potential fix for #2055	2015-02-19 20:12:49 +01:00
Jonny	c9aeefc67a	Update postprocessor.py Changed ID3 logging to debug	2015-02-19 19:24:35 +01:00
Jonny	37594d3384	Update postprocessor.py Set-up of beets config to match headphones config of ID3 tag version before writing metadata	2015-02-19 19:24:25 +01:00
Jonny	00dc5d8c38	Update config.py Added config option for ID3 tag version select	2015-02-19 19:24:18 +01:00
Jonny	ff8f6b1d00	Update webserve.py Added config option for ID3 tag version select Conflicts: headphones/webserve.py	2015-02-19 19:24:09 +01:00
Jonny	aa60ba1fb1	Update config.html Added option to select using ID3v2.3	2015-02-19 19:22:42 +01:00
Bas Stottelaar	3b8341f249	Merge pull request #2125 from drzoidberg33/develop Allow authentication on custom MusicBrainz servers	2015-02-19 14:06:29 +01:00
Tim	a68bcb6ee1	Fix condition that checks if we should disable custom MusicBrainz server authentication.	2015-02-19 11:48:10 +02:00
Tim	24a52a294c	Allow authentication on custom MusicBrainz servers using Basic HTTP Authentication.	2015-02-19 00:54:10 +02:00
Bas Stottelaar	03ea67b20b	Fix for #2119	2015-02-15 14:02:49 +01:00
Ade	4f20003f9a	Email part 2 small fix up	2015-02-06 21:37:41 +13:00
Ade	a92d13652d	Email notifications #1045	2015-02-06 20:28:57 +13:00
`@@ -1 +1,2 @@`
	`from musicbrainzngs.musicbrainz import *`	`from musicbrainzngs.musicbrainz import *`
		`from musicbrainzngs.caa import *`