Feat(wx/search): Search books

[m_librarian.git] / m_librarian / wx / ListBooks.py

diff --git a/m_librarian/wx/ListBooks.py b/m_librarian/wx/ListBooks.py
index b1f84a11345449e50da3e4f06d0ea84ead2894e2..4cfabcdb36026af7206ce0cff6f1c618047df1d0 100644 (file)
--- a/m_librarian/wx/ListBooks.py
+++ b/m_librarian/wx/ListBooks.py
@@ -12,13 +12,15 @@ class ListBooksPanel(GridPanel):
         _ = getattr(translations, 'ugettext', None) or translations.gettext
         books_by_author = self.param['books_by_author']
         columns = self.param['columns']
-        author = next(iter(books_by_author))
-        books = books_by_author[author]
-        series = {book.series for book in books}
+        total_rows = 0
+        for author in books_by_author:
+            books = books_by_author[author]
+            series = {book.series for book in books}
+            total_rows += len(books) + len(series)
         grid = self.grid
-        grid.CreateGrid(len(books) + len(series), len(columns))
+        grid.CreateGrid(total_rows, len(columns))
         grid.EnableEditing(False)
-        for row in range(len(books)):
+        for row in range(total_rows):
             grid.SetRowLabelValue(row, str(row))
             grid.AutoSizeRowLabelSize(row)
         for col, col_name in enumerate(columns):
@@ -29,26 +31,28 @@ class ListBooksPanel(GridPanel):
                 cell_attr.SetAlignment(wx.ALIGN_RIGHT, wx. ALIGN_CENTRE)
                 grid.SetColAttr(col, cell_attr)
         row = 0
-        series = None
-        for book in books:
-            if book.series != series:
-                if book.series:
-                    value = book.series
-                else:
-                    value = u'Вне серий'
-                grid.SetCellAlignment(row, 0, wx.ALIGN_LEFT, wx. ALIGN_CENTRE)
-                grid.SetCellSize(row, 0, 1, len(columns))
-                grid.SetCellValue(row, 0, u'%s — %s' % (book.author1, value))
+        for author in sorted(books_by_author):
+            books = books_by_author[author]
+            series = None
+            for book in books:
+                if book.series != series:
+                    if book.series:
+                        value = book.series
+                    else:
+                        value = u'Вне серий'
+                    grid.SetCellAlignment(row, 0, wx.ALIGN_LEFT, wx. ALIGN_CENTRE)
+                    grid.SetCellSize(row, 0, 1, len(columns))
+                    grid.SetCellValue(row, 0, u'%s — %s' % (book.author1, value))
+                    row += 1
+                    series = book.series
+                for col, col_name in enumerate(columns):
+                    value = getattr(book, col_name)
+                    if value is None:
+                        value = u''
+                    elif not isinstance(value, (string_type, unicode_type)):
+                        value = str(value)
+                    grid.SetCellValue(row, col, value)
                 row += 1
-                series = book.series
-            for col, col_name in enumerate(columns):
-                value = getattr(book, col_name)
-                if value is None:
-                    value = u''
-                elif not isinstance(value, (string_type, unicode_type)):
-                    value = str(value)
-                grid.SetCellValue(row, col, value)
-            row += 1
         grid.AutoSizeColumns()
         grid.AutoSizeRows()