calibre

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

  1. store
  2. Merge into trunk
Proposed by Tomasz Długosz
Status: Merged
Merged at revision: 12952
Proposed branch: lp:~tomek3d/calibre/store
Merge into: lp:calibre
Diff against target: 32 lines (+5/-3)
2 files modified
src/calibre/customize/builtins.py (+2/-1)
src/calibre/gui2/store/stores/legimi_plugin.py (+3/-2)
To merge this branch: bzr merge lp:~tomek3d/calibre/store
Reviewer Review Type Date Requested Status
Kovid Goyal Pending
Review via email: mp+119787@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/calibre/customize/builtins.py'
2--- src/calibre/customize/builtins.py 2012-07-31 07:40:56 +0000
3+++ src/calibre/customize/builtins.py 2012-08-15 20:31:24 +0000
4@@ -1452,7 +1452,8 @@
5 actual_plugin = 'calibre.gui2.store.stores.legimi_plugin:LegimiStore'
6
7 headquarters = 'PL'
8- formats = ['EPUB']
9+ formats = ['EPUB', 'PDF', 'MOBI']
10+ affiliate = True
11
12 class StoreLibreDEStore(StoreBase):
13 name = 'Libri DE'
14
15=== modified file 'src/calibre/gui2/store/stores/legimi_plugin.py'
16--- src/calibre/gui2/store/stores/legimi_plugin.py 2011-11-16 18:37:38 +0000
17+++ src/calibre/gui2/store/stores/legimi_plugin.py 2012-08-15 20:31:24 +0000
18@@ -25,11 +25,12 @@
19
20 def open(self, parent=None, detail_item=None, external=False):
21
22- url = 'http://www.legimi.com/pl/ebooks/?price=any'
23+ plain_url = 'http://www.legimi.com/pl/ebooks/?price=any'
24+ url = 'https://ssl.afiliant.com/affskrypt,,2f9de2,,11483,,,?u=(' + plain_url + ')'
25 detail_url = None
26
27 if detail_item:
28- detail_url = detail_item
29+ detail_url = 'https://ssl.afiliant.com/affskrypt,,2f9de2,,11483,,,?u=(' + detail_item + ')'
30
31 if external or self.config.get('open_external', False):
32 open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url)))

Subscribers

People subscribed via source and target branches