diff --git a/couchpotato/core/providers/nzb/moovee/main.py b/couchpotato/core/providers/nzb/moovee/main.py
index 240607e..82ad304 100644
--- a/couchpotato/core/providers/nzb/moovee/main.py
+++ b/couchpotato/core/providers/nzb/moovee/main.py
@@ -1,5 +1,4 @@
from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.rss import RSS
from couchpotato.core.logger import CPLog
from couchpotato.core.providers.nzb.base import NZBProvider
from dateutil.parser import parse
@@ -10,24 +9,34 @@ import time
log = CPLog(__name__)
-class Moovee(NZBProvider, RSS):
+class Moovee(NZBProvider):
urls = {
'download': 'http://85.214.105.230/get_nzb.php?id=%s§ion=moovee',
'search': 'http://abmoovee.allfilled.com/search.php?q=%s&Search=Search',
- 'regex': '
(?P.*?) | .+?(?P.*?) | .+?(?P.*?) | ',
}
+ regex = '(?P.*?) | .+?(?P.*?) | .+?(?P.*?) | '
+
def search(self, movie, quality):
results = []
if self.isDisabled() or not self.isAvailable(self.urls['search']):
return results
- url = self.urls['search'] % quote_plus(movie['library']['titles'][0]['title'] + ' ' + quality.get('identifier'))
- log.info('Searching: %s' % url)
+ q = '%s %s' % (movie['library']['titles'][0]['title'], quality.get('identifier'))
+ url = self.urls['search'] % quote_plus(q)
+
+ cache_key = 'moovee.%s' % q
+ data = self.getCache(cache_key)
+ if not data:
+ data = self.urlopen(url)
+ self.setCache(cache_key, data)
+
+ if not data:
+ log.error('Failed to get data from %s.' % url)
+ return results
- data = self.urlopen(url)
match = re.compile(self.urls['regex'], re.DOTALL).finditer(data)
for nzb in match:
diff --git a/couchpotato/core/providers/nzb/x264/main.py b/couchpotato/core/providers/nzb/x264/main.py
index 9d790f7..aba7f64 100644
--- a/couchpotato/core/providers/nzb/x264/main.py
+++ b/couchpotato/core/providers/nzb/x264/main.py
@@ -1,40 +1,51 @@
from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.rss import RSS
from couchpotato.core.helpers.variable import tryInt
from couchpotato.core.logger import CPLog
from couchpotato.core.providers.nzb.base import NZBProvider
from urllib import quote_plus
-from dateutil.parser import parse
+import math
import re
-import time
log = CPLog(__name__)
-class X264(NZBProvider, RSS):
+class X264(NZBProvider):
urls = {
'download': 'http://85.214.105.230/get_nzb.php?id=%s§ion=hd',
'search': 'http://85.214.105.230/x264/requests.php?release=%s&status=FILLED&age=700&sort=ID',
- 'regex': '(?P.*?) | (?P.*?) | .+?(?P\d+)d.+? | ',
}
+ regex = '
(?P.*?) | (?P.*?) | .+?(?P.*?) | '
+
def search(self, movie, quality):
results = []
if self.isDisabled() or not self.isAvailable(self.urls['search']):
return results
- url = self.urls['search'] % quote_plus(movie['library']['titles'][0]['title'] + ' ' + quality.get('identifier'))
- log.info('Searching: %s' % url)
+ q = '%s %s' % (movie['library']['titles'][0]['title'], quality.get('identifier'))
+ url = self.urls['search'] % quote_plus(q)
+
+ cache_key = 'x264.%s' % q
+ data = self.getCache(cache_key)
+ if not data:
+ data = self.urlopen(url)
+ self.setCache(cache_key, data)
+
+ if not data:
+ log.error('Failed to get data from %s.' % url)
+ return results
- data = self.urlopen(url)
- match = re.compile(self.urls['regex'], re.DOTALL).finditer(data)
+ match = re.compile(self.regex, re.DOTALL).finditer(data)
for nzb in match:
- age = nzb.group('age')
- if not age:
+ try:
+ age_match = re.match('((?P\d+)d)', nzb.group('age'))
+ age = age_match.group('day')
+ except:
age = 1
+
new = {
'id': nzb.group('id'),
'name': nzb.group('title'),
@@ -49,6 +60,8 @@ class X264(NZBProvider, RSS):
'check_nzb': False,
}
+ print new['name']
+
new['score'] = fireEvent('score.calculate', new, movie, single = True)
is_correct_movie = fireEvent('searcher.correct_movie',
nzb = new, movie = movie, quality = quality,
@@ -72,4 +85,4 @@ class X264(NZBProvider, RSS):
match = re.match('http://85\.214\.105\.230/get_nzb\.php\?id=[0-9]*§ion=hd', url)
if match:
return self
- return
\ No newline at end of file
+ return