Browse Source

Added date, size none to get around size requirements and some other stuff.

pull/54/head
bwq 14 years ago
parent
commit
a7753901f6
  1. 12
      couchpotato/core/providers/nzb/moovee/main.py
  2. 19
      couchpotato/core/providers/nzb/x264/main.py

12
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.helpers.rss import RSS
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.providers.nzb.base import NZBProvider from couchpotato.core.providers.nzb.base import NZBProvider
from dateutil.parser import parse
from urllib import quote_plus from urllib import quote_plus
import re import re
import time import time
@ -30,14 +31,13 @@ class Moovee(NZBProvider, RSS):
match = re.compile(self.urls['regex'], re.DOTALL).finditer(data) match = re.compile(self.urls['regex'], re.DOTALL).finditer(data)
for nzb in match: for nzb in match:
new = { new = {
'id': nzb.group('reqid'), 'id': nzb.group('reqid'),
'name': nzb.group('title'), 'name': nzb.group('title'),
'type': 'nzb', 'type': 'nzb',
'provider': self.getName(), 'provider': self.getName(),
'age': self.calculateAge(time.mktime(time.strptime(nzb.group('age'), '%Y-%m-%d %H:%M:%S'))), 'age': self.calculateAge(time.mktime(parse(nzb.group('age')).timetuple())),
'size': 9999, 'size': None,
'url': self.urls['download'] % (nzb.group('reqid')), 'url': self.urls['download'] % (nzb.group('reqid')),
'download': self.download, 'download': self.download,
'detail_url': '', 'detail_url': '',
@ -63,3 +63,9 @@ class Moovee(NZBProvider, RSS):
except Exception, e: except Exception, e:
log.error('Failed downloading from #alt.binaries.moovee: %s' % e) log.error('Failed downloading from #alt.binaries.moovee: %s' % e)
return False return False
def belongsTo(self, url, host = None):
match = re.match('http://85\.214\.105\.230/get_nzb\.php\?id=[0-9]*&section=moovee', url)
if match:
return self
return

19
couchpotato/core/providers/nzb/x264/main.py

@ -1,8 +1,10 @@
from couchpotato.core.event import fireEvent from couchpotato.core.event import fireEvent
from couchpotato.core.helpers.rss import RSS from couchpotato.core.helpers.rss import RSS
from couchpotato.core.helpers.variable import tryInt
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.providers.nzb.base import NZBProvider from couchpotato.core.providers.nzb.base import NZBProvider
from urllib import quote_plus from urllib import quote_plus
from dateutil.parser import parse
import re import re
import time import time
@ -14,7 +16,7 @@ class X264(NZBProvider, RSS):
urls = { urls = {
'download': 'http://85.214.105.230/get_nzb.php?id=%s&section=hd', 'download': 'http://85.214.105.230/get_nzb.php?id=%s&section=hd',
'search': 'http://85.214.105.230/x264/requests.php?release=%s&status=FILLED&age=700&sort=ID', 'search': 'http://85.214.105.230/x264/requests.php?release=%s&status=FILLED&age=700&sort=ID',
'regex': '<tr class="req_filled"><td class="reqid">(?P<id>.*?)</td><td class="release">(?P<title>.*?)</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): def search(self, movie, quality):
@ -30,13 +32,16 @@ class X264(NZBProvider, RSS):
match = re.compile(self.urls['regex'], re.DOTALL).finditer(data) match = re.compile(self.urls['regex'], re.DOTALL).finditer(data)
for nzb in match: for nzb in match:
age = nzb.group('age')
if not age:
age = 1
new = { new = {
'id': nzb.group('id'), 'id': nzb.group('id'),
'name': nzb.group('title'), 'name': nzb.group('title'),
'type': 'nzb', 'type': 'nzb',
'provider': self.getName(), 'provider': self.getName(),
'age': self.calculateAge(time.time()), 'age': tryInt(age),
'size': 9999, 'size': None,
'url': self.urls['download'] % (nzb.group('id')), 'url': self.urls['download'] % (nzb.group('id')),
'download': self.download, 'download': self.download,
'detail_url': '', 'detail_url': '',
@ -57,8 +62,14 @@ class X264(NZBProvider, RSS):
def download(self, url = '', nzb_id = ''): def download(self, url = '', nzb_id = ''):
try: try:
log.info('Downloading nzb from #alt.binaries.hdtv.x264, request id: %s ' % nzb_id) log.info('Downloading nzb from #alt.binaries.hdtv.x264, request id: %s ' % nzb_id)
return self.urlopen(self.urls['download'] % nzb_id) return self.urlopen(self.urls['download'] % nzb_id)
except Exception, e: except Exception, e:
log.error('Failed downloading from #alt.binaries.hdtv.x264: %s' % e) log.error('Failed downloading from #alt.binaries.hdtv.x264: %s' % e)
return False return False
def belongsTo(self, url, host = None):
match = re.match('http://85\.214\.105\.230/get_nzb\.php\?id=[0-9]*&section=hd', url)
if match:
return self
return
Loading…
Cancel
Save