From 5c4641c13015c8b316a1ccfaaa406f03b4eb6c8c Mon Sep 17 00:00:00 2001 From: Remy Date: Tue, 2 Aug 2011 00:23:58 -0700 Subject: [PATCH] Newzbin url fix, post-processor bug fix for folders with an underscore --- headphones/mb.py | 4 +++- headphones/postprocessor.py | 3 ++- headphones/searcher.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/headphones/mb.py b/headphones/mb.py index e0dd2ee6..72cb4c8b 100644 --- a/headphones/mb.py +++ b/headphones/mb.py @@ -372,7 +372,9 @@ def findArtistbyAlbum(name): def findAlbumID(artist=None, album=None): - term = '"'+album+'" AND artist:"'+artist+'"' + + + term = album + '" AND artist:"'+artist+'"' f = ws.ReleaseGroupFilter(query=term, limit=1) results = None diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index 8d23df2a..a4651703 100644 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -377,10 +377,11 @@ def forcePostProcess(): logger.info('Querying MusicBrainz for the release group id for: %s - %s' % (name, album)) from headphones import mb try: - rgid = unicode(mb.findAlbumID(name, album)) + rgid = mb.findAlbumID(name, album) except: logger.error('Can not get release information for this album') if rgid: + rgid = unicode(rgid) verify(rgid, albumpath) \ No newline at end of file diff --git a/headphones/searcher.py b/headphones/searcher.py index 5fabc701..998f3404 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -237,7 +237,7 @@ def searchNZB(albumid=None, new=False): if headphones.NEWZBIN: provider = "newzbin" - providerurl = "https:/www.newzbin.com/" + providerurl = "https://www.newzbin.com/" if headphones.PREFERRED_QUALITY == 3: categories = "7" #music format = "2" #flac