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
_l = len(parts)
if _l < 11:
raise ValueError('Unknown INP structure: "%s"' % line)
+ archive = None
if _l == 11: # Standard structure
parts.append(None) # Emulate lang
- else: # New structure
+ elif _l == 15: # New structure
parts = parts[:12]
- return parts
+ elif _l == 17: # Very new structure
+ archive = parts[12]
+ language = parts[13]
+ parts = parts[:11] + [language]
+ else: # New structure
+ raise ValueError('Unknown INP structure: "%s"' % line)
+ return archive, parts
def import_inp_line(archive, parts):
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):
+ archives = set()
files = set()
connection = sqlhub.processConnection
for file, in connection.queryAll(connection.sqlrepr(
Select(Book.q.file, Book.q.archive == archive))):
- files.add(file)
+ files.add((archive, tounicode(file)))
for line in inp:
line = line.decode('utf-8')
- parts = split_line(line)
+ _archive, parts = split_line(line)
+ if _archive and (_archive not in archives):
+ archives.add(_archive)
+ for file, in connection.queryAll(connection.sqlrepr(
+ Select(Book.q.file, Book.q.archive == _archive))):
+ files.add((_archive, tounicode(file)))
file = parts[5]
- if file not in files:
- files.add(file)
- import_inp_line(archive, parts)
+ if (_archive or archive, file) not in files:
+ files.add((_archive or archive, file))
+ import_inp_line(_archive or archive, parts)
def import_inpx(path, pbar_cb=None):