This commit is contained in:
Kovid Goyal 2008-04-02 02:34:15 +00:00
parent a85ac190b7
commit 9a29e08d4b

View file

@ -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)