OpenSearch: Fix a few bugs. Store: Use Feedbooks OpenSearch.

src/calibre/gui2/store/feedbooks_plugin.py

@@ -6,101 +6,23 @@ __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
-import urllib2
-from contextlib import closing
-
-from lxml import html
-
-from PyQt4.Qt import QUrl
-
-from calibre import browser, url_slash_cleaner
-from calibre.gui2 import open_url
-from calibre.gui2.store import StorePlugin
 from calibre.gui2.store.basic_config import BasicStoreConfig
+from calibre.gui2.store.opensearch_store import OpenSearchStore
 from calibre.gui2.store.search_result import SearchResult
-from calibre.gui2.store.web_store_dialog import WebStoreDialog
 
-class FeedbooksStore(BasicStoreConfig, StorePlugin):
+class FeedbooksStore(BasicStoreConfig, OpenSearchStore):
     
-    def open(self, parent=None, detail_item=None, external=False):
+    open_search_url = 'http://assets0.feedbooks.net/opensearch.xml?t=1253087147'
-        url = 'http://m.feedbooks.com/'
+    web_url = 'http://feedbooks.com/'
-        ext_url = 'http://feedbooks.com/'
+    
-
+    # http://www.feedbooks.com/catalog
-        if external or self.config.get('open_external', False):
-            if detail_item:
-                ext_url = ext_url + detail_item
-            open_url(QUrl(url_slash_cleaner(ext_url)))
-        else:
-            detail_url = None
-            if detail_item:
-                detail_url = url + detail_item
-            d = WebStoreDialog(self.gui, url, parent, detail_url)
-            d.setWindowTitle(self.name)
-            d.set_tags(self.config.get('tags', ''))
-            d.exec_()
 
     def search(self, query, max_results=10, timeout=60):
-        url = 'http://m.feedbooks.com/search?query=' + urllib2.quote(query)
+        for s in OpenSearchStore.search(self, query, max_results, timeout):
-        
+            if s.downloads:
-        br = browser()
+                s.drm = SearchResult.DRM_UNLOCKED
-        
+                s.price = '$0.00'
-        counter = max_results
-        with closing(br.open(url, timeout=timeout)) as f:
-            doc = html.fromstring(f.read())
-            for data in doc.xpath('//ul[@class="m-list"]//li'):
-                if counter <= 0:
-                    break
-                data = html.fromstring(html.tostring(data))
-                
-                id = ''
-                id_a = data.xpath('//a[@class="buy"]')
-                if id_a:
-                    id = id_a[0].get('href', None)
-                    id = id.split('/')[-2]
-                    id = '/item/' + id
-                else:
-                    id_a = data.xpath('//a[@class="download"]')
-                    if id_a:
-                        id = id_a[0].get('href', None)
-                        id = id.split('/')[-1]
-                        id = id.split('.')[0]
-                        id = '/book/' + id
-                if not id:
-                    continue
-                
-                title = ''.join(data.xpath('//h5//a/text()'))
-                author = ''.join(data.xpath('//h6//a/text()'))
-                price = ''.join(data.xpath('//a[@class="buy"]/text()'))
-                formats = 'EPUB'
-                if not price:
-                    price = '$0.00'
-                    formats = 'EPUB, MOBI, PDF'
-                cover_url = ''
-                cover_url_img =  data.xpath('//img')
-                if cover_url_img:
-                    cover_url = cover_url_img[0].get('src')
-                    cover_url.split('?')[0]
-                
-                counter -= 1
-                
-                s = SearchResult()
-                s.cover_url = cover_url
-                s.title = title.strip()
-                s.author = author.strip()
-                s.price = price.replace(' ', '').strip()
-                s.detail_item = id.strip()
-                s.formats = formats
-                
-                yield s
-
-    def get_details(self, search_result, timeout):
-        url = 'http://m.feedbooks.com/'
-        
-        br = browser()
-        with closing(br.open(url_slash_cleaner(url + search_result.detail_item), timeout=timeout)) as nf:
-            idata = html.fromstring(nf.read())
-            if idata.xpath('boolean(//div[contains(@class, "m-description-long")]//p[contains(., "DRM") or contains(b, "Protection")])'):
-                search_result.drm = SearchResult.DRM_LOCKED
             else:
-                search_result.drm = SearchResult.DRM_UNLOCKED
+                s.drm = SearchResult.DRM_LOCKED
-        return True
+                s.formats = 'EPUB'
+            yield s

src/calibre/utils/opensearch/description.py

@@ -87,7 +87,7 @@ class Description:
             return self.urls[0].template
 
         # out of luck
-        return Nil
+        return None
         
 
     # these are internal methods for querying xml

src/calibre/utils/opensearch/osfeedparser.py

@@ -46,8 +46,8 @@ _debug = 0
 # If you are embedding feedparser in a larger application, you should
 # change this to your application name and URL.
 # Changed by John Schember
-from calibre import random_user_agent
+from calibre import USER_AGENT
-USER_AGENT = random_user_agent()
+USER_AGENT = USER_AGENT
 
 # HTTP "Accept" header to send to servers when downloading feeds.  If you don't
 # want to send an Accept header, set this to None.