diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py index 9f0412a4..182a0310 100644 --- a/couchpotato/core/providers/base.py +++ b/couchpotato/core/providers/base.py @@ -275,7 +275,7 @@ class ResultList(list): 'id': 0, 'type': self.provider.type, 'provider': self.provider.getName(), - 'download': self.provider.download, + 'download': self.provider.loginDownload if self.provider.urls.get('login') else self.provider.download, 'url': '', 'name': '', 'age': 0, diff --git a/couchpotato/core/providers/nzb/ftdworld/main.py b/couchpotato/core/providers/nzb/ftdworld/main.py index 340dac14..9940cee6 100644 --- a/couchpotato/core/providers/nzb/ftdworld/main.py +++ b/couchpotato/core/providers/nzb/ftdworld/main.py @@ -59,7 +59,6 @@ class FTDWorld(NZBProvider): 'age': self.calculateAge(tryInt(item.get('Created'))), 'size': item.get('Size', 0), 'url': self.urls['download'] % nzb_id, - 'download': self.loginDownload, 'detail_url': self.urls['detail'] % nzb_id, 'score': (tryInt(item.get('webPlus', 0)) - tryInt(item.get('webMin', 0))) * 3, }) diff --git a/couchpotato/core/providers/torrent/iptorrents/main.py b/couchpotato/core/providers/torrent/iptorrents/main.py index c95b1546..b668747d 100644 --- a/couchpotato/core/providers/torrent/iptorrents/main.py +++ b/couchpotato/core/providers/torrent/iptorrents/main.py @@ -74,7 +74,6 @@ class IPTorrents(TorrentProvider): 'name': torrent_name, 'url': torrent_download_url, 'detail_url': torrent_details_url, - 'download': self.loginDownload, 'size': torrent_size, 'seeders': torrent_seeders, 'leechers': torrent_leechers, diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py index 0d6e5f09..42df76c8 100644 --- a/couchpotato/core/providers/torrent/passthepopcorn/main.py +++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py @@ -116,7 +116,6 @@ class PassThePopcorn(TorrentProvider): 'leechers': tryInt(torrent['Leechers']), 'score': torrentscore, 'extra_check': extra_check, - 'download': self.loginDownload, }) except: diff --git a/couchpotato/core/providers/torrent/sceneaccess/main.py b/couchpotato/core/providers/torrent/sceneaccess/main.py index 46d4ea46..b2d3dd68 100644 --- a/couchpotato/core/providers/torrent/sceneaccess/main.py +++ b/couchpotato/core/providers/torrent/sceneaccess/main.py @@ -67,7 +67,6 @@ class SceneAccess(TorrentProvider): 'size': self.parseSize(result.find('td', attrs = {'class' : 'ttr_size'}).contents[0]), 'seeders': tryInt(result.find('td', attrs = {'class' : 'ttr_seeders'}).find('a').string), 'leechers': tryInt(leechers.string) if leechers else 0, - 'download': self.loginDownload, 'get_more_info': self.getMoreInfo, }) diff --git a/couchpotato/core/providers/torrent/scenehd/main.py b/couchpotato/core/providers/torrent/scenehd/main.py index b7d5b924..f471ec0c 100644 --- a/couchpotato/core/providers/torrent/scenehd/main.py +++ b/couchpotato/core/providers/torrent/scenehd/main.py @@ -58,7 +58,6 @@ class SceneHD(TorrentProvider): 'seeders': tryInt(all_cells[10].find('a').string), 'leechers': tryInt(leechers), 'url': self.urls['download'] % torrent_id, - 'download': self.loginDownload, 'description': all_cells[1].find('a')['href'], }) diff --git a/couchpotato/core/providers/torrent/torrentbytes/main.py b/couchpotato/core/providers/torrent/torrentbytes/main.py index 0d620018..a5849a91 100644 --- a/couchpotato/core/providers/torrent/torrentbytes/main.py +++ b/couchpotato/core/providers/torrent/torrentbytes/main.py @@ -60,7 +60,6 @@ class TorrentBytes(TorrentProvider): 'name': link.contents[0], 'url': self.urls['download'] % (torrent_id, link.contents[0]), 'detail_url': self.urls['detail'] % torrent_id, - 'download': self.loginDownload, 'size': self.parseSize(cells[6].contents[0] + cells[6].contents[2]), 'seeders': tryInt(cells[8].find('span').contents[0]), 'leechers': tryInt(cells[9].find('span').contents[0]), diff --git a/couchpotato/core/providers/torrent/torrentday/main.py b/couchpotato/core/providers/torrent/torrentday/main.py index c804d0e0..71812bbf 100644 --- a/couchpotato/core/providers/torrent/torrentday/main.py +++ b/couchpotato/core/providers/torrent/torrentday/main.py @@ -51,7 +51,6 @@ class TorrentDay(TorrentProvider): 'size': self.parseSize(torrent.get('size')), 'seeders': tryInt(torrent.get('seed')), 'leechers': tryInt(torrent.get('leech')), - 'download': self.loginDownload, }) def getLoginParams(self): diff --git a/couchpotato/core/providers/torrent/torrentleech/main.py b/couchpotato/core/providers/torrent/torrentleech/main.py index 8c41340f..93b10ee3 100644 --- a/couchpotato/core/providers/torrent/torrentleech/main.py +++ b/couchpotato/core/providers/torrent/torrentleech/main.py @@ -59,7 +59,6 @@ class TorrentLeech(TorrentProvider): 'name': link.string, 'url': self.urls['download'] % url['href'], 'detail_url': self.urls['download'] % details['href'], - 'download': self.loginDownload, 'size': self.parseSize(result.find_all('td')[4].string), 'seeders': tryInt(result.find('td', attrs = {'class' : 'seeders'}).string), 'leechers': tryInt(result.find('td', attrs = {'class' : 'leechers'}).string), diff --git a/couchpotato/core/providers/torrent/torrentshack/main.py b/couchpotato/core/providers/torrent/torrentshack/main.py index 1ef6c1df..1b9ee197 100644 --- a/couchpotato/core/providers/torrent/torrentshack/main.py +++ b/couchpotato/core/providers/torrent/torrentshack/main.py @@ -59,7 +59,6 @@ class TorrentShack(TorrentProvider): 'name': unicode(link.span.string).translate({ord(u'\xad'): None}), 'url': self.urls['download'] % url['href'], 'detail_url': self.urls['download'] % link['href'], - 'download': self.loginDownload, 'size': self.parseSize(result.find_all('td')[4].string), 'seeders': tryInt(result.find_all('td')[6].string), 'leechers': tryInt(result.find_all('td')[7].string),