diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 1495417964..c321bb62ae 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1476,6 +1476,7 @@ class StoreKoobeStore(StoreBase): drm_free_only = True headquarters = 'PL' formats = ['EPUB', 'MOBI', 'PDF'] + affiliate = True class StoreLegimiStore(StoreBase): name = 'Legimi' diff --git a/src/calibre/gui2/store/stores/koobe_plugin.py b/src/calibre/gui2/store/stores/koobe_plugin.py index f717e73c75..52bdd41e54 100644 --- a/src/calibre/gui2/store/stores/koobe_plugin.py +++ b/src/calibre/gui2/store/stores/koobe_plugin.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- from __future__ import (division, absolute_import, print_function) -store_version = 2 # Needed for dynamic plugin loading +store_version = 3 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2013, Tomasz Długosz ' __docformat__ = 'restructuredtext en' import urllib +from base64 import b64encode from contextlib import closing from lxml import html @@ -24,21 +25,20 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog class KoobeStore(BasicStoreConfig, StorePlugin): def open(self, parent=None, detail_item=None, external=False): - #aff_root = 'https://www.a4b-tracking.com/pl/stat-click-text-link/15/58/' + aff_root = 'https://www.a4b-tracking.com/pl/stat-click-text-link/15/58/' + url = 'http://www.koobe.pl/' - #aff_url = aff_root + str(b64encode(url)) + aff_url = aff_root + str(b64encode(url)) detail_url = None if detail_item: - detail_url = detail_item #aff_root + str(b64encode(detail_item)) + detail_url = aff_root + str(b64encode(detail_item)) if external or self.config.get('open_external', False): - #open_url(QUrl(url_slash_cleaner(detail_url if detail_url else aff_url))) - open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url))) + open_url(QUrl(url_slash_cleaner(detail_url if detail_url else aff_url))) else: - #d = WebStoreDialog(self.gui, url, parent, detail_url if detail_url else aff_url) - d = WebStoreDialog(self.gui, url, parent, detail_url if detail_url else url) + d = WebStoreDialog(self.gui, url, parent, detail_url if detail_url else aff_url) d.setWindowTitle(self.name) d.set_tags(self.config.get('tags', '')) d.exec_() @@ -63,7 +63,7 @@ class KoobeStore(BasicStoreConfig, StorePlugin): cover_url = ''.join(data.xpath('.//div[@class="cover"]/a/img/@src')) price = ''.join(data.xpath('.//span[@class="current_price"]/text()')) title = ''.join(data.xpath('.//h2[@class="title"]/a/text()')) - author = ''.join(data.xpath('.//h3[@class="book_author"]/a/text()')) + author = ', '.join(data.xpath('.//h3[@class="book_author"]/a/text()')) formats = ', '.join(data.xpath('.//div[@class="formats"]/div/div/@title')) counter -= 1 diff --git a/src/calibre/gui2/store/stores/publio_plugin.py b/src/calibre/gui2/store/stores/publio_plugin.py index 44f3267b35..dfcd2eaec9 100644 --- a/src/calibre/gui2/store/stores/publio_plugin.py +++ b/src/calibre/gui2/store/stores/publio_plugin.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 1 # Needed for dynamic plugin loading +store_version = 2 # Needed for dynamic plugin loading __license__ = 'GPL 3' -__copyright__ = '2012, Tomasz Długosz ' +__copyright__ = '2012-2013, Tomasz Długosz ' __docformat__ = 'restructuredtext en' import urllib @@ -25,12 +25,12 @@ class PublioStore(BasicStoreConfig, StorePlugin): def open(self, parent=None, detail_item=None, external=False): google_analytics = '?utm_source=tdcalibre&utm_medium=calibre' - url = 'http://www.publio.pl/e-booki.html' + google_analytics + url = 'http://www.publio.pl/' + google_analytics if external or self.config.get('open_external', False): open_url(QUrl(url_slash_cleaner((detail_item + google_analytics) if detail_item else url))) else: - d = WebStoreDialog(self.gui, url, parent, detail_item) + d = WebStoreDialog(self.gui, url, parent, detail_item if detail_item else url) d.setWindowTitle(self.name) d.set_tags(self.config.get('tags', '')) d.exec_() @@ -42,7 +42,7 @@ class PublioStore(BasicStoreConfig, StorePlugin): counter = max_results page = 1 while counter: - with closing(br.open('http://www.publio.pl/e-booki,strona' + str(page) + '.html?q=' + urllib.quote(query), timeout=timeout)) as f: + with closing(br.open('http://www.publio.pl/szukaj,strona' + str(page) + '.html?q=' + urllib.quote(query) + '§ions=EMAGAZINE§ions=MINIBOOK§ions=EBOOK', timeout=timeout)) as f: doc = html.fromstring(f.read()) for data in doc.xpath('//div[@class="item"]'): if counter <= 0: