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()) diff --git a/couchpotato/core/downloaders/rtorrent/main.py b/couchpotato/core/downloaders/rtorrent/main.py index c4cb0fd6..79ab9482 100755 --- a/couchpotato/core/downloaders/rtorrent/main.py +++ b/couchpotato/core/downloaders/rtorrent/main.py @@ -88,7 +88,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') 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, diff --git a/couchpotato/core/plugins/quality/main.py b/couchpotato/core/plugins/quality/main.py index 345da394..96a22f40 100644 --- a/couchpotato/core/plugins/quality/main.py +++ b/couchpotato/core/plugins/quality/main.py @@ -302,6 +302,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 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 56138b17..75f99ed6 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 diff --git a/couchpotato/core/providers/torrent/sceneaccess/main.py b/couchpotato/core/providers/torrent/sceneaccess/main.py index 8db1b4ef..fd8a2bed 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', } diff --git a/couchpotato/core/providers/torrent/thepiratebay/main.py b/couchpotato/core/providers/torrent/thepiratebay/main.py index e355813b..61f12ad1 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):