import os
from zipfile import ZipFile
-from sqlobject import sqlhub
+
+from sqlobject import dberrors, sqlhub
from sqlobject.sqlbuilder import Select
+
from .db import Author, Book, Extension, Genre, Language, \
insert_name, insert_author
for genre in genres.split(':'):
if genre:
genre_row = insert_name(Genre, genre, title=genre)
- book.addGenre(genre_row)
+ try:
+ book.addGenre(genre_row)
+ except dberrors.DuplicateEntryError:
+ pass # The genre has already been added
+
+
+def tounicode(s):
+ if isinstance(s, bytes):
+ return s.decode('utf-8')
+ else:
+ return s
def import_inp(archive, inp):
connection = sqlhub.processConnection
for file, in connection.queryAll(connection.sqlrepr(
Select(Book.q.file, Book.q.archive == archive))):
- files.add((archive, file.decode('utf-8')))
+ files.add((archive, tounicode(file)))
for line in inp:
line = line.decode('utf-8')
_archive, parts = split_line(line)
archives.add(_archive)
for file, in connection.queryAll(connection.sqlrepr(
Select(Book.q.file, Book.q.archive == _archive))):
- files.add((_archive, file.decode('utf-8')))
+ files.add((_archive, tounicode(file)))
file = parts[5]
if (_archive or archive, file) not in files:
files.add((_archive or archive, file))