From 092f53d26aa575f25ea8bb313e40a23e01251db7 Mon Sep 17 00:00:00 2001
From: Correl Roush <correl@gmail.com>
Date: Tue, 3 Jun 2014 23:52:35 -0400
Subject: [PATCH] Add proxy fail-over to Pirate Bay search

---
 resources/language/English/strings.xml |  2 +-
 resources/language/Russian/strings.xml |  2 +-
 resources/language/Spanish/strings.xml |  2 +-
 resources/lib/search.py                | 16 ++++++++++++----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 872929d..332d6e0 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -21,7 +21,7 @@
 
     <!-- Adding / Search -->
     <string id="200">Browse for torrent file</string>
-    <string id="202">Search ThePirateBay.org</string>
+    <string id="202">Search ThePirateBay</string>
     <string id="203">Search Mininova.org</string>
     <string id="204">Search KickassTorrents</string>
     <string id="290">Searching...</string>
diff --git a/resources/language/Russian/strings.xml b/resources/language/Russian/strings.xml
index 373426b..7db2253 100644
--- a/resources/language/Russian/strings.xml
+++ b/resources/language/Russian/strings.xml
@@ -21,7 +21,7 @@
 
     <!-- Adding / Search -->
     <string id="200">Выбрать торрент-файл</string>
-    <string id="202">Искать на ThePirateBay.org</string>
+    <string id="202">Искать на ThePirateBay</string>
     <string id="203">Искать на Mininova.org</string>
     <string id="204">Искать на KickassTorrents</string>
     <string id="290">Поиск...</string>
diff --git a/resources/language/Spanish/strings.xml b/resources/language/Spanish/strings.xml
index 46569cb..2d11925 100644
--- a/resources/language/Spanish/strings.xml
+++ b/resources/language/Spanish/strings.xml
@@ -21,7 +21,7 @@
 
     <!-- Adding / Search -->
     <string id="200">Buscar un archivo torrent</string>
-    <string id="202">Buscar en ThePirateBay.org</string>
+    <string id="202">Buscar en ThePirateBay</string>
     <string id="203">Buscar en Mininova.org</string>
     <string id="204">Buscar en KickassTorrents</string>
     <string id="290">Buscando...</string>
diff --git a/resources/lib/search.py b/resources/lib/search.py
index 49d9151..0369220 100644
--- a/resources/lib/search.py
+++ b/resources/lib/search.py
@@ -1,6 +1,6 @@
 import re
 import socket
-from urllib2 import urlopen
+from urllib2 import urlopen, URLError
 from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup
 
 socket.setdefaulttimeout(15)
@@ -30,11 +30,19 @@ class Mininova(Search):
         return torrents
 class TPB(Search):
     def __init__(self):
-        self.search_uri = 'http://thepiratebay.se/search/%s/'
+        self.search_uris = ['http://thepiratebay.se/search/%s/',
+                            'http://pirateproxy.net/search/%s/']
     def search(self, terms):
         torrents = []
-        url = self.search_uri % '+'.join(terms.split(' '))
-        f = urlopen(url)
+        f = None
+        for url in [u % '+'.join(terms.split(' ')) for u in self.search_uris]:
+            try:
+                f = urlopen(url)
+                break
+            except URLError:
+                continue
+        if not f:
+            raise Exception('Out of pirate bay proxies')
         soup = BeautifulSoup(f.read())
         for details in soup.findAll('a', {'class': 'detLink'}):
             name = details.text