From b225980ce7e5aaf3145903aba07b3f483617a46d Mon Sep 17 00:00:00 2001 From: Ruud Date: Fri, 21 Dec 2012 22:14:37 +0100 Subject: [PATCH] Use pubDate and enclosure length for newznab --- couchpotato/core/providers/nzb/newznab/main.py | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/couchpotato/core/providers/nzb/newznab/main.py b/couchpotato/core/providers/nzb/newznab/main.py index 43ea2bd..7b3c226 100644 --- a/couchpotato/core/providers/nzb/newznab/main.py +++ b/couchpotato/core/providers/nzb/newznab/main.py @@ -117,29 +117,18 @@ class Newznab(NZBProvider, RSS): results = [] for nzb in nzbs: - date = '' - size = 0 - for item in nzb: - if item.attrib.get('name') == 'size': - size = item.attrib.get('value') - elif item.attrib.get('name') == 'usenetdate': - date = item.attrib.get('value') - - if date is '': log.debug('Date not parsed properly or not available for %s: %s', (host['host'], self.getTextElement(nzb, "title"))) - if size is 0: log.debug('Size not parsed properly or not available for %s: %s', (host['host'], self.getTextElement(nzb, "title"))) - - id = self.getTextElement(nzb, "guid").split('/')[-1:].pop() + nzb_id = self.getTextElement(nzb, "guid").split('/')[-1:].pop() new = { - 'id': id, + 'id': nzb_id, 'provider': self.getName(), 'provider_extra': host['host'], 'type': 'nzb', 'name': self.getTextElement(nzb, "title"), - 'age': self.calculateAge(int(time.mktime(parse(date).timetuple()))), - 'size': int(size) / 1024 / 1024, - 'url': (self.getUrl(host['host'], self.urls['download']) % id) + self.getApiExt(host), + 'age': self.calculateAge(int(time.mktime(parse(self.getTextElement(nzb, 'pubDate')).timetuple()))), + 'size': int(self.getElement(nzb, "enclosure").attrib['length']) / 1024 / 1024, + 'url': (self.getUrl(host['host'], self.urls['download']) % nzb_id) + self.getApiExt(host), 'download': self.download, - 'detail_url': '%sdetails/%s' % (cleanHost(host['host']), id), + 'detail_url': '%sdetails/%s' % (cleanHost(host['host']), nzb_id), 'content': self.getTextElement(nzb, "description"), }