Adjust log messages

pymedusa · Apr 25, 2016 · 50c1690 · 50c1690
1 parent ae97dd0
commit 50c1690
Show file tree

Hide file tree

Showing 43 changed files with 88 additions and 80 deletions.
diff --git a/sickbeard/providers/abnormal.py b/sickbeard/providers/abnormal.py
@@ -141,8 +141,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             # Filter unseeded torrent
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
-                                    logger.log('Discarding torrent because it doesn\'t meet the minimum seeders or leechers: {0} (S:{1} L:{2})'.format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                    logger.log('Discarding torrent because it doesn\'t meet the minimum seeders: {0}. Seeders: {1})'.format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             size_index = labels.index('Size') if 'Size' in labels else labels.index('Taille')

diff --git a/sickbeard/providers/alpharatio.py b/sickbeard/providers/alpharatio.py
@@ -155,8 +155,8 @@ def process_column_header(td):
                             if seeders < min(self.minseed, 1):
                                 if mode != "RSS":
                                     logger.log("Discarding torrent because it doesn't meet the"
-                                               " minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                               " minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             torrent_size = cells[labels.index("Size")].get_text(strip=True)

diff --git a/sickbeard/providers/bitcannon.py b/sickbeard/providers/bitcannon.py
@@ -96,8 +96,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                         if seeders < min(self.minseed, 1):
                             if mode != "RSS":
                                 logger.log("Discarding torrent because it doesn't meet the "
-                                           "minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                           (title, seeders, leechers), logger.DEBUG)
+                                           "minimum seeders: {0}. Seeders: {1})".format
+                                           (title, seeders), logger.DEBUG)
                             continue
 
                         size = convert_size(result.pop("size", -1)) or -1

diff --git a/sickbeard/providers/bitsnoop.py b/sickbeard/providers/bitsnoop.py
@@ -105,8 +105,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             # Filter unseeded torrent
                         if seeders < min(self.minseed, 1):
                             if mode != 'RSS':
-                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                           (title, seeders, leechers), logger.DEBUG)
+                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                           (title, seeders), logger.DEBUG)
                             continue
 
                         item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': info_hash}

diff --git a/sickbeard/providers/bitsoup.py b/sickbeard/providers/bitsoup.py
@@ -133,8 +133,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                 # Filter unseeded torrent
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
-                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             if seeders >= 32768 or leechers >= 32768:

diff --git a/sickbeard/providers/bluetigers.py b/sickbeard/providers/bluetigers.py
@@ -123,8 +123,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                 # Filter unseeded torrent
                                 # if seeders < min(self.minseed, 1):
                                 #    if mode != 'RSS':
-                                #        logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                #                   (title, seeders, leechers), logger.DEBUG)
+                                #        logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                #                   (title, seeders), logger.DEBUG)
                                 #    continue
 
                                 item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}

diff --git a/sickbeard/providers/btdigg.py b/sickbeard/providers/btdigg.py
@@ -104,8 +104,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                         if seeders < min(self.minseed, 1):
                             if mode != "RSS":
                                 logger.log("Discarding torrent because it doesn't meet the"
-                                           " minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                           (title, seeders, leechers), logger.DEBUG)
+                                           " minimum seeders: {0}. Seeders: {1})".format
+                                           (title, seeders), logger.DEBUG)
                                 continue                        
                         torrent_size = torrent.pop("size")
                         size = convert_size(torrent_size) or -1

diff --git a/sickbeard/providers/cpasbien.py b/sickbeard/providers/cpasbien.py
@@ -74,8 +74,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             leechers = try_int(result.find(class_="down").get_text(strip=True))
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
-                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             torrent_size = result.find(class_="poid").get_text(strip=True)

diff --git a/sickbeard/providers/danishbits.py b/sickbeard/providers/danishbits.py
@@ -151,8 +151,8 @@ def process_column_header(td):
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
                                     logger.log(u"Discarding torrent because it doesn't meet the"
-                                               u" minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                               u" minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             freeleech = result.find(class_='freeleech')

diff --git a/sickbeard/providers/elitetorrent.py b/sickbeard/providers/elitetorrent.py
@@ -119,8 +119,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             # Filter unseeded torrent
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
-                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}

diff --git a/sickbeard/providers/extratorrent.py b/sickbeard/providers/extratorrent.py
@@ -100,8 +100,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             # Filter unseeded torrent
                         if seeders < min(self.minseed, 1):
                             if mode != 'RSS':
-                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                           (title, seeders, leechers), logger.DEBUG)
+                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                           (title, seeders), logger.DEBUG)
                             continue
 
                         item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}

diff --git a/sickbeard/providers/freshontv.py b/sickbeard/providers/freshontv.py
@@ -214,8 +214,8 @@ def search(self, search_params, age=0, ep_obj=None):  # pylint: disable=too-many
                                 # Filter unseeded torrent
                                 if seeders < min(self.minseed, 1):
                                     if mode != 'RSS':
-                                        logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                                   (title, seeders, leechers), logger.DEBUG)
+                                        logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                                   (title, seeders), logger.DEBUG)
                                     continue
 
                                 item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}

