Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get Books: Fix DRM status indicators for Kobo and Diesel stores. Fix smashwords not returning results. Fixes #993755 (Searching for ebooks on Smashwords returns no result)

Browse Source
This commit is contained in:
Kovid Goyal 2012-05-12 23:53:40 +05:30
commit f0c0a56385
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/store/stores/diesel_ebooks_plugin.py
View File

@ -72,7 +72,7 @@ class DieselEbooksStore(BasicStoreConfig, StorePlugin):
formats = ', '.join(data.xpath('.//div[@class="book-info"]//text()')).strip() formats = ', '.join(data.xpath('.//div[@class="book-info"]//text()')).strip()
a, b, formats = formats.partition('Format:') a, b, formats = formats.partition('Format:')
drm = SearchResult.DRM_LOCKED drm = SearchResult.DRM_LOCKED
if 'drm free' not in formats.lower(): if 'drm free' in formats.lower():
drm = SearchResult.DRM_UNLOCKED drm = SearchResult.DRM_UNLOCKED

2
src/calibre/gui2/store/stores/kobo_plugin.py
View File

@ -69,7 +69,7 @@ class KoboStore(BasicStoreConfig, StorePlugin):
title = ''.join(data.xpath('.//div[@class="SCItemHeader"]/h1/a[1]/text()')) title = ''.join(data.xpath('.//div[@class="SCItemHeader"]/h1/a[1]/text()'))
author = ', '.join(data.xpath('.//div[@class="SCItemSummary"]//span//a/text()')) author = ', '.join(data.xpath('.//div[@class="SCItemSummary"]//span//a/text()'))
drm = data.xpath('boolean(.//span[@class="SCAvailibilityFormatsText" and contains(text(), "DRM")])') drm = data.xpath('boolean(.//span[@class="SCAvailibilityFormatsText" and not(contains(text(), "DRM-Free"))])')
counter -= 1 counter -= 1

2
src/calibre/gui2/store/stores/smashwords_plugin.py
View File

@ -53,7 +53,7 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin):
counter = max_results counter = max_results
with closing(br.open(url, timeout=timeout)) as f: with closing(br.open(url, timeout=timeout)) as f:
doc = html.fromstring(f.read()) doc = html.fromstring(f.read())
for data in doc.xpath('//div[@id="pageCenterContent2"]//div[@class="bookCoverImg"]'): for data in doc.xpath('//div[@id="pageCenterContent"]//div[@class="bookCoverImg"]'):
if counter <= 0: if counter <= 0:
break break
data = html.fromstring(html.tostring(data)) data = html.fromstring(html.tostring(data))