calibre

Merge lp:~lifanxi/calibre/douban-metadata-plugin into lp:calibre

  1. douban-metadata-plugin
  2. Merge into trunk
Proposed by Li Fanxi
Status: Merged
Merged at revision: 9313
Proposed branch: lp:~lifanxi/calibre/douban-metadata-plugin
Merge into: lp:calibre
Diff against target: 14 lines (+4/-1)
1 file modified
src/calibre/ebooks/metadata/sources/douban.py (+4/-1)
To merge this branch: bzr merge lp:~lifanxi/calibre/douban-metadata-plugin
Reviewer Review Type Date Requested Status
Kovid Goyal Pending
Review via email: mp+62341@code.launchpad.net

Description of the change

Bug fix for Douban metadata plugin. Error in constructing the API request URL when adding the API key to the URL.

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/ebooks/metadata/sources/douban.py'
2--- src/calibre/ebooks/metadata/sources/douban.py 2011-05-12 23:12:59 +0000
3+++ src/calibre/ebooks/metadata/sources/douban.py 2011-05-25 16:37:39 +0000
4@@ -211,7 +211,10 @@
5 'q': q,
6 })
7 if self.DOUBAN_API_KEY and self.DOUBAN_API_KEY != '':
8- url = url + "?apikey=" + self.DOUBAN_API_KEY
9+ if t == "isbn" or t == "subject":
10+ url = url + "?apikey=" + self.DOUBAN_API_KEY
11+ else:
12+ url = url + "&apikey=" + self.DOUBAN_API_KEY
13 return url
14 # }}}
15

Subscribers

People subscribed via source and target branches