Add 'pubdate' and 'hash' to cache (#485)

* Add pubdate to cache * Add pubdate to providers * Add hash to cache * Doc strings
pymedusa · Apr 27, 2016 · 40c6015 · 40c6015
1 parent 28f3412
commit 40c6015
Show file tree

Hide file tree

Showing 51 changed files with 149 additions and 52 deletions.
diff --git a/sickbeard/classes.py b/sickbeard/classes.py
@@ -68,6 +68,9 @@ def __init__(self, episodes):
         # leechers of the release
         self.leechers = -1
 
+        # release publish date
+        self.pubdate = None
+
         # release group
         self.release_group = u''
 
@@ -206,7 +209,7 @@ def selectSeries(allSeries):
 
 
 class Proper(object):
-    def __init__(self, name, url, date, show, seeders, leechers, size):
+    def __init__(self, name, url, date, show, seeders, leechers, size, pubdate, hash):
         self.name = name
         self.url = url
         self.date = date
@@ -217,6 +220,8 @@ def __init__(self, name, url, date, show, seeders, leechers, size):
         self.seeders = seeders
         self.leechers = leechers
         self.size = size
+        self.pubdate = pubdate
+        self.hash = hash
         self.show = show
         self.indexer = None
         self.indexerid = -1

diff --git a/sickbeard/properFinder.py b/sickbeard/properFinder.py
@@ -310,6 +310,8 @@ def _downloadPropers(self, properList):
                 result.seeders = curProper.seeders
                 result.leechers = curProper.leechers
                 result.size = curProper.size
+                result.pubdate = curProper.pubdate
+                result.hash = curProper.hash
 
                 # snatch it
                 snatchEpisode(result, SNATCHED_PROPER)

diff --git a/sickbeard/providers/abnormal.py b/sickbeard/providers/abnormal.py
@@ -149,7 +149,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             torrent_size = cells[size_index].get_text()
                             size = convert_size(torrent_size, units=units) or -1
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log('Found result: {0} with {1} seeders and {2} leechers'.format
                                            (title, seeders, leechers), logger.DEBUG)

diff --git a/sickbeard/providers/alpharatio.py b/sickbeard/providers/alpharatio.py
@@ -162,7 +162,7 @@ def process_column_header(td):
                             torrent_size = cells[labels.index("Size")].get_text(strip=True)
                             size = convert_size(torrent_size, units=units) or -1
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != "RSS":
                                 logger.log("Found result: {0} with {1} seeders and {2} leechers".format
                                            (title, seeders, leechers), logger.DEBUG)

diff --git a/sickbeard/providers/bitcannon.py b/sickbeard/providers/bitcannon.py
@@ -101,7 +101,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             continue
 
                         size = convert_size(result.pop("size", -1)) or -1
-                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                         if mode != "RSS":
                             logger.log("Found result: {0} with {1} seeders and {2} leechers".format
                                        (title, seeders, leechers), logger.DEBUG)

diff --git a/sickbeard/providers/bitsnoop.py b/sickbeard/providers/bitsnoop.py
@@ -109,7 +109,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                            (title, seeders), logger.DEBUG)
                             continue
 
-                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': info_hash}
+                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': info_hash}
                         if mode != 'RSS':
                             logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/bitsoup.py b/sickbeard/providers/bitsoup.py
@@ -140,7 +140,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             if seeders >= 32768 or leechers >= 32768:
                                 continue
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/bluetigers.py b/sickbeard/providers/bluetigers.py
@@ -127,7 +127,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                 #                   (title, seeders), logger.DEBUG)
                                 #    continue
 
-                                item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                                item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                                 if mode != 'RSS':
                                     logger.log(u"Found result: %s " % title, logger.DEBUG)
 

diff --git a/sickbeard/providers/btdigg.py b/sickbeard/providers/btdigg.py
@@ -110,7 +110,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                         torrent_size = torrent.pop("size")
                         size = convert_size(torrent_size) or -1
 
-                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                         if mode != "RSS":
                             logger.log("Found result: %s " % title, logger.DEBUG)
 

diff --git a/sickbeard/providers/cpasbien.py b/sickbeard/providers/cpasbien.py
@@ -83,7 +83,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             units = ['o', 'Ko', 'Mo', 'Go', 'To', 'Po']
                             size = convert_size(torrent_size, units=units) or -1
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/danishbits.py b/sickbeard/providers/danishbits.py
@@ -162,7 +162,7 @@ def process_column_header(td):
                             torrent_size = cells[labels.index('Størrelse')].contents[0]
                             size = convert_size(torrent_size, units=units) or -1
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: {0} with {1} seeders and {2} leechers".format
                                            (title, seeders, leechers), logger.DEBUG)

diff --git a/sickbeard/providers/elitetorrent.py b/sickbeard/providers/elitetorrent.py
@@ -123,7 +123,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                                (title, seeders), logger.DEBUG)
                                 continue
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/extratorrent.py b/sickbeard/providers/extratorrent.py
@@ -104,7 +104,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                            (title, seeders), logger.DEBUG)
                             continue
 
