media list, cc, deluge fixes

resources/contenters/CXZ.py

@@ -98,7 +98,10 @@ class CXZ(Content.Content):
     sourceWeight = 2
 
 
-    def isLabel(self):
+    def isTracker(self):
+        return False
+
+    def isSearcher(self):
         return False
 
     def isInfoLink(self):

resources/contenters/EZTV.py

@@ -40,9 +40,12 @@ class EZTV(Content.Content):
     '''
     sourceWeight = 1
 
-    def isLabel(self):
+    def isTracker(self):
         return True
 
+    def isSearcher(self):
+        return False
+
     def isScrappable(self):
         return False
 

resources/contenters/FastTorrent.py

@@ -51,7 +51,10 @@ class FastTorrent(Content.Content):
     '''
     sourceWeight = 1
 
-    def isLabel(self):
+    def isTracker(self):
+        return False
+
+    def isSearcher(self):
         return False
 
     def isScrappable(self):

resources/contenters/IMDB.py

@@ -81,7 +81,10 @@ class IMDB(Content.Content):
     '''
     sourceWeight = 2
 
-    def isLabel(self):
+    def isTracker(self):
+        return False
+
+    def isSearcher(self):
         return False
 
     def isPages(self):

resources/contenters/KickAssSo.py

@@ -50,9 +50,12 @@ class KickAssSo(Content.Content):
     '''
     sourceWeight = 1
 
-    def isLabel(self):
+    def isTracker(self):
         return True
 
+    def isSearcher(self):
+        return False
+
     def isScrappable(self):
         return False
 

resources/contenters/KinoPoisk.py

@@ -87,7 +87,10 @@ class KinoPoisk(Content.Content):
     '''
     sourceWeight = 2
 
-    def isLabel(self):
+    def isTracker(self):
+        return False
+
+    def isSearcher(self):
         return False
 
     def isPages(self):

resources/contenters/RiperAM.py

@@ -45,7 +45,10 @@ class RiperAM(Content.Content):
     '''
     sourceWeight = 1
 
-    def isLabel(self):
+    def isTracker(self):
+        return True
+
+    def isSearcher(self):
         return True
 
     def isScrappable(self):

resources/contenters/SWESUB.py

@@ -118,7 +118,7 @@ class SWESUB(Content.Content):
             # info
 
             info['label'] = info['title'] = self.unescape(title)
-            info['link'] = '%s::%s' % ('Nyaa', self.baseurl + '/downloads' + link + '/')
+            info['link'] = self.baseurl + '/downloads' + link + '/'
             info['infolink'] = self.baseurl + link + '.html'
 
             info['plot'] = article.find('div', {'class': 'item-content'}).text

resources/contenters/ThePirateBaySe.py

@@ -38,7 +38,7 @@ class ThePirateBaySe(Content.Content):
                                                              {'name': 'by Date', 'url_after': '/0/3/0'}]}),
     }
 
-    baseurl = "https://thepiratebay.se"
+    baseurl = "thepiratebay.gd"
     headers = [('User-Agent',
                 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.124' + \
                 ' YaBrowser/14.10.2062.12061 Safari/537.36'),
@@ -50,9 +50,12 @@ class ThePirateBaySe(Content.Content):
     '''
     sourceWeight = 1
 
-    def isLabel(self):
+    def isTracker(self):
         return True
 
+    def isSearcher(self):
+        return False
+
     def isScrappable(self):
         return False
 
@@ -72,7 +75,7 @@ class ThePirateBaySe(Content.Content):
         contentList = []
         url = self.get_url(category, subcategory, apps_property)
 
-        response = self.makeRequest(url, headers=self.headers)
+        response = self.open2(url)
 
         if None != response and 0 < len(response):
             # print response
@@ -81,6 +84,17 @@ class ThePirateBaySe(Content.Content):
         # print str(contentList)
         return contentList
 
+    def open2(self, url=''):
+        import httplib
+        conn = httplib.HTTPConnection(self.baseurl)
+        conn.request("GET", url.replace(self.baseurl,''))
+        r1 = conn.getresponse()
+        status = str(r1.status) + " " + r1.reason
+        content = r1.read()
+        #print str(status)
+        #print str(content)
+        return content
+
     def mode(self, response):
         contentList = []
         # print str(result)

resources/language/English/strings.xml

@@ -53,6 +53,7 @@
     <string id="50315">Login</string>
     <string id="50316">Password</string>
     <string id="50311">Torrent Client</string>
+    <string id="50317">URL (only No SSL)</string>
     <string id="30426">Path replacement (remote only)</string>
     <string id="30412">Close</string>
     <string id="30413">Open Settings</string>

resources/language/Russian/strings.xml

@@ -52,6 +52,7 @@
     <string id="50314">URL</string>
     <string id="50315">Логин</string>
     <string id="50316">Пароль</string>
+    <string id="50317">URL (только без SSL)</string>
     <string id="50311">Торрент-клиент</string>
     <string id="30426">Замена пути (remote only)</string>
     <string id="30412">Закрыть</string>

resources/settings.xml

@@ -168,7 +168,7 @@
         <setting id="torrent_vuze_login" type="text" label="50315" visible="eq(-12,2)" default=""/>
         <setting id="torrent_vuze_password" type="text" label="50316" visible="eq(-13,2)" default="" option="hidden"/>
         <setting id="torrent_deluge_host" type="ipaddress" label="50312" visible="eq(-14,3)" default="127.0.0.1"/>
-        <setting id="torrent_deluge_url" type="enum" label="50314" visible="eq(-15,3)" values="http:// (only No SSL)" default="0"/>
+        <setting id="torrent_deluge_path" type="text" label="50317" visible="eq(-15,3)" default="/"/>
         <setting id="torrent_deluge_port" type="number" label="50313" visible="eq(-16,3)" default="8112"/>
         <setting id="torrent_deluge_password" type="text" label="50316" visible="eq(-17,3)" default="deluge" option="hidden"/>
     </category>

resources/utorrent/net.py

@@ -849,10 +849,11 @@ class Deluge:
         self.login = login
         self.password = password
 
-        self.url = ['http://', 'https://'][int(url)] + host
+        self.url = 'http://'+host
         if port:
             self.url += ':' + str(port)
-
+        self.url += url
+        print str(self.url)
         self.http = HTTP()
 
     def get_info(self):
@@ -1299,7 +1300,7 @@ class Download():
             config = {
                 'host': self.setting.getSetting("torrent_deluge_host"),
                 'port': self.setting.getSetting("torrent_deluge_port"),
-                'url': self.setting.getSetting("torrent_deluge_url"),
+                'url': self.setting.getSetting("torrent_deluge_path"),
                 'login': '',
                 'password': self.setting.getSetting("torrent_deluge_password")
             }