mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-05-08 23:43:27 +02:00
Fix #617
This commit is contained in:
parent
a85ac190b7
commit
9a29e08d4b
1 changed files with 16 additions and 4 deletions
|
|
@ -784,6 +784,16 @@ def upgrade_version9(conn):
|
|||
conn.execute('pragma user_version=10')
|
||||
conn.commit()
|
||||
|
||||
@staticmethod
|
||||
def upgrade_version10(conn):
|
||||
for id, author_sort in conn.execute('SELECT id, author_sort FROM books').fetchall():
|
||||
if not author_sort:
|
||||
aus = conn.execute('SELECT authors FROM meta WHERE id=?',(id,)).fetchone()[0]
|
||||
conn.execute('UPDATE books SET author_sort=? WHERE id=?', (aus, id))
|
||||
conn.execute('pragma user_version=11')
|
||||
conn.commit()
|
||||
|
||||
|
||||
def __del__(self):
|
||||
global _lock_file
|
||||
import os
|
||||
|
|
@ -1267,8 +1277,9 @@ def add_books(self, paths, formats, metadata, uris=[], add_duplicates=True):
|
|||
duplicates.append((path, format, mi, uri))
|
||||
continue
|
||||
series_index = 1 if mi.series_index is None else mi.series_index
|
||||
obj = self.conn.execute('INSERT INTO books(title, uri, series_index) VALUES (?, ?, ?)',
|
||||
(mi.title, uri, series_index))
|
||||
aus = mi.author_sort if mi.author_sort else ', '.join(mi.authors)
|
||||
obj = self.conn.execute('INSERT INTO books(title, uri, series_index, author_sort) VALUES (?, ?, ?, ?)',
|
||||
(mi.title, uri, series_index, aus))
|
||||
id = obj.lastrowid
|
||||
self.conn.commit()
|
||||
self.set_metadata(id, mi)
|
||||
|
|
@ -1412,8 +1423,9 @@ def export_to_dir(self, dir, indices, byauthor=False, single_dir=False,
|
|||
|
||||
def import_book(self, mi, formats):
|
||||
series_index = 1 if mi.series_index is None else mi.series_index
|
||||
obj = self.conn.execute('INSERT INTO books(title, uri, series_index) VALUES (?, ?, ?)',
|
||||
(mi.title, None, series_index))
|
||||
aus = mi.author_sort if mi.author_sort else ', '.join(mi.authors)
|
||||
obj = self.conn.execute('INSERT INTO books(title, uri, series_index, author_sort) VALUES (?, ?, ?, ?)',
|
||||
(mi.title, None, series_index, aus))
|
||||
id = obj.lastrowid
|
||||
self.conn.commit()
|
||||
self.set_metadata(id, mi)
|
||||
|
|
|
|||
Loading…
Reference in a new issue