dinislage/CouchPotatoServer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logging fixes

Browse Source
This commit is contained in:
Ruud committed 2013-05-17 17:51:15 +02:00
1 parent 1c2b3d063b
commit 5aa29acbd3
7 files changed
+16 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

couchpotato/core/logger.py
-1
View File
@@ -1,6 +1,5 @@
import logging import logging
import re import re
import traceback
class CPLog(object): class CPLog(object):
couchpotato/core/plugins/scanner/main.py
+1 -1
View File
@@ -336,7 +336,7 @@ class Scanner(Plugin):
break break
if return_ignored is False and identifier in ignored_identifiers: if return_ignored is False and identifier in ignored_identifiers:
log.debug('Ignore file found, ignoring release: %s' % identifier) log.debug('Ignore file found, ignoring release: %s', identifier)
continue continue
# Group extra (and easy) files first # Group extra (and easy) files first
couchpotato/core/plugins/searcher/main.py
+3 -3
View File
@@ -392,7 +392,7 @@ class Searcher(Plugin):
req_match += len(list(set(nzb_words) & set(req))) == len(req) req_match += len(list(set(nzb_words) & set(req))) == len(req)
if self.conf('required_words') and req_match == 0: if self.conf('required_words') and req_match == 0:
log.info2("Wrong: Required word missing: %s" % nzb['name']) log.info2('Wrong: Required word missing: %s', nzb['name'])
return False return False
# Ignore releases # Ignore releases
@@ -403,7 +403,7 @@ class Searcher(Plugin):
ignored_match += len(list(set(nzb_words) & set(ignored))) == len(ignored) ignored_match += len(list(set(nzb_words) & set(ignored))) == len(ignored)
if self.conf('ignored_words') and ignored_match: if self.conf('ignored_words') and ignored_match:
log.info2("Wrong: '%s' contains 'ignored words'" % (nzb['name'])) log.info2("Wrong: '%s' contains 'ignored words'", (nzb['name']))
return False return False
# Ignore porn stuff # Ignore porn stuff
@@ -462,7 +462,7 @@ class Searcher(Plugin):
if len(movie_words) <= 2 and self.correctYear([nzb['name']], movie['library']['year'], 0): if len(movie_words) <= 2 and self.correctYear([nzb['name']], movie['library']['year'], 0):
return True return True
log.info("Wrong: %s, undetermined naming. Looking for '%s (%s)'" % (nzb['name'], movie_name, movie['library']['year'])) log.info("Wrong: %s, undetermined naming. Looking for '%s (%s)'", (nzb['name'], movie_name, movie['library']['year']))
return False return False
def containsOtherQuality(self, nzb, movie_year = None, preferred_quality = {}): def containsOtherQuality(self, nzb, movie_year = None, preferred_quality = {}):
couchpotato/core/providers/automation/base.py
+2 -2
View File
@@ -74,13 +74,13 @@ class Automation(Provider):
req_match += len(list(set(movie_genres) & set(req))) == len(req) req_match += len(list(set(movie_genres) & set(req))) == len(req)
if self.getMinimal('required_genres') and req_match == 0: if self.getMinimal('required_genres') and req_match == 0:
log.info2("Required genre(s) missing for %s" % movie['original_title']) log.info2('Required genre(s) missing for %s', movie['original_title'])
return False return False
for ign_set in ignored_genres: for ign_set in ignored_genres:
ign = splitString(ign_set, '&') ign = splitString(ign_set, '&')
if len(list(set(movie_genres) & set(ign))) == len(ign): if len(list(set(movie_genres) & set(ign))) == len(ign):
log.info2("%s has blacklisted genre(s): %s" % (movie['original_title'], ign)) log.info2('%s has blacklisted genre(s): %s', (movie['original_title'], ign))
return False return False
return True return True
couchpotato/core/providers/automation/rottentomatoes/main.py
+2 -2
View File
@@ -35,10 +35,10 @@ class Rottentomatoes(Automation, RSS):
name = result.group(0) name = result.group(0)
if rating < tryInt(self.conf('tomatometer_percent')): if rating < tryInt(self.conf('tomatometer_percent')):
log.info2('%s seems to be rotten...' % name) log.info2('%s seems to be rotten...', name)
else: else:
log.info2('Found %s fresh enough movies, enqueuing: %s' % (rating, name)) log.info2('Found %s fresh enough movies, enqueuing: %s', (rating, name))
year = datetime.datetime.now().strftime("%Y") year = datetime.datetime.now().strftime("%Y")
imdb = self.search(name, year) imdb = self.search(name, year)
couchpotato/core/providers/base.py
+1 -1
View File
@@ -179,7 +179,7 @@ class YarrProvider(Provider):
if hostname in download_url: if hostname in download_url:
return self return self
except: except:
log.debug('Url % s doesn\'t belong to %s', (url, self.getName())) log.debug('Url %s doesn\'t belong to %s', (url, self.getName()))
return return
couchpotato/core/providers/torrent/passthepopcorn/main.py
+7 -7
View File
@@ -58,7 +58,7 @@ class PassThePopcorn(TorrentProvider):
class PTPHTTPRedirectHandler(urllib2.HTTPRedirectHandler): class PTPHTTPRedirectHandler(urllib2.HTTPRedirectHandler):
def http_error_302(self, req, fp, code, msg, headers): def http_error_302(self, req, fp, code, msg, headers):
log.debug("302 detected; redirected to %s" % headers['Location']) log.debug("302 detected; redirected to %s", headers['Location'])
if (headers['Location'] != 'login.php'): if (headers['Location'] != 'login.php'):
return urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers) return urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
else: else:
@@ -84,7 +84,7 @@ class PassThePopcorn(TorrentProvider):
txt = self.urlopen(url, opener = self.login_opener) txt = self.urlopen(url, opener = self.login_opener)
res = json.loads(txt) res = json.loads(txt)
except: except:
log.error('Search on PassThePopcorn.me (%s) failed (could not decode JSON)' % params) log.error('Search on PassThePopcorn.me (%s) failed (could not decode JSON)', params)
return return
try: try:
@@ -96,10 +96,10 @@ class PassThePopcorn(TorrentProvider):
for ptpmovie in res['Movies']: for ptpmovie in res['Movies']:
if not 'Torrents' in ptpmovie: if not 'Torrents' in ptpmovie:
log.debug('Movie %s (%s) has NO torrents' % (ptpmovie['Title'], ptpmovie['Year'])) log.debug('Movie %s (%s) has NO torrents', (ptpmovie['Title'], ptpmovie['Year']))
continue continue
log.debug('Movie %s (%s) has %d torrents' % (ptpmovie['Title'], ptpmovie['Year'], len(ptpmovie['Torrents']))) log.debug('Movie %s (%s) has %d torrents', (ptpmovie['Title'], ptpmovie['Year'], len(ptpmovie['Torrents'])))
for torrent in ptpmovie['Torrents']: for torrent in ptpmovie['Torrents']:
torrent_id = tryInt(torrent['Id']) torrent_id = tryInt(torrent['Id'])
torrentdesc = '%s %s %s' % (torrent['Resolution'], torrent['Source'], torrent['Codec']) torrentdesc = '%s %s %s' % (torrent['Resolution'], torrent['Source'], torrent['Codec'])
@@ -151,7 +151,7 @@ class PassThePopcorn(TorrentProvider):
try: try:
response = opener.open(self.urls['login'], self.getLoginParams()) response = opener.open(self.urls['login'], self.getLoginParams())
except urllib2.URLError as e: except urllib2.URLError as e:
log.error('Login to PassThePopcorn failed: %s' % e) log.error('Login to PassThePopcorn failed: %s', e)
return False return False
if response.getcode() == 200: if response.getcode() == 200:
@@ -159,7 +159,7 @@ class PassThePopcorn(TorrentProvider):
self.login_opener = opener self.login_opener = opener
return True return True
else: else:
log.error('Login to PassThePopcorn failed: returned code %d' % response.getcode()) log.error('Login to PassThePopcorn failed: returned code %d', response.getcode())
return False return False
def torrentMeetsQualitySpec(self, torrent, quality): def torrentMeetsQualitySpec(self, torrent, quality):
@@ -172,7 +172,7 @@ class PassThePopcorn(TorrentProvider):
seen_one = False seen_one = False
if not field in torrent: if not field in torrent:
log.debug('Torrent with ID %s has no field "%s"; cannot apply post-search-filter for quality "%s"' % (torrent['Id'], field, quality)) log.debug('Torrent with ID %s has no field "%s"; cannot apply post-search-filter for quality "%s"', (torrent['Id'], field, quality))
continue continue
for spec in specs: for spec in specs: