From a6c4763d6d63ac0776153539ff3129d03bfe2cf9 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Mon, 27 Aug 2012 22:45:35 +0200
Subject: [PATCH 01/26] Update Userscript with @grant

---
 couchpotato/core/plugins/userscript/main.py   |  2 +-
 .../core/plugins/userscript/template.js       | 21 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/couchpotato/core/plugins/userscript/main.py b/couchpotato/core/plugins/userscript/main.py
index 9c5f05f0..e5999ab3 100644
--- a/couchpotato/core/plugins/userscript/main.py
+++ b/couchpotato/core/plugins/userscript/main.py
@@ -15,7 +15,7 @@ log = CPLog(__name__)
 
 class Userscript(Plugin):
 
-    version = 2
+    version = 3
 
     def __init__(self):
         addApiView('userscript.get/<random>/<path:filename>', self.getUserScript, static = True)
diff --git a/couchpotato/core/plugins/userscript/template.js b/couchpotato/core/plugins/userscript/template.js
index 8b07272b..c30fad5b 100644
--- a/couchpotato/core/plugins/userscript/template.js
+++ b/couchpotato/core/plugins/userscript/template.js
@@ -1,6 +1,7 @@
 // ==UserScript==
 // @name        CouchPotato UserScript
 // @description Add movies like a real CouchPotato
+// @grant       none
 // @version     {{version}}
 
 // @match       {{host}}*
@@ -44,21 +45,19 @@ function create() {
     return A;
 }
 
