From a4779738622898e0078e22e113be68f76d755d55 Mon Sep 17 00:00:00 2001
From: mano3m <mano3m@users.noreply.github.com>
Date: Sun, 13 Apr 2014 15:47:26 +0200
Subject: [PATCH] Provider fixes

Fixes #3097 #3086  #3106
---
 couchpotato/core/media/_base/providers/base.py            | 2 +-
 .../core/media/_base/providers/torrent/kickasstorrents.py | 4 ++--
 .../core/media/_base/providers/torrent/thepiratebay.py    | 8 ++++++--
 .../core/media/movie/providers/torrent/publichd.py        | 2 +-
 .../core/media/movie/providers/torrent/thepiratebay.py    | 2 +-
 .../core/media/movie/providers/torrent/torrentshack.py    | 4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/couchpotato/core/media/_base/providers/base.py b/couchpotato/core/media/_base/providers/base.py
index 4476bc49..2b668931 100644
--- a/couchpotato/core/media/_base/providers/base.py
+++ b/couchpotato/core/media/_base/providers/base.py
@@ -200,7 +200,7 @@ class YarrProvider(Provider):
             self._search(media, quality, results)
         # Search possible titles
         else:
-            media_title = fireEvent('library.query', media, single = True)
+            media_title = fireEvent('library.query', media, include_year = False, single = True)
 
             for title in possibleTitles(media_title):
                 self._searchOnTitle(title, media, quality, results)
diff --git a/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py b/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py
index 534dc926..f040b9ae 100644
--- a/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py
+++ b/couchpotato/core/media/_base/providers/torrent/kickasstorrents.py
@@ -65,8 +65,8 @@ class Base(TorrentMagnetProvider):
                                 if column_name:
 
                                     if column_name == 'name':
-                                        link = td.find('div', {'class': 'torrentname'}).find_all('a')[1]
-                                        new['id'] = temp.get('id')[-8:]
+                                        link = td.find('div', {'class': 'torrentname'}).find_all('a')[2]
+                                        new['id'] = temp.get('id')[-7:]
                                         new['name'] = link.text
                                         new['url'] = td.find('a', 'imagnet')['href']
                                         new['detail_url'] = self.urls['detail'] % (self.getDomain(), link['href'][1:])
diff --git a/couchpotato/core/media/_base/providers/torrent/thepiratebay.py b/couchpotato/core/media/_base/providers/torrent/thepiratebay.py
index d401e6b3..b840fc71 100644
--- a/couchpotato/core/media/_base/providers/torrent/thepiratebay.py
+++ b/couchpotato/core/media/_base/providers/torrent/thepiratebay.py
@@ -65,7 +65,7 @@ class Base(TorrentMagnetProvider):
                         pass
 
                     entries = results_table.find_all('tr')
-                    for result in entries[2:]:
+                    for result in entries[1:]:
                         link = result.find(href = re.compile('torrent\/\d+\/'))
                         download = result.find(href = re.compile('magnet:'))
 
@@ -109,7 +109,11 @@ class Base(TorrentMagnetProvider):
         full_description = self.getCache('tpb.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
         html = BeautifulSoup(full_description)
         nfo_pre = html.find('div', attrs = {'class': 'nfo'})
-        description = toUnicode(nfo_pre.text) if nfo_pre else ''
+        description = ''
+        try: 
+            description = toUnicode(nfo_pre.text)
+        except:
+            pass
 
         item['description'] = description
         return item
diff --git a/couchpotato/core/media/movie/providers/torrent/publichd.py b/couchpotato/core/media/movie/providers/torrent/publichd.py
index ce54c468..9fed4619 100644
--- a/couchpotato/core/media/movie/providers/torrent/publichd.py
+++ b/couchpotato/core/media/movie/providers/torrent/publichd.py
@@ -11,4 +11,4 @@ autoload = 'PublicHD'
 class PublicHD(MovieProvider, Base):
 
     def buildUrl(self, media):
-        return fireEvent('library.query', media, single = True)
+        return fireEvent('library.query', media, single = True).replace(':', '')
diff --git a/couchpotato/core/media/movie/providers/torrent/thepiratebay.py b/couchpotato/core/media/movie/providers/torrent/thepiratebay.py
index f804d709..0dc8313d 100644
--- a/couchpotato/core/media/movie/providers/torrent/thepiratebay.py
+++ b/couchpotato/core/media/movie/providers/torrent/thepiratebay.py
@@ -13,7 +13,7 @@ class ThePirateBay(MovieProvider, Base):
 
     cat_ids = [
         ([209], ['3d']),
-        ([207], ['720p', '1080p']),
+        ([207], ['720p', '1080p', 'bd50']),
         ([201], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr']),
         ([201, 207], ['brrip']),
         ([202], ['dvdr'])
diff --git a/couchpotato/core/media/movie/providers/torrent/torrentshack.py b/couchpotato/core/media/movie/providers/torrent/torrentshack.py
index 85e420dd..01eb6d6a 100644
--- a/couchpotato/core/media/movie/providers/torrent/torrentshack.py
+++ b/couchpotato/core/media/movie/providers/torrent/torrentshack.py
@@ -31,6 +31,6 @@ class TorrentShack(MovieProvider, Base):
 
     def buildUrl(self, media, quality):
         query = (tryUrlencode(fireEvent('library.query', media, single = True)),
-                 self.getCatId(quality)[0],
-                 self.getSceneOnly())
+                 self.getSceneOnly(),
+                 self.getCatId(quality)[0])
         return query