X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=ba091f3442286186c4cacb4de619f51078cb25cf;hb=991627dd1d4fcdecc04a091ec9c0c8b9e8e8b27c;hp=9a5eb0af3e65dd95c5b0a2045e6b2c892ed51b2b;hpb=83f695f2450870843d3c0b764f826a66f3a1ea68;p=m_librarian.git

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 9a5eb0a..ba091f3 100755
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -1,12 +1,13 @@
 #! /usr/bin/env python
 
 __all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
-           'init_db', 'insert_name',
+           'AuthorBook', 'BookGenre',
+           'init_db', 'insert_name', 'insert_author', 'update_counters',
            ]
 
 import os
 from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
-    ForeignKey, DateCol, RelatedJoin, \
+    ForeignKey, DateCol, DatabaseIndex, RelatedJoin, \
     connectionForURI, sqlhub, SQLObjectNotFound, dberrors
 from .config import ml_conf
 
@@ -52,42 +53,88 @@ if connection.dbName == 'sqlite':
 
 
 class Author(SQLObject):
-    name = UnicodeCol(unique=True)
-    count = IntCol()
-    books = RelatedJoin('Book', otherColumn='book_id')
+    surname = UnicodeCol(notNull=True)
+    name = UnicodeCol(notNull=True)
+    misc_name = UnicodeCol(notNull=True)
+    count = IntCol(notNull=True)
+    books = RelatedJoin('Book', otherColumn='book_id',
+                        intermediateTable='author_book',
+                        createRelatedTable=False)
+    full_name_idx = DatabaseIndex(surname, name, misc_name, unique=True)
+    count_idx = DatabaseIndex(count)
+
+
+class AuthorBook(SQLObject):
+    class sqlmeta:
+        table = "author_book"
+    author = ForeignKey('Author', notNull=True, cascade=True)
+    book = ForeignKey('Book', notNull=True, cascade=True)
+    author_idx = DatabaseIndex(author)
+    book_idx = DatabaseIndex(book)
+    main_idx = DatabaseIndex(author, book, unique=True)
 
 
 class Book(SQLObject):
-    authors = RelatedJoin('Author')
-    genres = RelatedJoin('Genre')
-    title = UnicodeCol()
-    series = UnicodeCol()
+    authors = RelatedJoin('Author',
+                          intermediateTable='author_book',
+                          createRelatedTable=False)
+    genres = RelatedJoin('Genre',
+                         intermediateTable='book_genre',
+                         createRelatedTable=False)
+    title = UnicodeCol(notNull=True)
+    series = UnicodeCol(notNull=True)
     ser_no = IntCol()
-    archive = StringCol()
-    file = StringCol()
-    size = IntCol()
-    lib_id = StringCol()
-    deleted = BoolCol()
-    extension = ForeignKey('Extension')
-    date = DateCol()
+    archive = StringCol(notNull=True)
+    file = StringCol(notNull=True)
+    size = IntCol(notNull=True)
+    lib_id = StringCol(notNull=True)
+    deleted = BoolCol(notNull=True)
+    extension = ForeignKey('Extension', notNull=True)
+    date = DateCol(notNull=True)
     language = ForeignKey('Language')
+    title_idx = DatabaseIndex(title)
+    series_idx = DatabaseIndex(series)
+    ser_no_idx = DatabaseIndex(ser_no)
+    archive_file_idx = DatabaseIndex(archive, file, unique=True)
+    file_idx = DatabaseIndex(file)
+    size_idx = DatabaseIndex(size)
+    deleted_idx = DatabaseIndex(deleted)
+    extension_idx = DatabaseIndex(extension)
+    date_idx = DatabaseIndex(date)
+    language_idx = DatabaseIndex(language)
+
+
+class BookGenre(SQLObject):
+    class sqlmeta:
+        table = "book_genre"
+    book = ForeignKey('Book', notNull=True, cascade=True)
+    genre = ForeignKey('Genre', notNull=True, cascade=True)
+    book_idx = DatabaseIndex(book)
+    genre_idx = DatabaseIndex(genre)
+    main_idx = DatabaseIndex(book, genre, unique=True)
 
 
 class Extension(SQLObject):
-    name = StringCol(unique=True)
-    count = IntCol()
+    name = StringCol(notNull=True, unique=True)
+    count = IntCol(notNull=True)
+    count_idx = DatabaseIndex(count)
 
 
 class Genre(SQLObject):
-    name = StringCol(unique=True)
-    title = UnicodeCol()
-    count = IntCol()
-    books = RelatedJoin('Book', otherColumn='book_id')
+    name = StringCol(notNull=True, unique=True)
+    title = UnicodeCol(notNull=True)
+    count = IntCol(notNull=True)
+    books = RelatedJoin('Book', otherColumn='book_id',
+                        intermediateTable='book_genre',
+                        createRelatedTable=False)
+    title_idx = DatabaseIndex(title)
+    count_idx = DatabaseIndex(count)
 
 
 class Language(SQLObject):
-    name = StringCol(unique=True)
-    count = IntCol()
+    name = StringCol(notNull=True, unique=True)
+    count = IntCol(notNull=True)
+    count_idx = DatabaseIndex(count)
 
 
 def init_db():
@@ -96,17 +143,40 @@ def init_db():
     except IndexError:  # Table exists but is empty
         return
     except dberrors.Error:
-        for table in Author, Extension, Genre, Language, Book:
+        for table in Author, Extension, Genre, Language, Book, \
+                AuthorBook, BookGenre:
             table.createTable()
     else:
         return
 
 
-def insert_name(table, name):
+def insert_name(table, name, **kw):
     try:
         return table.byName(name)
     except SQLObjectNotFound:
-        return table(name=name, count=0)
+        return table(name=name, count=0, **kw)
+
+
+def insert_author(surname, name, misc_name):
+    try:
+        return Author.full_name_idx.get(
+            surname=surname, name=name, misc_name=misc_name)
+    except SQLObjectNotFound:
+        return Author(surname=surname, name=name, misc_name=misc_name, count=0)
+
+
+def update_counters():
+    for author in Author.select():
+        author.count = len(author.books)
+
+    for ext in Extension.select():
+        ext.count = Book.select(Book.q.extension == ext.name).count()
+
+    for genre in Genre.select():
+        genre.count = len(genre.books)
+
+    for language in Language.select():
+        language.count = Book.select(Book.q.language == language.name).count()
 
 
 def test():