Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression that broke url:http|... style identifiers

Browse Source
This commit is contained in:
Kovid Goyal 2016-04-28 15:21:34 +05:30
parent 1a5b295c82
commit 2fe618b4c1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/ebooks/metadata/sources/identify.py
View File

@ -567,11 +567,12 @@ def urls_from_identifiers(identifiers): # {{{
ans.append((issn, 'issn', issn, ans.append((issn, 'issn', issn,
'http://www.worldcat.org/issn/'+issn)) 'http://www.worldcat.org/issn/'+issn))
for k, url in identifiers.iteritems(): for k, url in identifiers.iteritems():
if url and re.match(r'ur[il]\d*$', k) is not None and url.partition(':')[0].lower() in {'http', 'file', 'https'}: if url and re.match(r'ur[il]\d*$', k) is not None:
url = url[:8].replace('|', ':') + url[8:].replace('|', ',') url = url[:8].replace('|', ':') + url[8:].replace('|', ',')
parts = urlparse(url) if url.partition(':')[0].lower() in {'http', 'file', 'https'}:
name = parts.netloc or parts.path parts = urlparse(url)
ans.append((name, k, url, url)) name = parts.netloc or parts.path
ans.append((name, k, url, url))
return ans return ans
# }}} # }}}