diff --git a/sickbeard/providers/gftracker.py b/sickbeard/providers/gftracker.py
@@ -163,8 +163,8 @@ def process_column_header(td):
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
                                     logger.log(u"Discarding torrent because it doesn't meet the"
-                                               u" minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                               u" minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             torrent_size = cells[labels.index('Size/Snatched')].get_text(strip=True).split('/', 1)[0]

diff --git a/sickbeard/providers/hd4free.py b/sickbeard/providers/hd4free.py
@@ -107,8 +107,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                         leechers = jdata[i]["leechers"]
                         if seeders < min(self.minseed, 1):
                             if mode != 'RSS':
-                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                           (title, seeders, leechers), logger.DEBUG)
+                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                           (title, seeders), logger.DEBUG)
                             continue
 
                         torrent_size = str(jdata[i]["size"]) + ' MB'

diff --git a/sickbeard/providers/hdspace.py b/sickbeard/providers/hdspace.py
@@ -149,8 +149,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                         # Filter unseeded torrent
                         if seeders < min(self.minseed, 1):
                             if mode != 'RSS':
-                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                           (title, seeders, leechers), logger.DEBUG)
+                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                           (title, seeders), logger.DEBUG)
                             continue
 
                         item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}

diff --git a/sickbeard/providers/hdtorrents.py b/sickbeard/providers/hdtorrents.py
@@ -160,8 +160,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                         # Filter unseeded torrent
                         if seeders < min(self.minseed, 1):
                             if mode != 'RSS':
-                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                           (title, seeders, leechers), logger.DEBUG)
+                                logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                           (title, seeders), logger.DEBUG)
                             continue
 
                         item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}

diff --git a/sickbeard/providers/hounddawgs.py b/sickbeard/providers/hounddawgs.py
@@ -165,8 +165,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             # Filter unseeded torrent
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
-                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}

diff --git a/sickbeard/providers/ilovetorrents.py b/sickbeard/providers/ilovetorrents.py
@@ -142,8 +142,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             # Filter unseeded torrent
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
-                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
                             #Use same failsafe as Bitsoup
                             if seeders >= 32768 or leechers >= 32768:

diff --git a/sickbeard/providers/iptorrents.py b/sickbeard/providers/iptorrents.py
@@ -144,8 +144,8 @@ def search(self, search_params, age=0, ep_obj=None):  # pylint: disable=too-many
                             # Filter unseeded torrent
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
-                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                    logger.log(u"Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}

diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py
@@ -109,8 +109,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             # Filter unseeded torrent
                             if seeders < min(self.minseed, 1):
                                 if mode != "RSS":
-                                    logger.log("Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                    logger.log("Discarding torrent because it doesn't meet the minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             verified = bool(try_int(item.find("torrent:verified").get_text(strip=True)))

diff --git a/sickbeard/providers/limetorrents.py b/sickbeard/providers/limetorrents.py
@@ -109,8 +109,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
                                     logger.log('Discarding torrent because it doesn\'t meet the minimum '
-                                               'seeders or leechers: {0} (S:{1} L:{2})'.format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                               'seeders or leechers: {0}. Seeders: {1})'.format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             item = {

diff --git a/sickbeard/providers/morethantv.py b/sickbeard/providers/morethantv.py
@@ -165,8 +165,8 @@ def process_column_header(td):
                             if seeders < min(self.minseed, 1):
                                 if mode != 'RSS':
                                     logger.log(u"Discarding torrent because it doesn't meet the"
-                                               u" minimum seeders or leechers: {0} (S:{1} L:{2})".format
-                                               (title, seeders, leechers), logger.DEBUG)
+                                               u" minimum seeders: {0}. Seeders: {1})".format
+                                               (title, seeders), logger.DEBUG)
                                 continue
 
                             torrent_size = cells[labels.index('Size')].get_text(strip=True)

diff --git a/sickbeard/providers/norbits.py b/sickbeard/providers/norbits.py
@@ -118,8 +118,8 @@ def search(self, search_params, age=0, ep_obj=None):  # pylint: disable=too-many
 
                         if seeders < min(self.minseed, 1):
                             logger.log('Discarding torrent because it does not meet '
-                                       'the minimum seeders or leechers: {0} (S:{1} L:{2})'.format
-                                       (title, seeders, leechers), logger.DEBUG)
+                                       'the minimum seeders: {0}. Seeders: {1})'.format
+                                       (title, seeders), logger.DEBUG)
                             continue
 
                         info_hash = item.pop('info_hash', '')

diff --git a/sickbeard/providers/nyaatorrents.py b/sickbeard/providers/nyaatorrents.py
@@ -95,8 +95,8 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                         if seeders < min(self.minseed, 1):
                             if mode != 'RSS':
                                 logger.log('Discarding torrent because it doesn\'t meet the'
-                                           ' minimum seeders or leechers: {0} (S:{1} L:{2})'.format
-                                           (title, seeders, leechers), logger.DEBUG)
+                                           ' minimum seeders: {0}. Seeders: {1})'.format
+                                           (title, seeders), logger.DEBUG)
                             continue
 
                         if self.confirmed and not verified and mode != 'RSS':