mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
...
This commit is contained in:
commit
0c961678cf
@ -314,6 +314,15 @@ class PRST1(USBMS):
|
|||||||
' any notes/highlights, etc.')%dbpath)+' Underlying error:'
|
' any notes/highlights, etc.')%dbpath)+' Underlying error:'
|
||||||
'\n'+tb)
|
'\n'+tb)
|
||||||
|
|
||||||
|
def get_lastrowid(self, cursor):
|
||||||
|
# SQLite3 + Python has a fun issue on 32-bit systems with integer overflows.
|
||||||
|
# Issue a SQL query instead, getting the value as a string, and then converting to a long python int manually.
|
||||||
|
query = 'SELECT last_insert_rowid()'
|
||||||
|
cursor.execute(query)
|
||||||
|
row = cursor.fetchone()
|
||||||
|
|
||||||
|
return long(row[0])
|
||||||
|
|
||||||
def get_database_min_id(self, source_id):
|
def get_database_min_id(self, source_id):
|
||||||
sequence_min = 0L
|
sequence_min = 0L
|
||||||
if source_id == 1:
|
if source_id == 1:
|
||||||
@ -471,10 +480,10 @@ class PRST1(USBMS):
|
|||||||
modified_date, lpath,
|
modified_date, lpath,
|
||||||
os.path.basename(lpath), book.size, book.mime)
|
os.path.basename(lpath), book.size, book.mime)
|
||||||
cursor.execute(query, t)
|
cursor.execute(query, t)
|
||||||
book.bookId = cursor.lastrowid
|
book.bookId = self.get_lastrowid(cursor)
|
||||||
if upload_covers:
|
if upload_covers:
|
||||||
self.upload_book_cover(connection, book, source_id)
|
self.upload_book_cover(connection, book, source_id)
|
||||||
debug_print('Inserted New Book: ' + book.title)
|
debug_print('Inserted New Book: (%u) '%book.bookId + book.title)
|
||||||
else:
|
else:
|
||||||
query = '''
|
query = '''
|
||||||
UPDATE books
|
UPDATE books
|
||||||
@ -609,8 +618,8 @@ class PRST1(USBMS):
|
|||||||
query = 'INSERT INTO collection (title, source_id) VALUES (?,?)'
|
query = 'INSERT INTO collection (title, source_id) VALUES (?,?)'
|
||||||
t = (collection, source_id)
|
t = (collection, source_id)
|
||||||
cursor.execute(query, t)
|
cursor.execute(query, t)
|
||||||
db_collections[collection] = cursor.lastrowid
|
db_collections[collection] = self.get_lastrowid(cursor)
|
||||||
debug_print('Inserted New Collection: ' + collection)
|
debug_print('Inserted New Collection: (%u) '%db_collections[collection] + collection)
|
||||||
|
|
||||||
# Get existing books in collection
|
# Get existing books in collection
|
||||||
query = '''
|
query = '''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user