From d1f26d59e0a03def576744f45ede2635fd104ad3 Mon Sep 17 00:00:00 2001 From: Remy Date: Mon, 8 Aug 2011 01:49:36 -0700 Subject: [PATCH] Cleaned up some logging in the searcher.py --- headphones/searcher.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/headphones/searcher.py b/headphones/searcher.py index cf143672..93b711ad 100644 --- a/headphones/searcher.py +++ b/headphones/searcher.py @@ -115,7 +115,7 @@ def searchNZB(albumid=None, new=False): } searchURL = "http://rss.nzbmatrix.com/rss.php?" + urllib.urlencode(params) - logger.debug(u'Parsing results from NZBMatrix' % searchURL) + logger.info(u'Parsing results from NZBMatrix' % searchURL) try: data = urllib2.urlopen(searchURL, timeout=20).read() except urllib2.URLError, e: @@ -161,7 +161,7 @@ def searchNZB(albumid=None, new=False): searchURL = headphones.NEWZNAB_HOST + '/api?' + urllib.urlencode(params) - logger.debug(u'Parsing results from %s' % (searchURL, headphones.NEWZNAB_HOST)) + logger.info(u'Parsing results from %s' % (searchURL, headphones.NEWZNAB_HOST)) try: data = urllib2.urlopen(searchURL, timeout=20).read() @@ -215,7 +215,7 @@ def searchNZB(albumid=None, new=False): } searchURL = 'https://secure.nzbs.org/rss.php?' + urllib.urlencode(params) - logger.debug(u'Parsing results from %s' % (searchURL, provider)) + logger.info(u'Parsing results from %s' % (searchURL, provider)) try: data = urllib2.urlopen(searchURL, timeout=20).read() @@ -293,7 +293,7 @@ def searchNZB(albumid=None, new=False): searchURL = providerurl + "search/?%s" % urllib.urlencode(params) data = getNewzbinURL(searchURL) if data: - logger.debug(u'Parsing results from %s' % (searchURL, providerurl)) + logger.info(u'Parsing results from %s' % (searchURL, providerurl)) try: d = minidom.parseString(data) @@ -350,7 +350,7 @@ def searchNZB(albumid=None, new=False): try: albumlength = sum([pair[0] for pair in tracks]) - logger.debug('Album length = %s' % albumlength) + targetsize = albumlength/1000 * int(headphones.PREFERRED_BITRATE) * 128 logger.info('Target size: %s' % helpers.bytes_to_mb(targetsize)) @@ -440,7 +440,7 @@ def searchNZB(albumid=None, new=False): linkparams["nzbname"] = nzb_folder_name saburl = 'http://' + headphones.SAB_HOST + '/sabnzbd/api?' + urllib.urlencode(linkparams) - logger.debug(u"Sending link to SABNZBD: " + saburl) + logger.info(u'Sending link to SABNZBD: SabNZBD link' % saburl) try: urllib.urlopen(saburl)