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

More work on writing is_multiple fields

Browse Source
This commit is contained in:
Kovid Goyal 2013-03-03 10:53:26 +05:30
parent c15856b07c
commit 2331bf29a2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,6 +55,7 @@ def multiple_text(sep, ui_sep, x):
else: else:
x = (y.decode(preferred_encoding, 'replace') if isinstance(y, bytes) x = (y.decode(preferred_encoding, 'replace') if isinstance(y, bytes)
else y for y in x) else y for y in x)
ui_sep = ui_sep.strip()
repsep = ',' if ui_sep == ';' else ';' repsep = ',' if ui_sep == ';' else ';'
x = (y.strip().replace(ui_sep, repsep) for y in x if y.strip()) x = (y.strip().replace(ui_sep, repsep) for y in x if y.strip())
return tuple(' '.join(y.split()) for y in x if y) return tuple(' '.join(y.split()) for y in x if y)
@ -183,7 +184,7 @@ def safe_lower(x):
except (TypeError, ValueError, KeyError, AttributeError): except (TypeError, ValueError, KeyError, AttributeError):
return x return x
def get_db_id(val, db, m, table, kmap, rid_map, allow_case_changes, def get_db_id(val, db, m, table, kmap, rid_map, allow_case_change,
case_changes, val_map, sql_val_map=lambda x:x): case_changes, val_map, sql_val_map=lambda x:x):
''' Get the db id for the value val. If val does not exist in the db it is ''' Get the db id for the value val. If val does not exist in the db it is
inserted into the db. ''' inserted into the db. '''
@ -195,7 +196,7 @@ def get_db_id(val, db, m, table, kmap, rid_map, allow_case_changes,
item_id = rid_map[kval] = db.conn.last_insert_rowid() item_id = rid_map[kval] = db.conn.last_insert_rowid()
table.id_map[item_id] = val table.id_map[item_id] = val
table.col_book_map[item_id] = set() table.col_book_map[item_id] = set()
elif allow_case_changes and val != table.id_map[item_id]: elif allow_case_change and val != table.id_map[item_id]:
case_changes[item_id] = val case_changes[item_id] = val
val_map[val] = item_id val_map[val] = item_id
@ -287,7 +288,7 @@ def many_many(book_id_val_map, db, field, allow_case_change, *args):
# Map values to db ids, including any new values # Map values to db ids, including any new values
kmap = safe_lower if dt == 'text' else lambda x:x kmap = safe_lower if dt == 'text' else lambda x:x
rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()} rid_map = {kmap(item):item_id for item_id, item in table.id_map.iteritems()}
sql_val_map = lambda x:x.replace(',', '|') if is_authors else lambda x:x sql_val_map = (lambda x:x.replace(',', '|')) if is_authors else lambda x:x
val_map = {} val_map = {}
case_changes = {} case_changes = {}
for vals in book_id_val_map.itervalues(): for vals in book_id_val_map.itervalues():
@ -330,13 +331,13 @@ def many_many(book_id_val_map, db, field, allow_case_change, *args):
((k,) for k in deleted)) ((k,) for k in deleted))
if updated: if updated:
vals = ( vals = (
(book_id, book_id, val) for book_id, vals in updated.iteritems() (book_id, val) for book_id, vals in updated.iteritems()
for val in vals for val in vals
) )
sql = ( db.conn.executemany('DELETE FROM %s WHERE book=?'%table.link_table,
'DELETE FROM {0} WHERE book=?; INSERT INTO {0}(book,{1}) VALUES(?, ?)' ((k,) for k in updated))
) db.conn.executemany('INSERT INTO {0}(book,{1}) VALUES(?, ?)'.format(
db.conn.executemany(sql.format(table.link_table, m['link_column']), vals) table.link_table, m['link_column']), vals)
# Remove no longer used items # Remove no longer used items
remove = {item_id for item_id in table.id_map if not remove = {item_id for item_id in table.id_map if not