Merge lp:~user-none/calibre/store into lp:calibre

[John Schember]

=== modified file 'src/calibre/gui2/store/stores/amazon_plugin.py'
--- src/calibre/gui2/store/stores/amazon_plugin.py	2012-04-29 15:46:14 +0000
+++ src/calibre/gui2/store/stores/amazon_plugin.py	2012-05-12 18:28:18 +0000
@@ -156,8 +156,6 @@
                     cover_xpath = './/div[@class="productImage"]//img/@src'
                     title_xpath = './/div[@class="productTitle"]/a/text()'
                     price_xpath = './/div[@class="newPrice"]//span//text()'
-                    
-            
             
             for data in doc.xpath(data_xpath):
                 if counter <= 0:

=== modified file 'src/calibre/gui2/store/stores/diesel_ebooks_plugin.py'
--- src/calibre/gui2/store/stores/diesel_ebooks_plugin.py	2012-05-12 17:38:06 +0000
+++ src/calibre/gui2/store/stores/diesel_ebooks_plugin.py	2012-05-12 18:28:18 +0000
@@ -7,6 +7,7 @@
 __docformat__ = 'restructuredtext en'
 
 import random
+import re
 import urllib
 from contextlib import closing
 
@@ -52,32 +53,27 @@
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
             doc = html.fromstring(f.read())
-            for data in doc.xpath('//div[contains(@class, "item")]'):
-                if counter <= 0:
-                    break
-
-                id = ''.join(data.xpath('div[@class="cover"]/a/@href'))
-                if not id or '/item/' not in id:
-                    continue
-
-                cover_url = ''.join(data.xpath('div[@class="cover"]//img/@src'))
-
-                title = ''.join(data.xpath('.//div[@class="content"]//h2/a/text()'))
-                author = ''.join(data.xpath('.//div[@class="content"]/span//a/text()'))
-                price = ''
-                price_elem = data.xpath('.//div[@class="price_fat"]//h1/text()')
-                if price_elem:
-                    price = price_elem[0]
-
-                formats = ', '.join(data.xpath('.//div[@class="book-info"]//text()')).strip()
+
+            if doc.xpath('not(boolean(//select[contains(@id, "selection")]))'):
+                id = ''.join(doc.xpath('//div[@class="price_fat"]//a/@href'))
+                mo = re.search('(?<=id=).+?(?=&)', id)
+                if not mo:
+                    yield None
+                id = mo.group()
+
+                cover_url = ''.join(doc.xpath('//div[@class="cover"]/a/@href'))
+
+                title = ''.join(doc.xpath('//div[@class="desc_fat"]//h1/text()'))
+                author = ''.join(doc.xpath('//div[@class="desc_fat"]//span[@itemprop="author"]/text()'))
+                price = ''.join(doc.xpath('//div[@class="price_fat"]//h1/text()'))
+
+                formats = ', '.join(doc.xpath('//div[@class="desc_fat"]//p[contains(text(), "Format")]/text()'))
                 a, b, formats = formats.partition('Format:')
+
                 drm = SearchResult.DRM_LOCKED
                 if 'drm free' in formats.lower():
                     drm = SearchResult.DRM_UNLOCKED
 
-
-                counter -= 1
-
                 s = SearchResult()
                 s.cover_url = cover_url
                 s.title = title.strip()
@@ -88,3 +84,39 @@
                 s.drm = drm
 
                 yield s
+            else:
+                for data in doc.xpath('//div[contains(@class, "item")]'):
+                    if counter <= 0:
+                        break
+
+                    id = ''.join(data.xpath('div[@class="cover"]/a/@href'))
+                    if not id or '/item/' not in id:
+                        continue
+
+                    cover_url = ''.join(data.xpath('div[@class="cover"]//img/@src'))
+
+                    title = ''.join(data.xpath('.//div[@class="content"]//h2/a/text()'))
+                    author = ''.join(data.xpath('.//div[@class="content"]/span//a/text()'))
+                    price = ''
+                    price_elem = data.xpath('.//div[@class="price_fat"]//h1/text()')
+                    if price_elem:
+                        price = price_elem[0]
+
+                    formats = ', '.join(data.xpath('.//div[@class="book-info"]//text()')).strip()
+                    a, b, formats = formats.partition('Format:')
+                    drm = SearchResult.DRM_LOCKED
+                    if 'drm free' in formats.lower():
+                        drm = SearchResult.DRM_UNLOCKED
+
+                    counter -= 1
+
+                    s = SearchResult()
+                    s.cover_url = cover_url
+                    s.title = title.strip()
+                    s.author = author.strip()
+                    s.price = price.strip()
+                    s.detail_item = id.strip()
+                    s.formats = formats
+                    s.drm = drm
+
+                    yield s