From a7753901f62a456b1876ea84a49f8be3613ffd2e Mon Sep 17 00:00:00 2001 From: bwq Date: Wed, 12 Oct 2011 23:09:40 +0200 Subject: [PATCH] Added date, size none to get around size requirements and some other stuff. --- couchpotato/core/providers/nzb/moovee/main.py | 12 +++++++++--- couchpotato/core/providers/nzb/x264/main.py | 19 +++++++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/couchpotato/core/providers/nzb/moovee/main.py b/couchpotato/core/providers/nzb/moovee/main.py index f440697..240607e 100644 --- a/couchpotato/core/providers/nzb/moovee/main.py +++ b/couchpotato/core/providers/nzb/moovee/main.py @@ -2,6 +2,7 @@ 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 from urllib import quote_plus import re import time @@ -30,14 +31,13 @@ class Moovee(NZBProvider, RSS): match = re.compile(self.urls['regex'], re.DOTALL).finditer(data) for nzb in match: - new = { 'id': nzb.group('reqid'), 'name': nzb.group('title'), 'type': 'nzb', 'provider': self.getName(), - 'age': self.calculateAge(time.mktime(time.strptime(nzb.group('age'), '%Y-%m-%d %H:%M:%S'))), - 'size': 9999, + 'age': self.calculateAge(time.mktime(parse(nzb.group('age')).timetuple())), + 'size': None, 'url': self.urls['download'] % (nzb.group('reqid')), 'download': self.download, 'detail_url': '', @@ -63,3 +63,9 @@ class Moovee(NZBProvider, RSS): except Exception, e: log.error('Failed downloading from #alt.binaries.moovee: %s' % e) return False + + def belongsTo(self, url, host = None): + match = re.match('http://85\.214\.105\.230/get_nzb\.php\?id=[0-9]*§ion=moovee', url) + if match: + return self + return diff --git a/couchpotato/core/providers/nzb/x264/main.py b/couchpotato/core/providers/nzb/x264/main.py index 878e6a3..9d790f7 100644 --- a/couchpotato/core/providers/nzb/x264/main.py +++ b/couchpotato/core/providers/nzb/x264/main.py @@ -1,8 +1,10 @@ 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 re import time @@ -14,7 +16,7 @@ class X264(NZBProvider, RSS): 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.*?)</td>', + 'regex': '<tr class="req_filled"><td class="reqid">(?P<id>.*?)</td><td class="release">(?P<title>.*?)</td>.+?<td class="age">(?P<age>\d+)d.+?</td>', } def search(self, movie, quality): @@ -30,13 +32,16 @@ class X264(NZBProvider, RSS): match = re.compile(self.urls['regex'], re.DOTALL).finditer(data) for nzb in match: + age = nzb.group('age') + if not age: + age = 1 new = { 'id': nzb.group('id'), 'name': nzb.group('title'), 'type': 'nzb', 'provider': self.getName(), - 'age': self.calculateAge(time.time()), - 'size': 9999, + 'age': tryInt(age), + 'size': None, 'url': self.urls['download'] % (nzb.group('id')), 'download': self.download, 'detail_url': '', @@ -57,8 +62,14 @@ class X264(NZBProvider, RSS): def download(self, url = '', nzb_id = ''): try: log.info('Downloading nzb from #alt.binaries.hdtv.x264, request id: %s ' % nzb_id) - return self.urlopen(self.urls['download'] % nzb_id) + except Exception, e: log.error('Failed downloading from #alt.binaries.hdtv.x264: %s' % e) return False + + def belongsTo(self, url, host = None): + 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