From e11453aafb1fb03374007dfdd63a048293d27568 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 24 Feb 2014 21:59:45 +0000 Subject: [PATCH 1/7] SSL'd and Updated Add SSL to some URL's and update the Apple RSS link. --- couchpotato/core/providers/automation/goodfilms/main.py | 2 +- couchpotato/core/providers/automation/itunes/main.py | 2 +- couchpotato/core/providers/nzb/nzbclub/main.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/couchpotato/core/providers/automation/goodfilms/main.py b/couchpotato/core/providers/automation/goodfilms/main.py index c4a7bd91..e668a4fb 100644 --- a/couchpotato/core/providers/automation/goodfilms/main.py +++ b/couchpotato/core/providers/automation/goodfilms/main.py @@ -7,7 +7,7 @@ log = CPLog(__name__) class Goodfilms(Automation): - url = 'http://goodfil.ms/%s/queue?page=%d&without_layout=1' + url = 'https://goodfil.ms/%s/queue?page=%d&without_layout=1' interval = 1800 diff --git a/couchpotato/core/providers/automation/itunes/main.py b/couchpotato/core/providers/automation/itunes/main.py index 76763244..086c981d 100644 --- a/couchpotato/core/providers/automation/itunes/main.py +++ b/couchpotato/core/providers/automation/itunes/main.py @@ -22,7 +22,7 @@ class ITunes(Automation, RSS): urls = splitString(self.conf('automation_urls')) namespace = 'http://www.w3.org/2005/Atom' - namespace_im = 'http://itunes.apple.com/rss' + namespace_im = 'https://rss.itunes.apple.com' index = -1 for url in urls: diff --git a/couchpotato/core/providers/nzb/nzbclub/main.py b/couchpotato/core/providers/nzb/nzbclub/main.py index 5c151dc4..643f247d 100644 --- a/couchpotato/core/providers/nzb/nzbclub/main.py +++ b/couchpotato/core/providers/nzb/nzbclub/main.py @@ -13,7 +13,7 @@ log = CPLog(__name__) class NZBClub(NZBProvider, RSS): urls = { - 'search': 'http://www.nzbclub.com/nzbfeeds.aspx?%s', + 'search': 'https://www.nzbclub.com/nzbfeeds.aspx?%s', } http_time_between_calls = 4 #seconds From 864e8654c3ded40c8b8987f5308b82db2d246727 Mon Sep 17 00:00:00 2001 From: tehspede Date: Tue, 25 Feb 2014 18:29:51 +0200 Subject: [PATCH 2/7] Search url has method defined twice (2 and 3) we only want 3. --- couchpotato/core/providers/torrent/sceneaccess/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/providers/torrent/sceneaccess/main.py b/couchpotato/core/providers/torrent/sceneaccess/main.py index 355aacfa..c1c871ee 100644 --- a/couchpotato/core/providers/torrent/sceneaccess/main.py +++ b/couchpotato/core/providers/torrent/sceneaccess/main.py @@ -15,7 +15,7 @@ class SceneAccess(TorrentProvider): 'login': 'https://www.sceneaccess.eu/login', 'login_check': 'https://www.sceneaccess.eu/inbox', 'detail': 'https://www.sceneaccess.eu/details?id=%s', - 'search': 'https://www.sceneaccess.eu/browse?method=2&c%d=%d', + 'search': 'https://www.sceneaccess.eu/browse?c%d=%d', 'download': 'https://www.sceneaccess.eu/%s', } From ed62c981cc4f0bde299529b382e84504a5f5c47d Mon Sep 17 00:00:00 2001 From: Ruud Date: Tue, 25 Feb 2014 22:04:43 +0100 Subject: [PATCH 3/7] Add quality tests --- couchpotato/core/plugins/quality/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/couchpotato/core/plugins/quality/main.py b/couchpotato/core/plugins/quality/main.py index d56ff89f..80773a84 100644 --- a/couchpotato/core/plugins/quality/main.py +++ b/couchpotato/core/plugins/quality/main.py @@ -316,6 +316,8 @@ class QualityPlugin(Plugin): 'Movie.Name.1999.DVD-Rip-Group': 'dvdrip', 'Movie.Name.1999.DVD-R-Group': 'dvdr', 'Movie.Name.Camelie.1999.720p.BluRay.x264-Group': '720p', + 'Movie.Name.2008.German.DL.AC3.1080p.BluRay.x264-Group': '1080p', + 'Movie.Name.2004.GERMAN.AC3D.DL.1080p.BluRay.x264-Group': '1080p', } correct = 0 From 9056f5ae59dfde6a479d2b962b869647043f9ba3 Mon Sep 17 00:00:00 2001 From: Dean Gardiner Date: Wed, 26 Feb 2014 14:52:10 +1300 Subject: [PATCH 4/7] Fixed naming issue in rtorrent downloader --- couchpotato/core/downloaders/rtorrent/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/downloaders/rtorrent/main.py b/couchpotato/core/downloaders/rtorrent/main.py index c5850f93..08d34213 100755 --- a/couchpotato/core/downloaders/rtorrent/main.py +++ b/couchpotato/core/downloaders/rtorrent/main.py @@ -87,7 +87,7 @@ class rTorrent(Downloader): return False - def _update_provider_group(self, name, data): + def updateProviderGroup(self, name, data): if data.get('seed_time'): log.info('seeding time ignored, not supported') From 651119b7dd7c312b584a07834bff1cd09b2a38f0 Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Fri, 28 Feb 2014 17:35:08 +0000 Subject: [PATCH 5/7] replaced a duplicate URL replaced a duplicate URL. --- couchpotato/core/providers/torrent/thepiratebay/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/providers/torrent/thepiratebay/main.py b/couchpotato/core/providers/torrent/thepiratebay/main.py index c366c517..6ef5123a 100644 --- a/couchpotato/core/providers/torrent/thepiratebay/main.py +++ b/couchpotato/core/providers/torrent/thepiratebay/main.py @@ -37,7 +37,7 @@ class ThePirateBay(TorrentMagnetProvider): 'http://nl.tpb.li', 'http://proxybay.eu', 'https://www.getpirate.com', - 'http://pirateproxy.ca', + 'http://piratebay.io', ] def _searchOnTitle(self, title, movie, quality, results): From cfb246fa8413ec98ee08a936822500a5216cb3ff Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 3 Mar 2014 22:11:59 +0100 Subject: [PATCH 6/7] Make sure imdb rating exists before using it --- couchpotato/core/media/movie/suggestion/static/suggest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/couchpotato/core/media/movie/suggestion/static/suggest.js b/couchpotato/core/media/movie/suggestion/static/suggest.js index cb09ef4a..c4e5630a 100644 --- a/couchpotato/core/media/movie/suggestion/static/suggest.js +++ b/couchpotato/core/media/movie/suggestion/static/suggest.js @@ -101,7 +101,7 @@ var SuggestList = new Class({ // Add rating m.info_container.adopt( - m.rating = m.info.rating && m.info.rating.imdb.length == 2 && parseFloat(m.info.rating.imdb[0]) > 0 ? new Element('span.rating', { + m.rating = m.info.rating && m.info.rating.imdb && m.info.rating.imdb.length == 2 && parseFloat(m.info.rating.imdb[0]) > 0 ? new Element('span.rating', { 'text': parseFloat(m.info.rating.imdb[0]), 'title': parseInt(m.info.rating.imdb[1]) + ' votes' }) : null, From 22e922e8602411a016aee6b195707e6b6b47ee13 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 3 Mar 2014 23:34:49 +0100 Subject: [PATCH 7/7] Split socket error to nr --- CouchPotato.py | 1 + 1 file changed, 1 insertion(+) diff --git a/CouchPotato.py b/CouchPotato.py index e73ed9a5..375a1d41 100755 --- a/CouchPotato.py +++ b/CouchPotato.py @@ -136,6 +136,7 @@ if __name__ == '__main__': except socket.error as e: # log when socket receives SIGINT, but continue. # previous code would have skipped over other types of IO errors too. + nr, msg = e if nr != 4: try: l.log.critical(traceback.format_exc())