Merge branch 'develop' of github.com:RuudBurger/CouchPotatoServer into develop

couchpotato/core/providers/torrent/ilovetorrents/main.py

@@ -12,12 +12,12 @@ log = CPLog(__name__)
 class ILoveTorrents(TorrentProvider):
 
     urls = {
-        'download': 'http://www.ilovetorrents.me/%s',
-        'detail': 'http://www.ilovetorrents.me/%s',
-        'search': 'http://www.ilovetorrents.me/browse.php?search=%s&page=%s&cat=%s',
-        'test': 'http://www.ilovetorrents.me/',
-        'login': 'http://www.ilovetorrents.me/takelogin.php',
-        'login_check': 'http://www.ilovetorrents.me'
+        'download': 'https://www.ilovetorrents.me/%s',
+        'detail': 'https//www.ilovetorrents.me/%s',
+        'search': 'https://www.ilovetorrents.me/browse.php?search=%s&page=%s&cat=%s',
+        'test': 'https://www.ilovetorrents.me/',
+        'login': 'https://www.ilovetorrents.me/takelogin.php',
+        'login_check': 'https://www.ilovetorrents.me'
     }
 
     cat_ids = [

couchpotato/core/providers/torrent/iptorrents/main.py

@@ -11,11 +11,11 @@ log = CPLog(__name__)
 class IPTorrents(TorrentProvider):
 
     urls = {
-        'test': 'http://www.iptorrents.com/',
-        'base_url': 'http://www.iptorrents.com',
-        'login': 'http://www.iptorrents.com/torrents/',
-        'login_check': 'http://www.iptorrents.com/inbox.php',
-        'search': 'http://www.iptorrents.com/torrents/?l%d=1%s&q=%s&qf=ti&p=%d',
+        'test': 'https://www.iptorrents.com/',
+        'base_url': 'https://www.iptorrents.com',
+        'login': 'https://www.iptorrents.com/torrents/',
+        'login_check': 'https://www.iptorrents.com/inbox.php',
+        'search': 'https://www.iptorrents.com/torrents/?l%d=1%s&q=%s&qf=ti&p=%d',
     }
 
     cat_ids = [

couchpotato/core/providers/torrent/thepiratebay/main.py

@@ -31,15 +31,13 @@ class ThePirateBay(TorrentMagnetProvider):
     proxy_list = [
         'https://tpb.ipredator.se',
         'https://thepiratebay.se',
-        'https://depiraatbaai.be',
-        'https://piratereverse.info',
-        'https://tpb.pirateparty.org.uk',
-        'https://argumentomteemigreren.nl',
-        'https://livepirate.com',
+        'http://pirateproxy.ca',
+        'http://tpb.al',
+        'http://www.tpb.gr',
+        'http://nl.tpb.li',
+        'http://proxybay.eu',
         'https://www.getpirate.com',
-        'https://tpb.partipirate.org',
-        'https://tpb.piraten.lu',
-        'https://kuiken.co',
+        'http://pirateproxy.ca', 
     ]
 
     def _searchOnTitle(self, title, movie, quality, results):

couchpotato/core/providers/torrent/torrentshack/__init__.py

@@ -11,7 +11,7 @@ config = [{
             'tab': 'searcher',
             'list': 'torrent_providers',
             'name': 'TorrentShack',
-            'description': 'See <a href="http://www.torrentshack.net/">TorrentShack</a>',
+            'description': 'See <a href="https://www.torrentshack.net/">TorrentShack</a>',
             'options': [
                 {
                     'name': 'enabled',