A spot of refactoring

src/calibre/gui2/store/opensearch_store.py

@@ -21,6 +21,66 @@ from calibre.utils.opensearch.description import Description
 from calibre.utils.opensearch.query import Query
 
 
+def open_search(url, query, max_results=10, timeout=60):
+    description = Description(url)
+    url_template = description.get_best_template()
+    if not url_template:
+        return
+    oquery = Query(url_template)
+
+    # set up initial values
+    oquery.searchTerms = query
+    oquery.count = max_results
+    url = oquery.url()
+
+    counter = max_results
+    br = browser()
+    with closing(br.open(url, timeout=timeout)) as f:
+        doc = etree.fromstring(f.read())
+        for data in doc.xpath('//*[local-name() = "entry"]'):
+            if counter <= 0:
+                break
+
+            counter -= 1
+
+            s = SearchResult()
+
+            s.detail_item = ''.join(data.xpath('./*[local-name() = "id"]/text()')).strip()
+
+            for link in data.xpath('./*[local-name() = "link"]'):
+                rel = link.get('rel')
+                href = link.get('href')
+                type = link.get('type')
+
+                if rel and href and type:
+                    if 'http://opds-spec.org/thumbnail' in rel:
+                        s.cover_url = href
+                    elif 'http://opds-spec.org/image/thumbnail' in rel:
+                        s.cover_url = href
+                    elif 'http://opds-spec.org/acquisition/buy' in rel:
+                        s.detail_item = href
+                    elif 'http://opds-spec.org/acquisition' in rel:
+                        if type:
+                            ext = guess_extension(type)
+                            if ext:
+                                ext = ext[1:].upper().strip()
+                                s.downloads[ext] = href
+            s.formats = ', '.join(s.downloads.keys()).strip()
+
+            s.title = ' '.join(data.xpath('./*[local-name() = "title"]//text()')).strip()
+            s.author = ', '.join(data.xpath('./*[local-name() = "author"]//*[local-name() = "name"]//text()')).strip()
+
+            price_e = data.xpath('.//*[local-name() = "price"][1]')
+            if price_e:
+                price_e = price_e[0]
+                currency_code = price_e.get('currencycode', '')
+                price = ''.join(price_e.xpath('.//text()')).strip()
+                s.price = currency_code + ' ' + price
+                s.price = s.price.strip()
+
+            yield s
+
+
 class OpenSearchOPDSStore(StorePlugin):
 
     open_search_url = ''
@@ -39,63 +99,7 @@ class OpenSearchOPDSStore(StorePlugin):
             d.exec_()
 
     def search(self, query, max_results=10, timeout=60):
-        if not hasattr(self, 'open_search_url'):
+        if not getattr(self, 'open_search_url', None):
             return
-
+        for result in open_search(self.open_search_url, query, max_results=max_results, timeout=timeout):
-        description = Description(self.open_search_url)
+            yield result
-        url_template = description.get_best_template()
-        if not url_template:
-            return
-        oquery = Query(url_template)
-
-        # set up initial values
-        oquery.searchTerms = query
-        oquery.count = max_results
-        url = oquery.url()
-
-        counter = max_results
-        br = browser()
-        with closing(br.open(url, timeout=timeout)) as f:
-            doc = etree.fromstring(f.read())
-            for data in doc.xpath('//*[local-name() = "entry"]'):
-                if counter <= 0:
-                    break
-
-                counter -= 1
-
-                s = SearchResult()
-
-                s.detail_item = ''.join(data.xpath('./*[local-name() = "id"]/text()')).strip()
-
-                for link in data.xpath('./*[local-name() = "link"]'):
-                    rel = link.get('rel')
-                    href = link.get('href')
-                    type = link.get('type')
-
-                    if rel and href and type:
-                        if 'http://opds-spec.org/thumbnail' in rel:
-                            s.cover_url = href
-                        elif 'http://opds-spec.org/image/thumbnail' in rel:
-                            s.cover_url = href
-                        elif 'http://opds-spec.org/acquisition/buy' in rel:
-                            s.detail_item = href
-                        elif 'http://opds-spec.org/acquisition' in rel:
-                            if type:
-                                ext = guess_extension(type)
-                                if ext:
-                                    ext = ext[1:].upper().strip()
-                                    s.downloads[ext] = href
-                s.formats = ', '.join(s.downloads.keys()).strip()
-
-                s.title = ' '.join(data.xpath('./*[local-name() = "title"]//text()')).strip()
-                s.author = ', '.join(data.xpath('./*[local-name() = "author"]//*[local-name() = "name"]//text()')).strip()
-
-                price_e = data.xpath('.//*[local-name() = "price"][1]')
-                if price_e:
-                    price_e = price_e[0]
-                    currency_code = price_e.get('currencycode', '')
-                    price = ''.join(price_e.xpath('.//text()')).strip()
-                    s.price = currency_code + ' ' + price
-                    s.price = s.price.strip()
-
-                yield s