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

Allow colons in identifier values

Browse Source 
Fixes #1224885 [<dc:identifier opf:scheme="URI"> and semicolon #2](https://bugs.launchpad.net/calibre/+bug/1224885)
This commit is contained in:
Kovid Goyal 2013-09-14 10:16:48 +05:30
parent 6fff7a0ee5
commit 95341e93c4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/db/write.py
View File

@ -111,7 +111,7 @@ def adapt_languages(to_tuple, x):
def clean_identifier(typ, val): def clean_identifier(typ, val):
typ = icu_lower(typ or '').strip().replace(':', '').replace(',', '') typ = icu_lower(typ or '').strip().replace(':', '').replace(',', '')
val = (val or '').strip().replace(',', '|').replace(':', '|') val = (val or '').strip().replace(',', '|')
return typ, val return typ, val
def adapt_identifiers(to_tuple, x): def adapt_identifiers(to_tuple, x):

2
src/calibre/ebooks/metadata/book/base.py
View File

@ -47,7 +47,7 @@ def reset_field_metadata():
field_metadata = FieldMetadata() field_metadata = FieldMetadata()
ck = lambda typ: icu_lower(typ).strip().replace(':', '').replace(',', '') ck = lambda typ: icu_lower(typ).strip().replace(':', '').replace(',', '')
cv = lambda val: val.strip().replace(',', '|').replace(':', '|') cv = lambda val: val.strip().replace(',', '|')
class Metadata(object): class Metadata(object):

7
src/calibre/gui2/metadata/basic_widgets.py
View File

@ -1264,11 +1264,12 @@ class IdentifiersEdit(QLineEdit): # {{{
c = x.split(':') c = x.split(':')
if len(c) > 1: if len(c) > 1:
itype = c[0].lower() itype = c[0].lower()
c = ':'.join(c[1:])
if itype == 'isbn': if itype == 'isbn':
v = check_isbn(c[1]) v = check_isbn(c)
if v is not None: if v is not None:
c[1] = v c = v
ans[itype] = c[1] ans[itype] = c
return ans return ans
def fset(self, val): def fset(self, val):
if not val: if not val: