Code cleanup

This commit is contained in:
Alex Stanev 2011-07-20 17:45:00 +03:00
parent 47b9f6dcfd
commit ea0301816c

View File

@ -55,36 +55,21 @@ class ChitankaStore(BasicStoreConfig, StorePlugin):
if counter <= 0: if counter <= 0:
break break
id = ''.join(data.xpath('.//a[@class="booklink"]/@href')) id = ''.join(data.xpath('.//a[@class="booklink"]/@href')).strip()
if not id: if not id:
continue continue
cover_url = ''.join(data.xpath('.//a[@class="booklink"]/img/@src'))
title = ''.join(data.xpath('.//a[@class="booklink"]/i/text()'))
author = ''.join(data.xpath('.//span[@class="bookauthor"]/a/text()'))
fb2 = ''.join(data.xpath('.//a[@class="dl dl-fb2"]/@href'))
epub = ''.join(data.xpath('.//a[@class="dl dl-epub"]/@href'))
txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href'))
# remove .zip extensions
if fb2.find('.zip') != -1:
fb2 = fb2[:fb2.find('.zip')]
if epub.find('.zip') != -1:
epub = epub[:epub.find('.zip')]
if txt.find('.zip') != -1:
txt = txt[:txt.find('.zip')]
counter -= 1 counter -= 1
s = SearchResult() s = SearchResult()
s.cover_url = cover_url s.cover_url = ''.join(data.xpath('.//a[@class="booklink"]/img/@src')).strip()
s.title = title.strip() s.title = ''.join(data.xpath('.//a[@class="booklink"]/i/text()')).strip()
s.author = author.strip() s.author = ''.join(data.xpath('.//span[@class="bookauthor"]/a/text()')).strip()
s.detail_item = id.strip() s.detail_item = id
s.drm = SearchResult.DRM_UNLOCKED s.drm = SearchResult.DRM_UNLOCKED
s.downloads['FB2'] = base_url + fb2.strip() s.downloads['FB2'] = base_url + ''.join(data.xpath('.//a[@class="dl dl-fb2"]/@href')).strip().replace('.zip', '')
s.downloads['EPUB'] = base_url + epub.strip() s.downloads['EPUB'] = base_url + ''.join(data.xpath('.//a[@class="dl dl-epub"]/@href')).strip().replace('.zip', '')
s.downloads['TXT'] = base_url + txt.strip() s.downloads['TXT'] = base_url + ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href')).strip().replace('.zip', '')
s.formats = 'FB2, EPUB, TXT, SFB' s.formats = 'FB2, EPUB, TXT, SFB'
yield s yield s
@ -106,35 +91,20 @@ class ChitankaStore(BasicStoreConfig, StorePlugin):
if counter <= 0: if counter <= 0:
break break
id = ''.join(data.xpath('.//a[@class="booklink"]/@href')) id = ''.join(data.xpath('.//a[@class="booklink"]/@href')).strip()
if not id: if not id:
continue continue
cover_url = ''.join(data.xpath('.//a[@class="booklink"]/img/@src'))
title = ''.join(data.xpath('.//a[@class="booklink"]/i/text()'))
author = ''.join(data.xpath('.//span[@class="bookauthor"]/a/text()'))
fb2 = ''.join(data.xpath('.//a[@class="dl dl-fb2"]/@href'))
epub = ''.join(data.xpath('.//a[@class="dl dl-epub"]/@href'))
txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href'))
# remove .zip extensions
if fb2.find('.zip') != -1:
fb2 = fb2[:fb2.find('.zip')]
if epub.find('.zip') != -1:
epub = epub[:epub.find('.zip')]
if txt.find('.zip') != -1:
txt = txt[:txt.find('.zip')]
counter -= 1 counter -= 1
s = SearchResult() s = SearchResult()
s.cover_url = cover_url s.cover_url = ''.join(data.xpath('.//a[@class="booklink"]/img/@src')).strip()
s.title = title.strip() s.title = ''.join(data.xpath('.//a[@class="booklink"]/i/text()')).strip()
s.author = author.strip() s.author = ''.join(data.xpath('.//span[@class="bookauthor"]/a/text()')).strip()
s.detail_item = id.strip() s.detail_item = id
s.drm = SearchResult.DRM_UNLOCKED s.drm = SearchResult.DRM_UNLOCKED
s.downloads['FB2'] = base_url + fb2.strip() s.downloads['FB2'] = base_url + ''.join(data.xpath('.//a[@class="dl dl-fb2"]/@href')).strip().replace('.zip', '')
s.downloads['EPUB'] = base_url + epub.strip() s.downloads['EPUB'] = base_url + ''.join(data.xpath('.//a[@class="dl dl-epub"]/@href')).strip().replace('.zip', '')
s.downloads['TXT'] = base_url + txt.strip() s.downloads['TXT'] = base_url + ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href')).strip().replace('.zip', '')
s.formats = 'FB2, EPUB, TXT, SFB' s.formats = 'FB2, EPUB, TXT, SFB'
yield s yield s