Merge lp:~tomek3d/calibre/store into lp:calibre

[Tomasz Długosz]

2 days ago i've been noticed by afiliant.com that Empik's afiliate program got suspended.

Please double check this change, as I get an not related error (upgraded fedora to 19 yesterday):
calibre 0.9.14 isfrozen: False is64bit: True
Linux-3.7.2-201.fc18.x86_64-x86_64-with-fedora-18-Spherical_Cow Linux ('64bit', 'ELF')
('Linux', '3.7.2-201.fc18.x86_64', '#1 SMP Fri Jan 11 22:16:23 UTC 2013')
Python 2.7.3
Linux: ('Fedora', '18', 'Spherical Cow')
Traceback (most recent call last):
  File "/usr/bin/calibre-debug", line 20, in <module>
    sys.exit(main())
  File "/home/tomek/store/src/calibre/debug.py", line 206, in main
    main(['calibre'])
  File "/home/tomek/store/src/calibre/gui2/main.py", line 401, in main
    app, opts, args, actions = init_qt(args)
  File "/home/tomek/store/src/calibre/gui2/main.py", line 85, in init_qt
    from calibre.gui2.ui import Main
  File "/home/tomek/store/src/calibre/gui2/ui.py", line 31, in <module>
    from calibre.gui2.widgets import ProgressIndicator
  File "/home/tomek/store/src/calibre/gui2/widgets.py", line 21, in <module>
    from calibre.gui2.progress_indicator import ProgressIndicator as _ProgressIndicator
  File "/home/tomek/store/src/calibre/gui2/progress_indicator/__init__.py", line 15, in <module>
    pi_error)
RuntimeError: Failed to load the Progress Indicator plugin: the sip module implements API v9.0 to v9.1 but the progress_indicator module requires API v8.1

So i'm unabble to test it myslef

[Kovid Goyal (kovid)]

That error is a mismatch in SIP versions, I suggest you use the calibre binary install which uses its own SIP module.

=== modified file 'src/calibre/customize/builtins.py'
--- src/calibre/customize/builtins.py	2013-01-13 10:23:43 +0000
+++ src/calibre/customize/builtins.py	2013-01-16 18:45:32 +0000
@@ -1402,7 +1402,6 @@
 
     headquarters = 'PL'
     formats = ['EPUB', 'MOBI', 'PDF']
-    affiliate = True
 
 class StoreEscapeMagazineStore(StoreBase):
     name = 'EscapeMagazine'

=== modified file 'src/calibre/gui2/store/stores/empik_plugin.py'
--- src/calibre/gui2/store/stores/empik_plugin.py	2013-01-14 06:20:23 +0000
+++ src/calibre/gui2/store/stores/empik_plugin.py	2013-01-16 18:45:32 +0000
@@ -25,15 +25,10 @@
 class EmpikStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
-        plain_url = 'http://www.empik.com/ebooki'
-        url = 'https://ssl.afiliant.com/affskrypt,,2f9de2,,23c7f,,,?u=(' + plain_url + ')'
-        detail_url = None
-
-        if detail_item:
-            detail_url = 'https://ssl.afiliant.com/affskrypt,,2f9de2,,23c7f,,,?u=(' + detail_item + ')'
+        url = 'http://www.empik.com/ebooki'
 
         if external or self.config.get('open_external', False):
-            open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url)))
+            open_url(QUrl(url_slash_cleaner(detail_item if detail_item else url)))
         else:
             d = WebStoreDialog(self.gui, url, parent, detail_url)
             d.setWindowTitle(self.name)