Removed isAvailableCheck

This commit is contained in:
Ruud
2012-05-20 19:56:41 +02:00
parent a9c27e3057
commit 19640a9192
8 changed files with 11 additions and 11 deletions

View File

@@ -22,7 +22,7 @@ class Mysterbin(NZBProvider):
def search(self, movie, quality):
results = []
if self.isDisabled() or not self.isAvailable(self.urls['search']):
if self.isDisabled():
return results
q = '"%s" %s %s' % (getTitle(movie['library']), movie['library']['year'], quality.get('identifier'))
@@ -39,7 +39,7 @@ class Mysterbin(NZBProvider):
'nopasswd': 'on',
}
cache_key = 'mysterbin.%s.%s' % (movie['library']['identifier'], quality.get('identifier'))
cache_key = 'mysterbin.%s.%s.%s' % (movie['library']['identifier'], quality.get('identifier'), q)
data = self.getCache(cache_key, self.urls['search'] % tryUrlencode(params))
if data:

View File

@@ -39,7 +39,7 @@ class Newzbin(NZBProvider, RSS):
def search(self, movie, quality):
results = []
if self.isDisabled() or not self.isAvailable(self.urls['search']):
if self.isDisabled():
return results
format_id = self.getFormatId(type)

View File

@@ -51,7 +51,7 @@ class Newznab(NZBProvider, RSS):
def singleFeed(self, host):
results = []
if self.isDisabled(host) or not self.isAvailable(self.getUrl(host['host'], self.urls['search'])):
if self.isDisabled(host):
return results
arguments = tryUrlencode({
@@ -83,7 +83,7 @@ class Newznab(NZBProvider, RSS):
def singleSearch(self, host, movie, quality):
results = []
if self.isDisabled(host) or not self.isAvailable(self.getUrl(host['host'], self.urls['search'])):
if self.isDisabled(host):
return results
cat_id = self.getCatId(quality['identifier'])

View File

@@ -24,7 +24,7 @@ class NZBClub(NZBProvider, RSS):
def search(self, movie, quality):
results = []
if self.isDisabled() or not self.isAvailable(self.urls['search']):
if self.isDisabled():
return results
q = '"%s" %s %s' % (getTitle(movie['library']), movie['library']['year'], quality.get('identifier'))
@@ -40,7 +40,7 @@ class NZBClub(NZBProvider, RSS):
'ns': 1,
}
cache_key = 'nzbclub.%s.%s' % (movie['library']['identifier'], quality.get('identifier'))
cache_key = 'nzbclub.%s.%s.%s' % (movie['library']['identifier'], quality.get('identifier'), q)
data = self.getCache(cache_key, self.urls['search'] % tryUrlencode(params))
if data:
try:

View File

@@ -26,7 +26,7 @@ class NzbIndex(NZBProvider, RSS):
def search(self, movie, quality):
results = []
if self.isDisabled() or not self.isAvailable(self.urls['api']):
if self.isDisabled():
return results
q = '%s %s %s' % (getTitle(movie['library']), movie['library']['year'], quality.get('identifier'))

View File

@@ -32,7 +32,7 @@ class NZBMatrix(NZBProvider, RSS):
results = []
if self.isDisabled() or not self.isAvailable(self.urls['search']):
if self.isDisabled():
return results
cat_ids = ','.join(['%s' % x for x in self.getCatId(quality.get('identifier'))])

View File

@@ -34,7 +34,7 @@ class KickAssTorrents(TorrentProvider):
def search(self, movie, quality):
results = []
if self.isDisabled() or not self.isAvailable(self.urls['test']):
if self.isDisabled():
return results
cache_key = 'kickasstorrents.%s.%s' % (movie['library']['identifier'], quality.get('identifier'))

View File

@@ -31,7 +31,7 @@ class ThePirateBay(TorrentProvider):
def find(self, movie, quality, type):
results = []
if not self.enabled() or not self.isAvailable(self.apiUrl):
if not self.enabled():
return results
url = self.apiUrl % (quote_plus(self.toSearchString(movie.name + ' ' + quality) + self.makeIgnoreString(type)), self.getCatId(type))