-                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                         if mode != 'RSS':
                             logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/freshontv.py b/sickbeard/providers/freshontv.py
@@ -218,7 +218,7 @@ def search(self, search_params, age=0, ep_obj=None):  # pylint: disable=too-many
                                                    (title, seeders), logger.DEBUG)
                                     continue
 
-                                item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                                item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                                 if mode != 'RSS':
                                     logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/gftracker.py b/sickbeard/providers/gftracker.py
@@ -170,7 +170,7 @@ def process_column_header(td):
                             torrent_size = cells[labels.index('Size/Snatched')].get_text(strip=True).split('/', 1)[0]
                             size = convert_size(torrent_size, units=units) or -1
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: {0} with {1} seeders and {2} leechers".format
                                            (title, seeders, leechers), logger.DEBUG)

diff --git a/sickbeard/providers/hd4free.py b/sickbeard/providers/hd4free.py
@@ -113,7 +113,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
 
                         torrent_size = str(jdata[i]["size"]) + ' MB'
                         size = convert_size(torrent_size) or -1
-                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
 
                         if mode != 'RSS':
                             logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)

diff --git a/sickbeard/providers/hdspace.py b/sickbeard/providers/hdspace.py
@@ -153,7 +153,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                            (title, seeders), logger.DEBUG)
                             continue
 
-                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                         if mode != 'RSS':
                             logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/hdtorrents.py b/sickbeard/providers/hdtorrents.py
@@ -164,7 +164,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                            (title, seeders), logger.DEBUG)
                             continue
 
-                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                         if mode != 'RSS':
                             logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/hounddawgs.py b/sickbeard/providers/hounddawgs.py
@@ -169,7 +169,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                                (title, seeders), logger.DEBUG)
                                 continue
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/ilovetorrents.py b/sickbeard/providers/ilovetorrents.py
@@ -149,7 +149,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             if seeders >= 32768 or leechers >= 32768:
                                 continue
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: {0} with {1} seeders and {2} leechers".format(title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/iptorrents.py b/sickbeard/providers/iptorrents.py
@@ -148,7 +148,7 @@ def search(self, search_params, age=0, ep_obj=None):  # pylint: disable=too-many
                                                (title, seeders), logger.DEBUG)
                                 continue
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py
@@ -123,7 +123,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             size = convert_size(torrent_size) or -1
                             info_hash = item.find("torrent:infohash").get_text(strip=True)
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': info_hash}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': info_hash}
                             if mode != "RSS":
                                 logger.log("Found result: %s with %s seeders and %s leechers" % (title, seeders, leechers), logger.DEBUG)
 

diff --git a/sickbeard/providers/limetorrents.py b/sickbeard/providers/limetorrents.py
@@ -125,6 +125,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                                 'size': size,
                                 'seeders': seeders,
                                 'leechers': leechers,
+                                'pubdate': None,
                                 'hash': torrent_hash or ''
                             }
 

diff --git a/sickbeard/providers/morethantv.py b/sickbeard/providers/morethantv.py
@@ -172,7 +172,7 @@ def process_column_header(td):
                             torrent_size = cells[labels.index('Size')].get_text(strip=True)
                             size = convert_size(torrent_size, units=units) or -1
 
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log(u"Found result: {0} with {1} seeders and {2} leechers".format
                                            (title, seeders, leechers), logger.DEBUG)

diff --git a/sickbeard/providers/newpct.py b/sickbeard/providers/newpct.py
@@ -117,7 +117,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             torrent_size = cells[labels.index('Tamaño')].get_text(strip=True)
 
                             size = convert_size(torrent_size) or -1
-                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': None}
+                            item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             if mode != 'RSS':
                                 logger.log('Found result: {}'.format(title), logger.DEBUG)
 

diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py
@@ -371,7 +371,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
 
                             size = convert_size(item_size) or -1
 
-                            result = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers}
+                            result = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                             items.append(result)
                         except StandardError:
                             continue

diff --git a/sickbeard/providers/norbits.py b/sickbeard/providers/norbits.py
@@ -125,7 +125,7 @@ def search(self, search_params, age=0, ep_obj=None):  # pylint: disable=too-many
                         info_hash = item.pop('info_hash', '')
                         size = convert_size(item.pop('size', -1), -1)
 
-                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': info_hash}
+                        item = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': info_hash}
                         if mode != 'RSS':
                             logger.log('Found result: {0} with {1} seeders and {2} leechers'.format(
                                 title, seeders, leechers), logger.DEBUG)

diff --git a/sickbeard/providers/nyaatorrents.py b/sickbeard/providers/nyaatorrents.py
@@ -105,7 +105,7 @@ def search(self, search_strings, age=0, ep_obj=None):  # pylint: disable=too-man
                             continue
 
                         size = convert_size(torrent_size) or -1
-                        result = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers}
+                        result = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'pubdate': None, 'hash': None}
                         if mode != 'RSS':
                             logger.log('Found result: {0} with {1} seeders and {2} leechers'.format
                                        (title, seeders, leechers), logger.DEBUG)