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

Q-Qaysaneah · Aug 27, 2018 · e6b5cc5 · e6b5cc5
2 parents e8958ac + 263f832
commit e6b5cc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
@@ -1515,7 +1515,6 @@ class StoreBeamEBooksDEStore(StoreBase):
     drm_free_only = True
     headquarters = 'DE'
     formats = ['EPUB', 'MOBI', 'PDF']
-    affiliate = True
 
 
 class StoreBiblioStore(StoreBase):

diff --git a/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py b/src/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import (unicode_literals, division, absolute_import, print_function)
-store_version = 3  # Needed for dynamic plugin loading
+store_version = 4  # Needed for dynamic plugin loading
 
 __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <[email protected]>'
@@ -25,19 +25,16 @@
 class BeamEBooksDEStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
-        url = 'http://klick.affiliwelt.net/klick.php?bannerid=10072&pid=32307&prid=908'
-        url_details = ('http://klick.affiliwelt.net/klick.php?'
-                       'bannerid=66830&pid=32307&prid=908&'
-                       'url={0}')
+        url = 'https://www.beam-shop.de/'
 
         if external or self.config.get('open_external', False):
             if detail_item:
-                url = url_details.format(detail_item)
+                url = detail_item
             open_url(QUrl(url))
         else:
             detail_url = None
             if detail_item:
-                detail_url = url_details.format(detail_item)
+                detail_url = detail_item
             d = WebStoreDialog(self.gui, url, parent, detail_url)
             d.setWindowTitle(self.name)
             d.set_tags(self.config.get('tags', ''))