Merge branch 'master' of https://github.com/t3d/calibre

src/calibre/gui2/store/stores/empik_plugin.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-store_version = 9  # Needed for dynamic plugin loading
+store_version = 10  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
-__copyright__ = '2011-2019, Tomasz Długosz <[email protected]>'
+__copyright__ = '2011-2023, Tomasz Długosz <[email protected]>'
 __docformat__ = 'restructuredtext en'
 
 from base64 import b64encode
@@ -68,13 +68,13 @@ def search(self, query, max_results=10, timeout=60):
                 if counter <= 0:
                     break
 
-                id = ''.join(data.xpath('.//div[@class="name"]/a/@href'))
+                id = ''.join(data.xpath('.//a[@class="img seoImage"]/@href'))
                 if not id:
                     continue
 
+                title = ''.join(data.xpath('.//h2[@class="product-title"]/a/strong/text()'))
+                author = ', '.join(data.xpath('.//a[@class="smartAuthor "]/text()'))
                 cover_url = ''.join(data.xpath('.//a/img[@class="lazy"]/@lazy-img'))
-                author = ', '.join(data.xpath('.//a[@class="smartAuthor"]/text()'))
-                title = ''.join(data.xpath('.//div[@class="name"]/a/@title'))
                 price = ''.join(data.xpath('.//div[@class="price ta-price-tile "]/text()'))
 
                 # with closing(br.open('https://empik.com' + id.strip(), timeout=timeout/4)) as nf:

src/calibre/gui2/store/stores/legimi_plugin.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-store_version = 11  # Needed for dynamic plugin loading
+store_version = 12  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011-2023, Tomasz Długosz <[email protected]>'
@@ -57,7 +57,7 @@ def open(self, parent=None, detail_item=None, external=False):
             d.exec()
 
     def search(self, query, max_results=10, timeout=60):
-        url = 'https://www.legimi.pl/ebooki/?sort=score&searchphrase=' + quote_plus(query)
+        url = 'https://www.legimi.pl/ebooki/?sort=score&filters=ebooks&searchphrase=' + quote_plus(query)
 
         br = browser()
 

src/calibre/gui2/store/stores/virtualo_plugin.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-store_version = 11  # Needed for dynamic plugin loading
+store_version = 12  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011-2023, Tomasz Długosz <[email protected]>'
@@ -74,7 +74,7 @@ def search(self, query, max_results=12, timeout=60):
                 if not id:
                     continue
 
-                price = ''.join(data.xpath('.//div[@class="info"]//div[@class="price"]/text()'))
+                price = ''.join(data.xpath('.//div[@class="info"]//div[@class="price"]/div/text()|.//div[@class="info"]//div[@class="price price--no-promo"]/div/text()'))
                 cover_url = ''.join(data.xpath('.//img[@class="cover"]/@src'))
                 title = ''.join(data.xpath('.//h3[@class="title"]/a//text()'))
                 author = ', '.join(data.xpath('.//div[@class="info"]//div[@class="authors"]/a//text()'))