mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-07 10:14:46 -04:00
Fix #617
This commit is contained in:
parent
a85ac190b7
commit
9a29e08d4b
@ -784,6 +784,16 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
|
|||||||
conn.execute('pragma user_version=10')
|
conn.execute('pragma user_version=10')
|
||||||
conn.commit()
|
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):
|
def __del__(self):
|
||||||
global _lock_file
|
global _lock_file
|
||||||
import os
|
import os
|
||||||
@ -1267,8 +1277,9 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
|
|||||||
duplicates.append((path, format, mi, uri))
|
duplicates.append((path, format, mi, uri))
|
||||||
continue
|
continue
|
||||||
series_index = 1 if mi.series_index is None else mi.series_index
|
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 (?, ?, ?)',
|
aus = mi.author_sort if mi.author_sort else ', '.join(mi.authors)
|
||||||
(mi.title, uri, series_index))
|
obj = self.conn.execute('INSERT INTO books(title, uri, series_index, author_sort) VALUES (?, ?, ?, ?)',
|
||||||
|
(mi.title, uri, series_index, aus))
|
||||||
id = obj.lastrowid
|
id = obj.lastrowid
|
||||||
self.conn.commit()
|
self.conn.commit()
|
||||||
self.set_metadata(id, mi)
|
self.set_metadata(id, mi)
|
||||||
@ -1412,8 +1423,9 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
|
|||||||
|
|
||||||
def import_book(self, mi, formats):
|
def import_book(self, mi, formats):
|
||||||
series_index = 1 if mi.series_index is None else mi.series_index
|
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 (?, ?, ?)',
|
aus = mi.author_sort if mi.author_sort else ', '.join(mi.authors)
|
||||||
(mi.title, None, series_index))
|
obj = self.conn.execute('INSERT INTO books(title, uri, series_index, author_sort) VALUES (?, ?, ?, ?)',
|
||||||
|
(mi.title, None, series_index, aus))
|
||||||
id = obj.lastrowid
|
id = obj.lastrowid
|
||||||
self.conn.commit()
|
self.conn.commit()
|
||||||
self.set_metadata(id, mi)
|
self.set_metadata(id, mi)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user