-if (typeof GM_addStyle == 'undefined'){
-    GM_addStyle = function(css) {
-        var head = document.getElementsByTagName('head')[0],
-            style = document.createElement('style');
-        if (!head)
-            return;
+var addStyle = function(css) {
+    var head = document.getElementsByTagName('head')[0],
+        style = document.createElement('style');
+    if (!head)
+        return;
 
-        style.type = 'text/css';
-        style.textContent = css;
-        head.appendChild(style);
-    }
+    style.type = 'text/css';
+    style.textContent = css;
+    head.appendChild(style);
 }
 
 // Styles
-GM_addStyle('\
+addStyle('\
     #cp_popup { font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; -moz-border-radius: 6px 0px 0px 6px; -webkit-border-radius: 6px 0px 0px 6px; border-radius: 6px 0px 0px 6px; -moz-box-shadow: 0 0 20px rgba(0,0,0,0.5); -webkit-box-shadow: 0 0 20px rgba(0,0,0,0.5); box-shadow: 0 0 20px rgba(0,0,0,0.5); position:fixed; z-index:9999; bottom:0; right:0; font-size:15px; margin: 20px 0; display: block; background:#4E5969; } \
     #cp_popup.opened { width: 492px; } \
     #cp_popup a#add_to { cursor:pointer; text-align:center; text-decoration:none; color: #000; display:block; padding:5px 0 5px 5px; } \

From 2d5481b89e30be4a66f3f4834b740fedf05e1c4e Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Mon, 27 Aug 2012 23:04:04 +0200
Subject: [PATCH 02/26] Remove unused host in javascript api

---
 couchpotato/templates/_desktop.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/couchpotato/templates/_desktop.html b/couchpotato/templates/_desktop.html
index 0c228dca..80a095e3 100644
--- a/couchpotato/templates/_desktop.html
+++ b/couchpotato/templates/_desktop.html
@@ -43,7 +43,7 @@
 
 		<link href="{{ url_for('web.static', filename='images/favicon.ico') }}" rel="icon" type="image/x-icon" />
 		<link rel="apple-touch-icon" href="{{ url_for('web.static', filename='images/homescreen.png') }}" />
-		
+
 		<script type="text/javascript" src="https://www.youtube.com/player_api" defer="defer"></script>
 
 		<script type="text/javascript">
@@ -51,7 +51,6 @@
 				new Uniform();
 
 				Api.setup({
-					'host': {{ fireEvent('app.api_url', single = True)|tojson|safe }},
 					'url': {{ url_for('api.index')|tojson|safe }},
 					'path_sep': {{ sep|tojson|safe }},
 					'is_remote': false

From c65e31cfba059161ee887d1818c74bad64fef5de Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Tue, 28 Aug 2012 22:18:40 +0200
Subject: [PATCH 03/26] PublicHD magnet link returns base32 encode. fix #766

---
 couchpotato/core/downloaders/base.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/couchpotato/core/downloaders/base.py b/couchpotato/core/downloaders/base.py
index c910edd2..76f8cdff 100644
--- a/couchpotato/core/downloaders/base.py
+++ b/couchpotato/core/downloaders/base.py
@@ -1,3 +1,4 @@
+from base64 import b32decode, b16encode
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import toSafeString
 from couchpotato.core.logger import CPLog
@@ -48,7 +49,12 @@ class Downloader(Plugin):
         return is_correct
 
     def magnetToTorrent(self, magnet_link):
-        torrent_hash = re.findall('urn:btih:([\w]{40})', magnet_link)[0]
+        torrent_hash = re.findall('urn:btih:([\w]{32,40})', magnet_link)[0]
+
+        # Convert base 32 to hex
+        if len(torrent_hash) == 32:
+            torrent_hash = b16encode(b32decode(torrent_hash))
+
         url = 'http://torrage.com/torrent/%s.torrent' % torrent_hash
 
         try:

From 949989fca8004c1542be33c086aae351b523b57e Mon Sep 17 00:00:00 2001
From: Tristian Howard <lavorata@gmail.com>
Date: Tue, 28 Aug 2012 20:51:22 -0400
Subject: [PATCH 04/26] Fixed a typo found by jbogatay.

---
 couchpotato/core/providers/trailer/hdtrailers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/providers/trailer/hdtrailers/main.py b/couchpotato/core/providers/trailer/hdtrailers/main.py
index d11f9231..258902b0 100644
--- a/couchpotato/core/providers/trailer/hdtrailers/main.py
+++ b/couchpotato/core/providers/trailer/hdtrailers/main.py
@@ -46,7 +46,7 @@ class HDTrailers(TrailerProvider):
 
         movie_name = getTitle(group['library'])
 
-        url = "%s?%s" % (self.url['backup'], tryUrlencode({'s':movie_name}))
+        url = "%s?%s" % (self.urls['backup'], tryUrlencode({'s':movie_name}))
         data = self.getCache('hdtrailers.alt.%s' % group['library']['identifier'], url)
 
         try:

From 12f440b71e89cff19845c5e496fbe28f68338f4e Mon Sep 17 00:00:00 2001
From: Tristian Howard <lavorata@gmail.com>
Date: Tue, 28 Aug 2012 20:53:09 -0400
Subject: [PATCH 05/26] Conflict with Windows cp1252 and UTF-8. fix #692

---
 couchpotato/core/providers/trailer/hdtrailers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/providers/trailer/hdtrailers/main.py b/couchpotato/core/providers/trailer/hdtrailers/main.py
index 258902b0..35594eee 100644
--- a/couchpotato/core/providers/trailer/hdtrailers/main.py
+++ b/couchpotato/core/providers/trailer/hdtrailers/main.py
@@ -100,7 +100,7 @@ class HDTrailers(TrailerProvider):
         return results
 
     def movieUrlName(self, string):
-        safe_chars = letters + digits + ' '
+        safe_chars = ascii_letters + digits + ' '
         r = ''.join([char if char in safe_chars else ' ' for char in string])
         name = re.sub('\s+' , '-', r).lower()
 

From 10052b7e86b1ab2a5e3ec8684f5a4225206bc3c3 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 11:14:02 +0200
Subject: [PATCH 06/26] Use shutil for rename in updater

---
 couchpotato/core/_base/updater/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/_base/updater/main.py b/couchpotato/core/_base/updater/main.py
index 980e247b..3ddec1fe 100644
--- a/couchpotato/core/_base/updater/main.py
+++ b/couchpotato/core/_base/updater/main.py
@@ -305,7 +305,7 @@ class SourceUpdater(BaseUpdater):
                         if not os.path.isdir(dirname):
                             self.makeDir(dirname)
 
-                        os.rename(fromfile, tofile)
+                        shutil.move(fromfile, tofile)
                         try:
                             existing_files.remove(tofile)
                         except ValueError:

From 7f159b62293cade49cfe74fc0b575e2d1a2baa09 Mon Sep 17 00:00:00 2001
From: mano3m <mano3m>
Date: Tue, 28 Aug 2012 17:19:14 +0200
Subject: [PATCH 07/26] Check if movie is done in checkSnatched. Fixes #760.

---
 couchpotato/core/plugins/searcher/main.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/couchpotato/core/plugins/searcher/main.py b/couchpotato/core/plugins/searcher/main.py
index afabeae8..bdc95881 100644
--- a/couchpotato/core/plugins/searcher/main.py
+++ b/couchpotato/core/plugins/searcher/main.py
@@ -453,6 +453,8 @@ class Searcher(Plugin):
         ignored_status = fireEvent('status.get', 'ignored', single = True)
         failed_status = fireEvent('status.get', 'failed', single = True)
 
+        done_status = fireEvent('status.get', 'done', single = True)
+
         db = get_session()
         rels = db.query(Release).filter_by(status_id = snatched_status.get('id'))
 
@@ -470,6 +472,13 @@ class Searcher(Plugin):
 
             log.debug('Checking snatched movie: %s' , default_title)
 
+            # Check if movie has already completed and is manage tab (legacy db correction)
+            if rel.movie.status_id == done_status.get('id'):
+                log.debug('Found a completed movie with a snatched release : %s. Setting release status to ignored...' , default_title)
+                rel.status_id = ignored_status.get('id')
+                db.commit()
+                continue
+
             item = {}
             for info in rel.info:
                 item[info.identifier] = info.value

From be0efb97c6c38d76444b9ecec85585f4d6117185 Mon Sep 17 00:00:00 2001
From: mano3m <mano3m>
Date: Tue, 28 Aug 2012 18:05:17 +0200
Subject: [PATCH 08/26] The searcher states that a better quality is already
 available or snatched after a release just failed downloading and was set to
 ignored.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After refreshing the wanted page, one release showed as ignored, the others as available. After clicking the green 'download another one' button, it started downloading the next one.

This is because the movie_dict is filled before the release is updated to ignored and therefore still is stated as snatched in searcher.single.

08-28 17:05:13 DEBUG [ato.core.plugins.searcher] Checking status snatched releases...
08-28 17:05:13 DEBUG [ato.core.plugins.searcher] Checking snatched movie: Think Like A Man
08-28 17:05:13 INFO [.core.downloaders.sabnzbd] Checking download status of "Think Like A Man 2012 1080p BluRay X264 BLOW.cp(tt1621045)" at SABnzbd.
08-28 17:05:13 INFO [hpotato.core.plugins.base] Opening url: http://localhost:8000/api?output=json&apikey=xxx&mode=queue, params: []
08-28 17:05:13 INFO [hpotato.core.plugins.base] Opening url: http://localhost:8000/api?output=json&apikey=xxx&mode=history, params: []
08-28 17:05:14 DEBUG [.core.downloaders.sabnzbd] Found Think Like A Man 2012 1080p BluRay X264 BLOW.cp(tt1621045) in SabNZBd history, which has Moving
08-28 17:05:14 INFO [.core.downloaders.sabnzbd] Think Like A Man 2012 1080p BluRay X264 BLOW.cp(tt1621045) failed downloading, deleting...
08-28 17:05:14 INFO [hpotato.core.plugins.base] Opening url: http://localhost:8000/api?del_files=1&apikey=xxx&mode=history&value=SABnzbd_nzo_tmhk8y&name=delete, params: []
08-28 17:05:14 DEBUG [.core.downloaders.sabnzbd] Result text from SAB: ok
08-28 17:05:14 INFO [.core.downloaders.sabnzbd] SabNZBd deleted failed release Think Like A Man 2012 1080p BluRay X264 BLOW.cp(tt1621045) successfully.
08-28 17:05:14 DEBUG [ato.core.plugins.searcher] Download status: failed
08-28 17:05:14 INFO [ato.core.plugins.searcher] Trying next release for: Think Like A Man
08-28 17:05:14 INFO [ato.core.plugins.searcher] Better quality (1080P) already available or snatched for Think Like A Man
08-28 17:05:14 DEBUG [potato.core.plugins.movie] Changing status for Think Like A Man
08-28 17:06:13 DEBUG [ato.core.plugins.searcher] Checking status snatched releases...
---
 couchpotato/core/plugins/searcher/main.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/couchpotato/core/plugins/searcher/main.py b/couchpotato/core/plugins/searcher/main.py
index bdc95881..dfef760a 100644
--- a/couchpotato/core/plugins/searcher/main.py
+++ b/couchpotato/core/plugins/searcher/main.py
@@ -529,8 +529,6 @@ class Searcher(Plugin):
         ignored_status = fireEvent('status.get', 'ignored', single = True)
 
         try:
-            movie_dict = fireEvent('movie.get', movie_id, single = True)
-
             db = get_session()
             rels = db.query(Release).filter_by(
                status_id = snatched_status.get('id'),
@@ -541,6 +539,7 @@ class Searcher(Plugin):
                 rel.status_id = ignored_status.get('id')
             db.commit()
 
+            movie_dict = fireEvent('movie.get', movie_id, single = True)
             log.info('Trying next release for: %s', getTitle(movie_dict['library']))
             fireEvent('searcher.single', movie_dict)
 

From 4c3a405aa42f0e080b49922eabd950693c8185df Mon Sep 17 00:00:00 2001
From: mano3m <mano3m>
Date: Tue, 28 Aug 2012 19:53:57 +0200
Subject: [PATCH 09/26] Failed download disabled Make sure that the release is
 also marked as failed with SabNZB if deleting of failed download is disabled

---
 couchpotato/core/downloaders/sabnzbd/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/downloaders/sabnzbd/main.py b/couchpotato/core/downloaders/sabnzbd/main.py
index 86d5459d..780366e4 100644
--- a/couchpotato/core/downloaders/sabnzbd/main.py
+++ b/couchpotato/core/downloaders/sabnzbd/main.py
@@ -155,7 +155,7 @@ class Sabnzbd(Downloader):
                             else:
                                 log.error("Unknown error: " + result[:40])
 
-                            return 'failed'
+                        return 'failed'
                     else:
                         return slot['status'].lower()
 

From 0cd2206e976c6934624213c4d86108e43d72d695 Mon Sep 17 00:00:00 2001
From: mano3m <mano3m>
Date: Wed, 29 Aug 2012 23:09:09 +0200
Subject: [PATCH 10/26] Remove category check Several people have issues with
 this on the forum...

---
 couchpotato/core/downloaders/sabnzbd/main.py | 73 ++++++++++----------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/couchpotato/core/downloaders/sabnzbd/main.py b/couchpotato/core/downloaders/sabnzbd/main.py
index 780366e4..abff97d7 100644
--- a/couchpotato/core/downloaders/sabnzbd/main.py
+++ b/couchpotato/core/downloaders/sabnzbd/main.py
@@ -92,10 +92,9 @@ class Sabnzbd(Downloader):
             return False
 
         for slot in history['queue']['slots']:
-            if slot['cat'] == self.conf('category'):
-                log.debug('Found %s in SabNZBd queue, which is %s, with %s left', (slot['filename'], slot['status'], slot['timeleft']))
-                if slot['filename'] == nzbname:
-                    return slot['status'].lower()
+            log.debug('Found %s in SabNZBd queue, which is %s, with %s left', (slot['filename'], slot['status'], slot['timeleft']))
+            if slot['filename'] == nzbname:
+                return slot['status'].lower()
 
         # Go through history items
         params = {
@@ -119,44 +118,44 @@ class Sabnzbd(Downloader):
             return
 
         for slot in history['history']['slots']:
-            if slot['category'] == self.conf('category'):
-                log.debug('Found %s in SabNZBd history, which has %s', (slot['name'], slot['status']))
-                if slot['name'] == nzbname:
-                    if slot['status'] == 'Failed' or slot['fail_message'].strip():
+            log.debug('Found %s in SabNZBd history, which has %s', (slot['name'], slot['status']))
+            if slot['name'] == nzbname:
+                # Note: if post process even if failed is on in SabNZBd, it will complete with a fail message
+                if slot['status'] == 'Failed' or (slot['status'] == 'Completed' and slot['fail_message'].strip()):
 
-                        # Delete failed download
-                        if self.conf('delete_failed', default = True):
+                    # Delete failed download
+                    if self.conf('delete_failed', default = True):
 
-                            log.info('%s failed downloading, deleting...', slot['name'])
-                            params = {
-                                'apikey': self.conf('api_key'),
-                                'mode': 'history',
-                                'name': 'delete',
-                                'del_files': '1',
-                                'value': slot['nzo_id']
-                            }
-                            url = cleanHost(self.conf('host')) + "api?" + tryUrlencode(params)
+                        log.info('%s failed downloading, deleting...', slot['name'])
+                        params = {
+                            'apikey': self.conf('api_key'),
+                            'mode': 'history',
+                            'name': 'delete',
+                            'del_files': '1',
+                            'value': slot['nzo_id']
+                        }
+                        url = cleanHost(self.conf('host')) + "api?" + tryUrlencode(params)
 
-                            try:
-                                sab = self.urlopen(url, timeout = 60, show_error = False)
-                            except:
-                                log.error('Failed deleting: %s', traceback.format_exc())
-                                return False
+                        try:
+                            sab = self.urlopen(url, timeout = 60, show_error = False)
+                        except:
+                            log.error('Failed deleting: %s', traceback.format_exc())
+                            return False
 
-                            result = sab.strip()
-                            if not result:
-                                log.error("SABnzbd didn't return anything.")
+                        result = sab.strip()
+                        if not result:
+                            log.error("SABnzbd didn't return anything.")
 
-                            log.debug("Result text from SAB: " + result[:40])
-                            if result == "ok":
-                                log.info('SabNZBd deleted failed release %s successfully.', slot['name'])
-                            elif result == "Missing authentication":
-                                log.error("Incorrect username/password or API?.")
-                            else:
-                                log.error("Unknown error: " + result[:40])
+                        log.debug("Result text from SAB: " + result[:40])
+                        if result == "ok":
+                            log.info('SabNZBd deleted failed release %s successfully.', slot['name'])
+                        elif result == "Missing authentication":
+                            log.error("Incorrect username/password or API?.")
+                        else:
+                            log.error("Unknown error: " + result[:40])
 
-                        return 'failed'
-                    else:
-                        return slot['status'].lower()
+                    return 'failed'
+                else:
+                    return slot['status'].lower()
 
         return 'not_found'

From 2cac21bdc3eeba54994bc912f5166b833133bd12 Mon Sep 17 00:00:00 2001
From: Rembrand van Lakwijk <rem@rocket.suckerpunch>
Date: Sat, 11 Aug 2012 22:26:35 +0200
Subject: [PATCH 11/26] Initial commit off passthepopcorn search provider (port
 from version for CouchPotato 1)

---
 .../torrent/passthepopcorn/__init__.py        |  36 +++
 .../providers/torrent/passthepopcorn/main.py  | 273 ++++++++++++++++++
 2 files changed, 309 insertions(+)
 create mode 100644 couchpotato/core/providers/torrent/passthepopcorn/__init__.py
 create mode 100644 couchpotato/core/providers/torrent/passthepopcorn/main.py

diff --git a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
new file mode 100644
index 00000000..07929d43
--- /dev/null
+++ b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
@@ -0,0 +1,36 @@
+from main import PassThePopcorn
+
+def start():
+    return PassThePopcorn()
+
+config = [{
+    'name': 'passthepopcorn',
+    'groups': [{
+        'tab': 'searcher',
+        'subtab': 'providers',
+        'name': 'PassThePopcorn',
+        'description': 'passthepopcorn.me',
+        'options': [
+            {
+                'name': 'enabled',
+                'type': 'enabler',
+                'default': False
+            },
+            {
+                'name': 'domain',
+                'advanced': True,
+                'label': 'Proxy server',
+                'description': 'Domain for requests (HTTPS only!), keep empty to use default (tls.passthepopcorn.me).',
+            },
+            {
+                'name': 'username',
+                'default': '',
+            },
+            {
+                'name': 'password',
+                'default': '',
+                'type': 'password',
+            }
+        ],
+    }]
+}]
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
new file mode 100644
index 00000000..6ce32530
--- /dev/null
+++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py
@@ -0,0 +1,273 @@
+from bs4 import BeautifulSoup
+from couchpotato.core.event import fireEvent
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import getTitle, getImdb, tryInt, cleanHost
+from couchpotato.core.logger import CPLog
+from couchpotato.core.providers.torrent.base import TorrentProvider
+from couchpotato.environment import Env
+from dateutil.parser import parse
+import os
+import time
+import re
+import htmlentitydefs
+import urllib
+import urllib2
+import cookielib
+import json
+
+
+log = CPLog(__name__)
+
+
+class PassThePopcorn(TorrentProvider):
+
+    urls = {
+         'detail': '%s/torrent/%s',
+         'search': '%s/search/%s/0/7/%d'
+    }
+
+    disable_provider = False
+    
+    domain = 'tls.passthepopcorn.me'
+
+    opener = None
+    cookiejar = None
+    quality_search_params = {
+        '1080p':    {'resolution': '1080p'},
+        '720p':     {'resolution': '720p'},
+        'brrip':    {'media': 'Blu-ray'}, # results are filtered by post_search_filters to narrow down the search
+        'dvdr':     {'resolution': 'anysd'}, # results are filtered by post_search_filters to narrow down the search
+        'dvdrip':   {'media': 'DVD'}, # results are filtered by post_search_filters to narrow down the search
+        'scr':      {'media': 'DVD-Screener'},
+        'r5':       {'media': 'R5'},
+        'tc':       {'media': 'TC'},
+        'ts':       {'media': 'TS'},
+        'cam':      {'media': 'CAM'}
+    }
+    
+    post_search_filters = {
+        '1080p':    {'Resolution': ['1080p']},
+        '720p':     {'Resolution': ['720p']},
+        'brrip':    {'Source': ['Blu-ray'], 'Quality': ['High Definition'], 'Container': ['!ISO']},
+        'dvdr':     {'Codec': ['DVD5', 'DVD9']},
+        'dvdrip':   {'Source': ['DVD'], 'Codec': ['!DVD5', '!DVD9']},
+        'scr':      {'Source': ['DVD-Screener']},
+        'r5':       {'Source': ['R5']},
+        'tc':       {'Source': ['TC']},
+        'ts':       {'Source': ['TS']},
+        'cam':      {'Source': ['CAM']}
+    }
+    
+    
+    
+    class NotLoggedInHTTPError(urllib2.HTTPError):
+        def __init__(self, url, code, msg, headers, fp):
+            urllib2.HTTPError.__init__(self, url, code, msg, headers, fp)
+    
+    class PTPHTTPRedirectHandler(urllib2.HTTPRedirectHandler):
+        def http_error_302(self, req, fp, code, msg, headers):
+            log.debug("302 detected; redirected to %s" % headers['Location'])
+            if (headers['Location'] != 'login.php'):
+                #log.info("Redirect NOT due to not being logged in detected; allowing redirect")
+                return urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
+            else:
+                #log.info("NotLoggedInHTTPError detected; raising it")
+                raise PassThePopcorn.NotLoggedInHTTPError(req.get_full_url(), code, msg, headers, fp)
+    
+
+    def __init__(self):
+        cookieprocessor = urllib2.HTTPCookieProcessor(self.cookiejar)
+        self.cookiejar = cookielib.CookieJar()
+        self.opener = urllib2.build_opener(cookieprocessor, PassThePopcorn.PTPHTTPRedirectHandler())
+        self.opener.addheaders = [
+            ('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.75 Safari/537.1'),
+            ('Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'),
+            ('Accept-Language', 'en-gb,en;q=0.5'),
+            ('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7'),
+            ('Keep-Alive', '115'),
+            ('Connection', 'keep-alive'),
+            ('Cache-Control', 'max-age=0'),
+        ]
+	self.domain = self.conf('domain') if self.conf('domain') else self.domain
+        super(PassThePopcorn, self).__init__()
+
+    def login(self):
+        log.info("Trying to log into passthepopcorn.me...")
+        url = 'https://%s/login.php' % (self.domain)
+        postdata = urllib.urlencode({'username': self.conf('username'), 'password': self.conf('password'), 'keeplogged': '1', 'login': 'Login'})
+        try:
+            response = self.opener.open(url, postdata)
+            log.debug('Login POST did not throw exception')
+        except urllib2.URLError as e:
+            log.error('Login to passthepopcorn failed: %s' % e)
+            return False
+        if response.getcode() == 200:
+            log.info('Login HTTP status 200; seems successful')
+            return True
+        else:
+            log.error('Login to passthepopcorn failed: returned code %d' % response.getcode())
+            return False
+    
+    def protected_request(self, url):
+        log.debug('Retrieving %s' % url)
+        maxattempts = 3
+        while maxattempts > 0:
+            try:
+                response = self.opener.open(url)
+                txt = response.read()
+                #log.info('Response was:\n %s' % jsontxt)
+                if response.getcode() != 200:
+                    log.error('Retrieving \'%s\' resulted in HTTP response code %d' % (url, response.getcode()))
+                    return None
+                return txt
+            except PassThePopcorn.NotLoggedInHTTPError as e:
+                if not self.login(): # if we can login, just retry
+                    log.error('Login failed, could not execute request %s' % url)
+                    return None
+                log.debug("Should now be logged into passthepopcorn.me, trying request again...")
+            except urllib2.URLError as e:
+                log.error('Retrieving JSON from url %s failed: %s' % (url, e))
+                return None
+            maxattempts = maxattempts - 1
+    
+    def json_request(self, path, params):
+        url = 'https://%s/%s?json=noredirect&%s' % (self.domain, path, urllib.urlencode(params))
+        txt = self.protected_request(url)
+        if txt:
+            return json.loads(txt)
+        else:
+            return None
+        
+    def enabled(self):
+        return  (not self.isDisabled() and \
+                self.conf('username') and \
+                self.conf('password'))
+ 
+    def torrent_meets_quality_spec(self, torrent, quality):
+        if not quality in self.post_search_filters:
+            return True
+        for field, specs in self.post_search_filters[quality].items():
+            matchesOne = False
+            seenOne = False
+            if not field in torrent:
+                log.info('Torrent with ID %s has no field "%s"; cannot apply post-search-filter for quality "%s"' % (torrent['Id'], field, quality))
+                continue
+            for spec in specs:
+                if len(spec) > 0 and spec[0] == '!':
+                    # a negative rule; if the field matches, return False
+                    if torrent[field] == spec[1:]:
+                        return False
+                else:
+                    # a positive rule; if any of the possible positive values match the field, return True
+                    seenOne = True
+                    if torrent[field] == spec:
+                        matchesOne = True
+            if seenOne and not matchesOne:
+                return False
+        return True
+        
+    def htmltounicode(self, text):
+        def fixup(m):
+            text = m.group(0)
+            if text[:2] == "&#":
+                # character reference
+                try:
+                    if text[:3] == "&#x":
+                        return unichr(int(text[3:-1], 16))
+                    else:
+                        return unichr(int(text[2:-1]))
+                except ValueError:
+                    pass
+            else:
+                # named entity
+                try:
+                    text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
+                except KeyError:
+                    pass
+            return text # leave as is
+        return re.sub("&#?\w+;", fixup, u'%s' % text)
+    
+    def unicodetoascii(self, text):
+        import unicodedata
+        return ''.join(c for c in unicodedata.normalize('NFKD', text) if unicodedata.category(c) != 'Mn')
+    
+    def htmltoascii(self, text):
+        return self.unicodetoascii(self.htmltounicode(text))
+
+    def download(self, url = '', nzb_id = ''):
+        return self.protected_request(url)
+
+    def search(self, movie, quality):
+        movieTitle = getTitle(movie['library'])
+        qualityID = quality['identifier']
+        imdbID = movie['library']['info']['imdb']
+        movieYear = movie['library']['info']['year']
+        
+        log.info('Searching for %s' % movieTitle)
+        if not self.enabled():
+            log.info('PTP not enabled, skipping search')
+            return []
+        
+        params = []
+        if qualityID:
+            params = self.quality_search_params[qualityID]
+        if imdbID:
+            params['searchstr'] = imdbID
+        else:
+            params['searchstr'] = movieTitle
+            params['year'] = movieYear
+        
+        params['order_by'] = 'relevance'
+        params['order_way'] = 'descending'
+        
+        res = self.json_request('torrents.php', params)
+        if not res:
+            log.error('Search on passthepopcorn.me (%s) failed' % params)
+            return []
+        
+        #log.info('JSON: %s' % json.dumps(res))        
+        
+        if not 'Movies' in res:
+            return []
+        results = []
+        for ptpmovie in res['Movies']:
+            if not 'Torrents' in ptpmovie:
+                continue
+            for torrent in ptpmovie['Torrents']:
+                if not self.torrent_meets_quality_spec(torrent, type):
+                    continue
+                torrentdesc = '%s %s %s' % (torrent['Resolution'], torrent['Source'], torrent['Codec'])
+                if 'GoldenPopcorn' in torrent and torrent['GoldenPopcorn']:
+                    torrentdesc += ' HQ'
+                if 'Scene' in torrent and torrent['Scene']:
+                    torrentdesc += ' Scene'
+                if 'RemasterTitle' in torrent and torrent['RemasterTitle']:
+                    # eliminate odd characters...
+                    torrentdesc += self.htmltoascii(' %s')
+                new = {
+                    'id': int(torrent['Id']),
+                    'type': 'torrent',
+                    'name': re.sub('[^A-Za-z0-9\-_ ]+', '', '%s - %s - %s' % (self.htmltoascii(ptpmovie['Title']), ptpmovie['Year'], torrentdesc)),
+                    'check_nzb': False,
+                    'description': '',
+                    'date': int(time.mktime(parse(torrent['UploadTime']).timetuple())),
+                    'size': int(torrent['Size']) / (1024*1024),
+                    'provider': self.getName(),
+                    'seeders': int(torrent['Seeders']),
+                    'leechers': int(torrent['Leechers']),
+                    'ptpobj': self,
+                    'torrentjson': torrent,
+                    'extra_score': (lambda torrent: (50 if torrent['torrentjson']['GoldenPopcorn'] else 0)),
+                    'download': self.download,
+                }
+                new['url'] = 'https://%s/torrents.php?action=download&id=%d' % (self.domain, new['id'])
+                new['score'] = fireEvent('score.calculate', new, movie, single = True)
+                if fireEvent('searcher.correct_movie', nzb = new, movie = movie, quality = quality):
+                    results.append(new)
+                    self.found(new)
+        if not results:
+            log.info("Found nothing for '%s'" % movie.name)
+        return results
+
+    def getMoreInfo(self, item):
+        return {}

From d505675f93fdad931f9dff5104ad0fc2b4d6098a Mon Sep 17 00:00:00 2001
From: Rembrand van Lakwijk <rem@lakwijk.com>
Date: Sun, 12 Aug 2012 01:45:29 +0200
Subject: [PATCH 12/26] Fixed error when a movie is not found (oversight in
 porting from v1)

---
 couchpotato/core/providers/torrent/passthepopcorn/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
index 6ce32530..239d9fdc 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/main.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py
@@ -266,7 +266,7 @@ class PassThePopcorn(TorrentProvider):
                     results.append(new)
                     self.found(new)
         if not results:
-            log.info("Found nothing for '%s'" % movie.name)
+            log.info("Found nothing for '%s'" % movieTitle)
         return results
 
     def getMoreInfo(self, item):

From ca358d28ee7d85ad07dc60e9ec3b9305d5d358cc Mon Sep 17 00:00:00 2001
From: Rembrand van Lakwijk <rem@lakwijk.com>
Date: Sun, 12 Aug 2012 04:25:24 +0200
Subject: [PATCH 13/26] Search improved - Fixed CouchPotato rejecting a lot of
 torrents that in reality meet requirements just fine - Added BD50 support -
 Increased amount of log output

---
 .../providers/torrent/passthepopcorn/main.py  | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
index 239d9fdc..ce54d46a 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/main.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py
@@ -33,6 +33,7 @@ class PassThePopcorn(TorrentProvider):
     opener = None
     cookiejar = None
     quality_search_params = {
+        'bd50':     {'media': 'Blu-ray', 'format': 'BD50'},
         '1080p':    {'resolution': '1080p'},
         '720p':     {'resolution': '720p'},
         'brrip':    {'media': 'Blu-ray'}, # results are filtered by post_search_filters to narrow down the search
@@ -46,6 +47,7 @@ class PassThePopcorn(TorrentProvider):
     }
     
     post_search_filters = {
+        'bd50':     {'Codec': ['BD50']},
         '1080p':    {'Resolution': ['1080p']},
         '720p':     {'Resolution': ['720p']},
         'brrip':    {'Source': ['Blu-ray'], 'Quality': ['High Definition'], 'Container': ['!ISO']},
@@ -194,7 +196,7 @@ class PassThePopcorn(TorrentProvider):
     def htmltoascii(self, text):
         return self.unicodetoascii(self.htmltounicode(text))
 
-    def download(self, url = '', nzb_id = ''):
+    def download(self, url='', nzb_id=''):
         return self.protected_request(url)
 
     def search(self, movie, quality):
@@ -203,7 +205,7 @@ class PassThePopcorn(TorrentProvider):
         imdbID = movie['library']['info']['imdb']
         movieYear = movie['library']['info']['year']
         
-        log.info('Searching for %s' % movieTitle)
+        log.info('Searching for %s at quality %s' % (movieTitle, qualityID))
         if not self.enabled():
             log.info('PTP not enabled, skipping search')
             return []
@@ -222,20 +224,22 @@ class PassThePopcorn(TorrentProvider):
         
         res = self.json_request('torrents.php', params)
         if not res:
-            log.error('Search on passthepopcorn.me (%s) failed' % params)
+            log.error('Search on passthepopcorn.me (%s) failed (could not decode JSON)' % params)
             return []
         
         #log.info('JSON: %s' % json.dumps(res))        
         
         if not 'Movies' in res:
+            log.info("PTP search returned nothing for '%s' at quality '%s' with search parameters %s" % (movieTitle, qualityID, params))
             return []
+        log.info('PTP search returned %d movies' % len(res['Movies']))
         results = []
         for ptpmovie in res['Movies']:
             if not 'Torrents' in ptpmovie:
+                log.info('Movie %s (%s) has NO torrents' % (ptpmovie['Title'], ptpmovie['Year']))
                 continue
+            log.info('Movie %s (%s) has %d torrents' % (ptpmovie['Title'], ptpmovie['Year'], len(ptpmovie['Torrents'])))
             for torrent in ptpmovie['Torrents']:
-                if not self.torrent_meets_quality_spec(torrent, type):
-                    continue
                 torrentdesc = '%s %s %s' % (torrent['Resolution'], torrent['Source'], torrent['Codec'])
                 if 'GoldenPopcorn' in torrent and torrent['GoldenPopcorn']:
                     torrentdesc += ' HQ'
@@ -244,14 +248,21 @@ class PassThePopcorn(TorrentProvider):
                 if 'RemasterTitle' in torrent and torrent['RemasterTitle']:
                     # eliminate odd characters...
                     torrentdesc += self.htmltoascii(' %s')
+                torrentdesc += ' %s' % qualityID # this is really just to make CouchPotato not reject torrents we filtered ourselves using our own CPS->PTPSearch rules
+                if not self.torrent_meets_quality_spec(torrent, type):
+                    log.info('Ignoring \'%s\' because it does not meet the quality spec of \'%s\'' % (torrentName, qualityID))
+                    continue
+                # if we know the IMDB id, this must be the correct name. This avoids failing the CouchPotato name check if we know for certain we have the correct movie.
+                torrentNameMovieTitle = movieTitle if imdbID else self.htmltoascii(ptpmovie['Title'])
+                torrentName = re.sub('[^A-Za-z0-9\-_ \(\)]+', '', '%s (%s) - %s' % (torrentNameMovieTitle, ptpmovie['Year'], torrentdesc))
                 new = {
                     'id': int(torrent['Id']),
                     'type': 'torrent',
-                    'name': re.sub('[^A-Za-z0-9\-_ ]+', '', '%s - %s - %s' % (self.htmltoascii(ptpmovie['Title']), ptpmovie['Year'], torrentdesc)),
+                    'name': torrentName,
                     'check_nzb': False,
                     'description': '',
                     'date': int(time.mktime(parse(torrent['UploadTime']).timetuple())),
-                    'size': int(torrent['Size']) / (1024*1024),
+                    'size': int(torrent['Size']) / (1024 * 1024),
                     'provider': self.getName(),
                     'seeders': int(torrent['Seeders']),
                     'leechers': int(torrent['Leechers']),
@@ -261,12 +272,12 @@ class PassThePopcorn(TorrentProvider):
                     'download': self.download,
                 }
                 new['url'] = 'https://%s/torrents.php?action=download&id=%d' % (self.domain, new['id'])
-                new['score'] = fireEvent('score.calculate', new, movie, single = True)
-                if fireEvent('searcher.correct_movie', nzb = new, movie = movie, quality = quality):
+                new['score'] = fireEvent('score.calculate', new, movie, single=True)
+                if fireEvent('searcher.correct_movie', nzb=new, movie=movie, quality=quality):
                     results.append(new)
                     self.found(new)
         if not results:
-            log.info("Found nothing for '%s'" % movieTitle)
+            log.info("After quality-based filtering, found nothing for '%s' at quality '%s' with search parameters %s" % (movieTitle, qualityID, params))
         return results
 
     def getMoreInfo(self, item):

From 39903314e465f20c6ae0a91c86deb7452bd364f2 Mon Sep 17 00:00:00 2001
From: Rembrand van Lakwijk <rem@lakwijk.com>
Date: Mon, 13 Aug 2012 14:23:23 +0200
Subject: [PATCH 14/26] Some minor improvements - Now uses authkey+passkey in
 torrent urls, so it should support sending torrents to external clients such
 as Tranmission - Fixed all remaster versions showing up as 's' in the torrent
 name - Fixed duplicate request when a request is done while not being logged
 in to ptp - Allow '.' character in torrent names

---
 .gitignore                                    |  4 +++-
 .../providers/torrent/passthepopcorn/main.py  | 22 +++++++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e134ddb6..e156f873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.pyc
 /data/
-/_source/
\ No newline at end of file
+/_source/
+.project
+.pydevproject
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
index ce54d46a..c06bce44 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/main.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py
@@ -105,14 +105,14 @@ class PassThePopcorn(TorrentProvider):
             return False
         if response.getcode() == 200:
             log.info('Login HTTP status 200; seems successful')
-            return True
+            return response
         else:
             log.error('Login to passthepopcorn failed: returned code %d' % response.getcode())
             return False
     
     def protected_request(self, url):
         log.debug('Retrieving %s' % url)
-        maxattempts = 3
+        maxattempts = 2
         while maxattempts > 0:
             try:
                 response = self.opener.open(url)
@@ -123,10 +123,16 @@ class PassThePopcorn(TorrentProvider):
                     return None
                 return txt
             except PassThePopcorn.NotLoggedInHTTPError as e:
-                if not self.login(): # if we can login, just retry
+                loginResult = self.login()
+                if not loginResult: # if we can login, just retry
                     log.error('Login failed, could not execute request %s' % url)
                     return None
-                log.debug("Should now be logged into passthepopcorn.me, trying request again...")
+                else:
+                    if loginResult.geturl() == url:
+                        log.info('Login redirected to desired URL; success!')
+                        return loginResult.read()
+                    else:
+                        log.info("Login seems to have succeeded, but got redirected to '%s' while we actually want to visit '%s'; retrying the request" % (loginResult.geturl(), url))
             except urllib2.URLError as e:
                 log.error('Retrieving JSON from url %s failed: %s' % (url, e))
                 return None
@@ -233,6 +239,8 @@ class PassThePopcorn(TorrentProvider):
             log.info("PTP search returned nothing for '%s' at quality '%s' with search parameters %s" % (movieTitle, qualityID, params))
             return []
         log.info('PTP search returned %d movies' % len(res['Movies']))
+        authkey = res['AuthKey']
+        passkey = res['PassKey']
         results = []
         for ptpmovie in res['Movies']:
             if not 'Torrents' in ptpmovie:
@@ -247,14 +255,14 @@ class PassThePopcorn(TorrentProvider):
                     torrentdesc += ' Scene'
                 if 'RemasterTitle' in torrent and torrent['RemasterTitle']:
                     # eliminate odd characters...
-                    torrentdesc += self.htmltoascii(' %s')
+                    torrentdesc += self.htmltoascii(' %s' % torrent['RemasterTitle'])
                 torrentdesc += ' %s' % qualityID # this is really just to make CouchPotato not reject torrents we filtered ourselves using our own CPS->PTPSearch rules
                 if not self.torrent_meets_quality_spec(torrent, type):
                     log.info('Ignoring \'%s\' because it does not meet the quality spec of \'%s\'' % (torrentName, qualityID))
                     continue
                 # if we know the IMDB id, this must be the correct name. This avoids failing the CouchPotato name check if we know for certain we have the correct movie.
                 torrentNameMovieTitle = movieTitle if imdbID else self.htmltoascii(ptpmovie['Title'])
-                torrentName = re.sub('[^A-Za-z0-9\-_ \(\)]+', '', '%s (%s) - %s' % (torrentNameMovieTitle, ptpmovie['Year'], torrentdesc))
+                torrentName = re.sub('[^A-Za-z0-9\-_ \(\).]+', '', '%s (%s) - %s' % (torrentNameMovieTitle, ptpmovie['Year'], torrentdesc))
                 new = {
                     'id': int(torrent['Id']),
                     'type': 'torrent',
@@ -271,7 +279,7 @@ class PassThePopcorn(TorrentProvider):
                     'extra_score': (lambda torrent: (50 if torrent['torrentjson']['GoldenPopcorn'] else 0)),
                     'download': self.download,
                 }
-                new['url'] = 'https://%s/torrents.php?action=download&id=%d' % (self.domain, new['id'])
+                new['url'] = 'https://%s/torrents.php?action=download&id=%d&authkey=%s&torrent_pass=%s' % (self.domain, new['id'], authkey, passkey)
                 new['score'] = fireEvent('score.calculate', new, movie, single=True)
                 if fireEvent('searcher.correct_movie', nzb=new, movie=movie, quality=quality):
                     results.append(new)

From 221f01e0e988bdeffe40452ba4ba4aeeb96cc304 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 13:33:53 +0200
Subject: [PATCH 15/26] Import ascii letters for trailers

---
 couchpotato/core/providers/trailer/hdtrailers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/providers/trailer/hdtrailers/main.py b/couchpotato/core/providers/trailer/hdtrailers/main.py
index 35594eee..09e24036 100644
--- a/couchpotato/core/providers/trailer/hdtrailers/main.py
+++ b/couchpotato/core/providers/trailer/hdtrailers/main.py
@@ -3,7 +3,7 @@ from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import mergeDicts, getTitle
 from couchpotato.core.logger import CPLog
 from couchpotato.core.providers.trailer.base import TrailerProvider
-from string import letters, digits
+from string import digits, ascii_letters
 import re
 
 log = CPLog(__name__)

From 21286458f2a1edf4d80387eaad8235b5f1f346ba Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 14:20:12 +0200
Subject: [PATCH 16/26] Cleaner settings menu

---
 couchpotato/static/style/page/settings.css | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/couchpotato/static/style/page/settings.css b/couchpotato/static/style/page/settings.css
index b7fbaabf..686c3b21 100644
--- a/couchpotato/static/style/page/settings.css
+++ b/couchpotato/static/style/page/settings.css
@@ -24,39 +24,36 @@
 	}
 		.page.settings .tabs a {
 			display: block;
-			padding: 11px 15px;
+			padding: 7px 15px;
 			font-weight: normal;
-			transition: all 0.1s ease-in-out;
+			transition: all 0.3s ease-in-out;
 			color: rgba(255, 255, 255, 0.8);
+			text-shadow: none;
 		}
-			.page.settings .tabs a:hover, .page.settings .tabs .active a {
+			.page.settings .tabs a:hover, 
+			.page.settings .tabs .active a {
 				background: rgb(78, 89, 105);
-				font-weight: bold;
-				font-size: 25px;
 				color: #fff;
 			}
+			.page.settings .tabs > li {
+				border-bottom: 1px solid rgb(78, 89, 105);
+			}
 
 		.page.settings .tabs .subtabs {
 			list-style: none;
 			padding: 0;
-			overflow: hidden;
-			transition: all 1s ease-in-out;
-			max-height: 0;
+			margin: -5px 0 10px;
 		}
-			.page.settings .tabs > .active .subtabs {
-				max-height: 300px;
-			}
 
 			.page.settings .tabs .subtabs a {
-				font-size: 15px;
-				padding: 1px 15px;
+				font-size: 13px;
+				padding: 0 15px;
 				font-weight: normal;
-				color: rgba(255, 255, 255, 0.8);
-				background: rgba(78, 89, 105, 0.4);
+				transition: all .3s ease-in-out;
+				color: rgba(255, 255, 255, 0.7);
 			}
 
 				.page.settings .tabs .subtabs .active a {
-					font-weight: bold;
 					color: #fff;
 					background: rgb(78, 89, 105);
 				}

From 9590f2e43e093d5e870edb5db2a0ada5cf5099ab Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 16:15:25 +0200
Subject: [PATCH 17/26] PassThePopcorn code cleanup + standards

---
 .../torrent/passthepopcorn/__init__.py        |   2 +-
 .../providers/torrent/passthepopcorn/main.py  | 340 ++++++++----------
 2 files changed, 152 insertions(+), 190 deletions(-)

diff --git a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
index 07929d43..67bf6665 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
@@ -9,7 +9,7 @@ config = [{
         'tab': 'searcher',
         'subtab': 'providers',
         'name': 'PassThePopcorn',
-        'description': 'passthepopcorn.me',
+        'description': 'See <a href="http://passthepopcorn.me">PassThePopcorn.me</a>',
         'options': [
             {
                 'name': 'enabled',
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
index c06bce44..a5a60f9a 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/main.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py
@@ -1,20 +1,17 @@
 from bs4 import BeautifulSoup
 from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import getTitle, getImdb, tryInt, cleanHost
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts
 from couchpotato.core.logger import CPLog
 from couchpotato.core.providers.torrent.base import TorrentProvider
-from couchpotato.environment import Env
 from dateutil.parser import parse
-import os
-import time
-import re
-import htmlentitydefs
-import urllib
-import urllib2
 import cookielib
+import htmlentitydefs
 import json
-
+import re
+import time
+import traceback
+import urllib2
 
 log = CPLog(__name__)
 
@@ -22,30 +19,27 @@ log = CPLog(__name__)
 class PassThePopcorn(TorrentProvider):
 
     urls = {
-         'detail': '%s/torrent/%s',
-         'search': '%s/search/%s/0/7/%d'
+         'domain': 'https://tls.passthepopcorn.me',
+         'detail': 'https://tls.passthepopcorn.me/torrents.php?torrentid=%s',
+         'torrent': 'https://tls.passthepopcorn.me/torrents.php',
+         'login': 'https://tls.passthepopcorn.me/login.php',
+         'search': 'https://tls.passthepopcorn.me/search/%s/0/7/%d'
     }
 
-    disable_provider = False
-    
-    domain = 'tls.passthepopcorn.me'
-
-    opener = None
-    cookiejar = None
     quality_search_params = {
         'bd50':     {'media': 'Blu-ray', 'format': 'BD50'},
         '1080p':    {'resolution': '1080p'},
         '720p':     {'resolution': '720p'},
-        'brrip':    {'media': 'Blu-ray'}, # results are filtered by post_search_filters to narrow down the search
-        'dvdr':     {'resolution': 'anysd'}, # results are filtered by post_search_filters to narrow down the search
-        'dvdrip':   {'media': 'DVD'}, # results are filtered by post_search_filters to narrow down the search
+        'brrip':    {'media': 'Blu-ray'},
+        'dvdr':     {'resolution': 'anysd'},
+        'dvdrip':   {'media': 'DVD'},
         'scr':      {'media': 'DVD-Screener'},
         'r5':       {'media': 'R5'},
         'tc':       {'media': 'TC'},
         'ts':       {'media': 'TS'},
         'cam':      {'media': 'CAM'}
     }
-    
+
     post_search_filters = {
         'bd50':     {'Codec': ['BD50']},
         '1080p':    {'Resolution': ['1080p']},
@@ -59,29 +53,118 @@ class PassThePopcorn(TorrentProvider):
         'ts':       {'Source': ['TS']},
         'cam':      {'Source': ['CAM']}
     }
-    
-    
-    
+
     class NotLoggedInHTTPError(urllib2.HTTPError):
         def __init__(self, url, code, msg, headers, fp):
             urllib2.HTTPError.__init__(self, url, code, msg, headers, fp)
-    
+
     class PTPHTTPRedirectHandler(urllib2.HTTPRedirectHandler):
         def http_error_302(self, req, fp, code, msg, headers):
             log.debug("302 detected; redirected to %s" % headers['Location'])
             if (headers['Location'] != 'login.php'):
-                #log.info("Redirect NOT due to not being logged in detected; allowing redirect")
                 return urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
             else:
-                #log.info("NotLoggedInHTTPError detected; raising it")
                 raise PassThePopcorn.NotLoggedInHTTPError(req.get_full_url(), code, msg, headers, fp)
-    
 
-    def __init__(self):
-        cookieprocessor = urllib2.HTTPCookieProcessor(self.cookiejar)
-        self.cookiejar = cookielib.CookieJar()
-        self.opener = urllib2.build_opener(cookieprocessor, PassThePopcorn.PTPHTTPRedirectHandler())
-        self.opener.addheaders = [
+    def search(self, movie, quality):
+
+        results = []
+
+        if self.isDisabled():
+            return results
+
+        movie_title = getTitle(movie['library'])
+        quality_id = quality['identifier']
+
+        log.info('Searching for %s at quality %s' % (movie_title, quality_id))
+
+        params = mergeDicts(self.quality_search_params[quality_id].copy(), {
+            'order_by': 'relevance',
+            'order_way': 'descending',
+            'searchstr': movie['library']['identifier']
+        })
+
+        # Do login for the cookies
+        if not self.login_opener and not self.login():
+            return results
+
+        try:
+            url = '%s?json=noredirect&%s' % (self.urls['torrent'], tryUrlencode(params))
+            txt = self.urlopen(url, opener = self.login_opener)
+            res = json.loads(txt)
+        except:
+            log.error('Search on PassThePopcorn.me (%s) failed (could not decode JSON)' % params)
+            return []
+
+        try:
+            if not 'Movies' in res:
+                log.info("PTP search returned nothing for '%s' at quality '%s' with search parameters %s" % (movie_title, quality_id, params))
+                return []
+
+            authkey = res['AuthKey']
+            passkey = res['PassKey']
+
+            for ptpmovie in res['Movies']:
+                if not 'Torrents' in ptpmovie:
+                    log.debug('Movie %s (%s) has NO torrents' % (ptpmovie['Title'], ptpmovie['Year']))
+                    continue
+
+                log.debug('Movie %s (%s) has %d torrents' % (ptpmovie['Title'], ptpmovie['Year'], len(ptpmovie['Torrents'])))
+                for torrent in ptpmovie['Torrents']:
+                    torrent_id = tryInt(torrent['Id'])
+                    torrentdesc = '%s %s %s' % (torrent['Resolution'], torrent['Source'], torrent['Codec'])
+
+                    if 'GoldenPopcorn' in torrent and torrent['GoldenPopcorn']:
+                        torrentdesc += ' HQ'
+                    if 'Scene' in torrent and torrent['Scene']:
+                        torrentdesc += ' Scene'
+                    if 'RemasterTitle' in torrent and torrent['RemasterTitle']:
+                        # eliminate odd characters...
+                        torrentdesc += self.htmlToASCII(' %s' % torrent['RemasterTitle'])
+
+                    torrentdesc += ' (%s)' % quality_id
+                    torrent_name = re.sub('[^A-Za-z0-9\-_ \(\).]+', '', '%s (%s) - %s' % (movie_title, ptpmovie['Year'], torrentdesc))
+
+                    def extra_check(item):
+                        return self.torrentMeetsQualitySpec(item, type)
+
+                    def extra_score(item):
+                        return 50 if torrent['GoldenPopcorn'] else 0
+
+                    new = {
+                        'id': torrent_id,
+                        'type': 'torrent',
+                        'provider': self.getName(),
+                        'name': torrent_name,
+                        'url': '%s?action=download&id=%d&authkey=%s&torrent_pass=%s' % (self.urls['torrent'], torrent_id, authkey, passkey),
+                        'detail_url': self.urls['detail'] % torrent_id,
+                        'date': tryInt(time.mktime(parse(torrent['UploadTime']).timetuple())),
+                        'size': tryInt(torrent['Size']) / (1024 * 1024),
+                        'provider': self.getName(),
+                        'seeders': tryInt(torrent['Seeders']),
+                        'leechers': tryInt(torrent['Leechers']),
+                        'extra_score': extra_score,
+                        'extra_check': extra_check,
+                        'download': self.loginDownload,
+                    }
+
+                    new['score'] = fireEvent('score.calculate', new, movie, single = True)
+
+                    if fireEvent('searcher.correct_movie', nzb = new, movie = movie, quality = quality):
+                        results.append(new)
+                        self.found(new)
+
+            return results
+        except:
+            log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
+
+        return []
+
+    def login(self):
+
+        cookieprocessor = urllib2.HTTPCookieProcessor(cookielib.CookieJar())
+        opener = urllib2.build_opener(cookieprocessor, PassThePopcorn.PTPHTTPRedirectHandler())
+        opener.addheaders = [
             ('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.75 Safari/537.1'),
             ('Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'),
             ('Accept-Language', 'en-gb,en;q=0.5'),
@@ -90,76 +173,34 @@ class PassThePopcorn(TorrentProvider):
             ('Connection', 'keep-alive'),
             ('Cache-Control', 'max-age=0'),
         ]
-	self.domain = self.conf('domain') if self.conf('domain') else self.domain
-        super(PassThePopcorn, self).__init__()
 
-    def login(self):
-        log.info("Trying to log into passthepopcorn.me...")
-        url = 'https://%s/login.php' % (self.domain)
-        postdata = urllib.urlencode({'username': self.conf('username'), 'password': self.conf('password'), 'keeplogged': '1', 'login': 'Login'})
         try:
-            response = self.opener.open(url, postdata)
-            log.debug('Login POST did not throw exception')
+            response = opener.open(self.urls['login'], self.getLoginParams())
         except urllib2.URLError as e:
-            log.error('Login to passthepopcorn failed: %s' % e)
+            log.error('Login to PassThePopcorn failed: %s' % e)
             return False
+
         if response.getcode() == 200:
-            log.info('Login HTTP status 200; seems successful')
-            return response
+            log.debug('Login HTTP status 200; seems successful')
+            self.login_opener = opener
+            return True
         else:
-            log.error('Login to passthepopcorn failed: returned code %d' % response.getcode())
+            log.error('Login to PassThePopcorn failed: returned code %d' % response.getcode())
             return False
-    
-    def protected_request(self, url):
-        log.debug('Retrieving %s' % url)
-        maxattempts = 2
-        while maxattempts > 0:
-            try:
-                response = self.opener.open(url)
-                txt = response.read()
-                #log.info('Response was:\n %s' % jsontxt)
-                if response.getcode() != 200:
-                    log.error('Retrieving \'%s\' resulted in HTTP response code %d' % (url, response.getcode()))
-                    return None
-                return txt
-            except PassThePopcorn.NotLoggedInHTTPError as e:
-                loginResult = self.login()
-                if not loginResult: # if we can login, just retry
-                    log.error('Login failed, could not execute request %s' % url)
-                    return None
-                else:
-                    if loginResult.geturl() == url:
-                        log.info('Login redirected to desired URL; success!')
-                        return loginResult.read()
-                    else:
-                        log.info("Login seems to have succeeded, but got redirected to '%s' while we actually want to visit '%s'; retrying the request" % (loginResult.geturl(), url))
-            except urllib2.URLError as e:
-                log.error('Retrieving JSON from url %s failed: %s' % (url, e))
-                return None
-            maxattempts = maxattempts - 1
-    
-    def json_request(self, path, params):
-        url = 'https://%s/%s?json=noredirect&%s' % (self.domain, path, urllib.urlencode(params))
-        txt = self.protected_request(url)
-        if txt:
-            return json.loads(txt)
-        else:
-            return None
-        
-    def enabled(self):
-        return  (not self.isDisabled() and \
-                self.conf('username') and \
-                self.conf('password'))
- 
-    def torrent_meets_quality_spec(self, torrent, quality):
+
+    def torrentMeetsQualitySpec(self, torrent, quality):
+
         if not quality in self.post_search_filters:
             return True
+
         for field, specs in self.post_search_filters[quality].items():
-            matchesOne = False
-            seenOne = False
+            matches_one = False
+            seen_one = False
+
             if not field in torrent:
-                log.info('Torrent with ID %s has no field "%s"; cannot apply post-search-filter for quality "%s"' % (torrent['Id'], field, quality))
+                log.debug('Torrent with ID %s has no field "%s"; cannot apply post-search-filter for quality "%s"' % (torrent['Id'], field, quality))
                 continue
+
             for spec in specs:
                 if len(spec) > 0 and spec[0] == '!':
                     # a negative rule; if the field matches, return False
@@ -167,14 +208,16 @@ class PassThePopcorn(TorrentProvider):
                         return False
                 else:
                     # a positive rule; if any of the possible positive values match the field, return True
-                    seenOne = True
+                    seen_one = True
                     if torrent[field] == spec:
-                        matchesOne = True
-            if seenOne and not matchesOne:
+                        matches_one = True
+
+            if seen_one and not matches_one:
                 return False
+
         return True
-        
-    def htmltounicode(self, text):
+
+    def htmlToUnicode(self, text):
         def fixup(m):
             text = m.group(0)
             if text[:2] == "&#":
@@ -194,99 +237,18 @@ class PassThePopcorn(TorrentProvider):
                     pass
             return text # leave as is
         return re.sub("&#?\w+;", fixup, u'%s' % text)
-    
-    def unicodetoascii(self, text):
+
+    def unicodeToASCII(self, text):
         import unicodedata
         return ''.join(c for c in unicodedata.normalize('NFKD', text) if unicodedata.category(c) != 'Mn')
-    
-    def htmltoascii(self, text):
-        return self.unicodetoascii(self.htmltounicode(text))
 
-    def download(self, url='', nzb_id=''):
-        return self.protected_request(url)
+    def htmlToASCII(self, text):
+        return self.unicodeToASCII(self.htmlToUnicode(text))
 
-    def search(self, movie, quality):
-        movieTitle = getTitle(movie['library'])
-        qualityID = quality['identifier']
-        imdbID = movie['library']['info']['imdb']
-        movieYear = movie['library']['info']['year']
-        
-        log.info('Searching for %s at quality %s' % (movieTitle, qualityID))
-        if not self.enabled():
-            log.info('PTP not enabled, skipping search')
-            return []
-        
-        params = []
-        if qualityID:
-            params = self.quality_search_params[qualityID]
-        if imdbID:
-            params['searchstr'] = imdbID
-        else:
-            params['searchstr'] = movieTitle
-            params['year'] = movieYear
-        
-        params['order_by'] = 'relevance'
-        params['order_way'] = 'descending'
-        
-        res = self.json_request('torrents.php', params)
-        if not res:
-            log.error('Search on passthepopcorn.me (%s) failed (could not decode JSON)' % params)
-            return []
-        
-        #log.info('JSON: %s' % json.dumps(res))        
-        
-        if not 'Movies' in res:
-            log.info("PTP search returned nothing for '%s' at quality '%s' with search parameters %s" % (movieTitle, qualityID, params))
-            return []
-        log.info('PTP search returned %d movies' % len(res['Movies']))
-        authkey = res['AuthKey']
-        passkey = res['PassKey']
-        results = []
-        for ptpmovie in res['Movies']:
-            if not 'Torrents' in ptpmovie:
-                log.info('Movie %s (%s) has NO torrents' % (ptpmovie['Title'], ptpmovie['Year']))
-                continue
-            log.info('Movie %s (%s) has %d torrents' % (ptpmovie['Title'], ptpmovie['Year'], len(ptpmovie['Torrents'])))
-            for torrent in ptpmovie['Torrents']:
-                torrentdesc = '%s %s %s' % (torrent['Resolution'], torrent['Source'], torrent['Codec'])
-                if 'GoldenPopcorn' in torrent and torrent['GoldenPopcorn']:
-                    torrentdesc += ' HQ'
-                if 'Scene' in torrent and torrent['Scene']:
-                    torrentdesc += ' Scene'
-                if 'RemasterTitle' in torrent and torrent['RemasterTitle']:
-                    # eliminate odd characters...
-                    torrentdesc += self.htmltoascii(' %s' % torrent['RemasterTitle'])
-                torrentdesc += ' %s' % qualityID # this is really just to make CouchPotato not reject torrents we filtered ourselves using our own CPS->PTPSearch rules
-                if not self.torrent_meets_quality_spec(torrent, type):
-                    log.info('Ignoring \'%s\' because it does not meet the quality spec of \'%s\'' % (torrentName, qualityID))
-                    continue
-                # if we know the IMDB id, this must be the correct name. This avoids failing the CouchPotato name check if we know for certain we have the correct movie.
-                torrentNameMovieTitle = movieTitle if imdbID else self.htmltoascii(ptpmovie['Title'])
-                torrentName = re.sub('[^A-Za-z0-9\-_ \(\).]+', '', '%s (%s) - %s' % (torrentNameMovieTitle, ptpmovie['Year'], torrentdesc))
-                new = {
-                    'id': int(torrent['Id']),
-                    'type': 'torrent',
-                    'name': torrentName,
-                    'check_nzb': False,
-                    'description': '',
-                    'date': int(time.mktime(parse(torrent['UploadTime']).timetuple())),
-                    'size': int(torrent['Size']) / (1024 * 1024),
-                    'provider': self.getName(),
-                    'seeders': int(torrent['Seeders']),
-                    'leechers': int(torrent['Leechers']),
-                    'ptpobj': self,
-                    'torrentjson': torrent,
-                    'extra_score': (lambda torrent: (50 if torrent['torrentjson']['GoldenPopcorn'] else 0)),
-                    'download': self.download,
-                }
-                new['url'] = 'https://%s/torrents.php?action=download&id=%d&authkey=%s&torrent_pass=%s' % (self.domain, new['id'], authkey, passkey)
-                new['score'] = fireEvent('score.calculate', new, movie, single=True)
-                if fireEvent('searcher.correct_movie', nzb=new, movie=movie, quality=quality):
-                    results.append(new)
-                    self.found(new)
-        if not results:
-            log.info("After quality-based filtering, found nothing for '%s' at quality '%s' with search parameters %s" % (movieTitle, qualityID, params))
-        return results
-
-    def getMoreInfo(self, item):
-        return {}
+    def getLoginParams(self):
+        return tryUrlencode({
+             'username': self.conf('username'),
+             'password': self.conf('password'),
+             'keeplogged': '1',
+             'login': 'Login'
+        })

From 6b7d29bae1b356f3e7adffdc95c62ca273ee5e65 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 16:19:55 +0200
Subject: [PATCH 18/26] Cleanup

---
 couchpotato/core/plugins/searcher/main.py                 | 6 +++---
 couchpotato/core/providers/torrent/passthepopcorn/main.py | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/couchpotato/core/plugins/searcher/main.py b/couchpotato/core/plugins/searcher/main.py
index dfef760a..69039a1f 100644
--- a/couchpotato/core/plugins/searcher/main.py
+++ b/couchpotato/core/plugins/searcher/main.py
@@ -23,7 +23,7 @@ class Searcher(Plugin):
     in_progress = False
 
     def __init__(self):
-        addEvent('searcher.all', self.all_movies)
+        addEvent('searcher.all', self.allMovies)
         addEvent('searcher.single', self.single)
         addEvent('searcher.correct_movie', self.correctMovie)
         addEvent('searcher.download', self.download)
@@ -37,11 +37,11 @@ class Searcher(Plugin):
         })
 
         # Schedule cronjob
-        fireEvent('schedule.cron', 'searcher.all', self.all_movies, day = self.conf('cron_day'), hour = self.conf('cron_hour'), minute = self.conf('cron_minute'))
+        fireEvent('schedule.cron', 'searcher.all', self.allMovies, day = self.conf('cron_day'), hour = self.conf('cron_hour'), minute = self.conf('cron_minute'))
         fireEvent('schedule.interval', 'searcher.check_snatched', self.checkSnatched, minutes = self.conf('run_every'))
 
 
-    def all_movies(self):
+    def allMovies(self):
 
         if self.in_progress:
             log.info('Search already in progress')
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
index a5a60f9a..f9dd016c 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/main.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py
@@ -1,4 +1,3 @@
-from bs4 import BeautifulSoup
 from couchpotato.core.event import fireEvent
 from couchpotato.core.helpers.encoding import tryUrlencode
 from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts

From 440bcfb7a1b06c3cae5464bd1d6783f76f65ddc9 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 18:32:15 +0200
Subject: [PATCH 19/26] Use count for mergedict

---
 couchpotato/core/providers/movie/_modifier/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/providers/movie/_modifier/main.py b/couchpotato/core/providers/movie/_modifier/main.py
index d0886702..5af1659e 100644
--- a/couchpotato/core/providers/movie/_modifier/main.py
+++ b/couchpotato/core/providers/movie/_modifier/main.py
@@ -31,7 +31,7 @@ class MovieResultModifier(Plugin):
                 order.append(imdb)
 
             if item.get('via_imdb'):
-                if order.index(imdb):
+                if order.count(imdb):
                     order.remove(imdb)
                 order.insert(0, imdb)
 

From 3087944461bd77ada62ae0e30213dbf4f83fcb4e Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 18:35:49 +0200
Subject: [PATCH 20/26] Don't search imdb when no name is found

---
 couchpotato/core/providers/movie/imdbapi/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/couchpotato/core/providers/movie/imdbapi/main.py b/couchpotato/core/providers/movie/imdbapi/main.py
index c81a9aba..9238f45a 100644
--- a/couchpotato/core/providers/movie/imdbapi/main.py
+++ b/couchpotato/core/providers/movie/imdbapi/main.py
@@ -27,7 +27,7 @@ class IMDBAPI(MovieProvider):
 
         name_year = fireEvent('scanner.name_year', q, single = True)
 
-        if not q or not name_year.get('name'):
+        if not q or not name_year or (name_year and not name_year.get('name')):
             return []
 
         cache_key = 'imdbapi.cache.%s' % q

From 7a77ddf0e9ed45e5fbdde7817924f4e72118d303 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 18:36:53 +0200
Subject: [PATCH 21/26] Add description to ptp

---
 couchpotato/core/providers/torrent/passthepopcorn/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
index f9dd016c..f9416f74 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/main.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py
@@ -135,6 +135,7 @@ class PassThePopcorn(TorrentProvider):
                         'type': 'torrent',
                         'provider': self.getName(),
                         'name': torrent_name,
+                        'description': '',
                         'url': '%s?action=download&id=%d&authkey=%s&torrent_pass=%s' % (self.urls['torrent'], torrent_id, authkey, passkey),
                         'detail_url': self.urls['detail'] % torrent_id,
                         'date': tryInt(time.mktime(parse(torrent['UploadTime']).timetuple())),

From 7f52d8e4960c542f0e911c06a89abae414e871a6 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 19:39:39 +0200
Subject: [PATCH 22/26] Don't use srrdb anymore, it's buggy.

---
 couchpotato/core/plugins/searcher/main.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/couchpotato/core/plugins/searcher/main.py b/couchpotato/core/plugins/searcher/main.py
index 69039a1f..c464741f 100644
--- a/couchpotato/core/plugins/searcher/main.py
+++ b/couchpotato/core/plugins/searcher/main.py
@@ -328,10 +328,6 @@ class Searcher(Plugin):
                 if len(movie_words) <= 2 and self.correctYear([nzb['name']], movie['library']['year'], 0):
                     return True
 
-        # Get the nfo and see if it contains the proper imdb url
-        if self.checkNFO(nzb['name'], movie['library']['identifier']):
-            return True
-
         log.info("Wrong: %s, undetermined naming. Looking for '%s (%s)'" % (nzb['name'], movie_name, movie['library']['year']))
         return False
 
@@ -406,19 +402,6 @@ class Searcher(Plugin):
 
         return False
 
-    def checkNFO(self, check_name, imdb_id):
-        cache_key = 'srrdb.com %s' % simplifyString(check_name)
-
-        nfo = self.getCache(cache_key)
-        if not nfo:
-            try:
-                nfo = self.urlopen('http://www.srrdb.com/showfile.php?release=%s' % check_name, show_error = False)
-                self.setCache(cache_key, nfo)
-            except:
-                pass
-
-        return nfo and getImdb(nfo) == imdb_id
-
     def couldBeReleased(self, wanted_quality, dates, pre_releases):
 
         now = int(time.time())

From b121a2e8278ecedea7dbfeccfd7a0ee5ad8c74d5 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 20:13:46 +0200
Subject: [PATCH 23/26] Add traceback to unicode encoding

---
 couchpotato/core/helpers/encoding.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/couchpotato/core/helpers/encoding.py b/couchpotato/core/helpers/encoding.py
index 9b1f575c..b4f4b70a 100644
--- a/couchpotato/core/helpers/encoding.py
+++ b/couchpotato/core/helpers/encoding.py
@@ -2,6 +2,7 @@ from couchpotato.core.logger import CPLog
 from string import ascii_letters, digits
 from urllib import quote_plus
 import re
+import traceback
 import unicodedata
 
 log = CPLog(__name__)
@@ -30,8 +31,8 @@ def toUnicode(original, *args):
                     return ek(original, *args)
                 except:
                     raise
-    except UnicodeDecodeError:
-        log.error('Unable to decode value: %s... ', repr(original)[:20])
+    except:
+        log.error('Unable to decode value "%s..." : %s ', (repr(original)[:20], traceback.format_exc()))
         ascii_text = str(original).encode('string_escape')
         return toUnicode(ascii_text)
 

From f799e70e18a392704a11536576ad5a37d92ddba6 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Sun, 2 Sep 2012 20:47:24 +0200
Subject: [PATCH 24/26] Only try and remove old folders once. fix #786

---
 couchpotato/core/plugins/renamer/main.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py
index 9a443ed2..437374ea 100644
--- a/couchpotato/core/plugins/renamer/main.py
+++ b/couchpotato/core/plugins/renamer/main.py
@@ -314,6 +314,7 @@ class Renamer(Plugin):
                     break
 
             # Remove files
+            delete_folders = []
             for src in remove_files:
 
                 if isinstance(src, File):
@@ -329,13 +330,17 @@ class Renamer(Plugin):
                         os.remove(src)
 
                         parent_dir = os.path.normpath(os.path.dirname(src))
-                        if os.path.isdir(parent_dir) and destination != parent_dir:
-                            self.deleteEmptyFolder(parent_dir, show_error = False)
+                        if delete_folders.count(parent_dir) == 0 and os.path.isdir(parent_dir) and destination != parent_dir:
+                            delete_folders.append(parent_dir)
 
                 except:
                     log.error('Failed removing %s: %s', (src, traceback.format_exc()))
                     self.tagDir(group, 'failed_remove')
 
+            # Delete leftover folder from older releases
+            for delete_folder in delete_folders:
+                self.deleteEmptyFolder(delete_folder, show_error = False)
+
             # Rename all files marked
             group['renamed_files'] = []
             for src in rename_files:

From 5b517e1202a867db4d1961bc96eb970b8cfdfd49 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Mon, 3 Sep 2012 09:54:14 +0200
Subject: [PATCH 25/26] Blackhole failed when only enabled torrent support. fix
 #791

---
 couchpotato/core/downloaders/blackhole/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/couchpotato/core/downloaders/blackhole/main.py b/couchpotato/core/downloaders/blackhole/main.py
index 4713adf7..ca38fc49 100644
--- a/couchpotato/core/downloaders/blackhole/main.py
+++ b/couchpotato/core/downloaders/blackhole/main.py
@@ -11,7 +11,9 @@ class Blackhole(Downloader):
     type = ['nzb', 'torrent', 'torrent_magnet']
 
     def download(self, data = {}, movie = {}, manual = False, filedata = None):
-        if self.isDisabled(manual) or (not self.isCorrectType(data.get('type')) or (not self.conf('use_for') in ['both', data.get('type')])):
+        if self.isDisabled(manual) or \
+        (not self.isCorrectType(data.get('type')) or \
+        (not self.conf('use_for') in ['both', 'torrent' if 'torrent' in data.get('type') else data.get('type')])):
             return
 
         directory = self.conf('directory')

From 864cd0e09118e43b05504e1dc2f00d9f985d9b61 Mon Sep 17 00:00:00 2001
From: Ruud <ruud@crashdummy.nl>
Date: Mon, 3 Sep 2012 10:31:46 +0200
Subject: [PATCH 26/26] Added 2 more TPB proxies

---
 couchpotato/core/providers/torrent/thepiratebay/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/couchpotato/core/providers/torrent/thepiratebay/main.py b/couchpotato/core/providers/torrent/thepiratebay/main.py
index 7b102958..a4ce3631 100644
--- a/couchpotato/core/providers/torrent/thepiratebay/main.py
+++ b/couchpotato/core/providers/torrent/thepiratebay/main.py
@@ -37,6 +37,8 @@ class ThePirateBay(TorrentProvider):
         'https://piratereverse.info',
         'https://tpb.pirateparty.org.uk',
         'https://argumentomteemigreren.nl',
+        'https://livepirate.com/',
+        'https://www.getpirate.com/',
     ]
 
     def __init__(self):