Skip to content

Commit

Permalink
Refactor: Separate web forms processing from search
Browse files Browse the repository at this point in the history
Raw search functions will be used in other interfaces like GUIs.
  • Loading branch information
phdru committed Dec 29, 2023
1 parent 2db70b4 commit df6536a
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 78 deletions.
83 changes: 82 additions & 1 deletion m_librarian/search.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from sqlobject.sqlbuilder import AND, OR, func
from sqlobject.sqlbuilder import AND, OR, func, CONCAT

from .config import get_config
from .db import Author, Book, Extension, Genre, Language

Expand Down Expand Up @@ -109,3 +110,83 @@ def search_genres(search_type, case_sensitive, values, orderBy=None):
def search_languages(search_type, case_sensitive, values, orderBy=None):
return _search(Language, search_type, case_sensitive, values,
orderBy=orderBy)


def decode(value):
if isinstance(value, bytes):
return value.decode('utf-8')
return value


def _guess_case_sensitivity(value):
return not value.islower()


def search_authors_raw(value, search_type, case_sensitive):
value = decode(value)
if not search_type:
search_type = 'start'
if case_sensitive is None:
case_sensitive = _guess_case_sensitivity(value)
expressions = [(
CONCAT(Author.q.surname, ' ', Author.q.name, ' ', Author.q.misc_name),
decode(value)
)]
authors = search_authors(search_type, case_sensitive, {}, expressions,
orderBy=('surname', 'name', 'misc_name'))
columns = get_config().getlist('columns', 'author', ['fullname'])
return {
'authors': list(authors),
'search_authors': value,
'search_type': search_type,
'case_sensitive': case_sensitive,
'columns': columns,
}


def books_by_author(aid):
use_filters = get_config().getint('filters', 'use_in_books_list', 1)
columns = get_config().getlist('columns', 'book', ['title'])
author = Author.get(aid)
if use_filters:
join_expressions = []
join_expressions.append(Book.j.authors)
join_expressions.append(Author.q.id == aid)
books = search_books('full', None, {}, join_expressions,
orderBy=('series', 'ser_no', 'title', '-date'),
use_filters=use_filters)
else:
books = Book.select(
Book.j.authors & (Author.q.id == aid),
orderBy=['series', 'ser_no', 'title'],
)
return {
'books_by_author': {author.fullname: list(books)},
'columns': columns,
}


def search_books_raw(value, search_type, case_sensitive, use_filters):
value = decode(value)
if not search_type:
search_type = 'start'
if case_sensitive is None:
case_sensitive = _guess_case_sensitivity(value)
books = search_books(search_type, case_sensitive, {'title': value}, None,
orderBy=('title',), use_filters=use_filters)
books_by_authors = {}
for book in books:
author = book.author1
if author in books_by_authors:
books_by_author = books_by_authors[author]
else:
books_by_author = books_by_authors[author] = []
books_by_author.append(book)
columns = get_config().getlist('columns', 'book', ['title'])
return {
'books_by_author': books_by_authors,
'search_books': value,
'search_type': search_type,
'case_sensitive': case_sensitive,
'columns': columns,
}
83 changes: 6 additions & 77 deletions m_librarian/web/app.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# -*- coding: utf-8 -*-

import os

from bottle import cheetah_view, redirect, request, route, static_file
from sqlobject.sqlbuilder import CONCAT

from ..config import get_config
from ..db import Author, Book
from ..db import Book
from ..download import download
from ..search import search_authors, search_books
from ..search import search_authors_raw, books_by_author, search_books_raw


@route('/')
Expand All @@ -30,68 +28,21 @@ def search_authors_get():
return {}


def decode(value):
if isinstance(value, bytes):
return value.decode('utf-8')
return value


def _guess_case_sensitivity(value):
return not value.islower()


@route('/search_authors/', method='POST')
@cheetah_view('list_authors.tmpl')
def search_authors_post():
value = request.forms.get('search_authors')
if not value:
return redirect('/search_authors/')
value = decode(value)
search_type = request.forms.get('search_type')
if not search_type:
search_type = 'start'
case_sensitive = request.forms.get('case_sensitive')
if case_sensitive is None:
case_sensitive = _guess_case_sensitivity(value)
expressions = [(
CONCAT(Author.q.surname, ' ', Author.q.name, ' ', Author.q.misc_name),
decode(value)
)]
authors = search_authors(search_type, case_sensitive, {}, expressions,
orderBy=('surname', 'name', 'misc_name'))
columns = get_config().getlist('columns', 'author', ['fullname'])
return {
'authors': list(authors),
'search_authors': value,
'search_type': search_type,
'case_sensitive': case_sensitive,
'columns': columns,
}
return search_authors_raw(value, search_type, case_sensitive)


@route('/books-by-author/<aid:int>/', method='GET')
@cheetah_view('list_books.tmpl')
def books_by_author(aid):
use_filters = get_config().getint('filters', 'use_in_books_list', 1)
columns = get_config().getlist('columns', 'book', ['title'])
author = Author.get(aid)
if use_filters:
join_expressions = []
join_expressions.append(Book.j.authors)
join_expressions.append(Author.q.id == aid)
books = search_books('full', None, {}, join_expressions,
orderBy=('series', 'ser_no', 'title', '-date'),
use_filters=use_filters)
else:
books = Book.select(
Book.j.authors & (Author.q.id == aid),
orderBy=['series', 'ser_no', 'title'],
)

return {
'books_by_author': {author.fullname: list(books)},
'columns': columns,
}
def _books_by_author(aid):
return books_by_author(aid)


@route('/static/<filename:path>')
Expand Down Expand Up @@ -146,29 +97,7 @@ def search_books_post():
value = request.forms.get('search_books')
if not value:
return redirect('/search_books/')
value = decode(value)
search_type = request.forms.get('search_type')
if not search_type:
search_type = 'start'
case_sensitive = request.forms.get('case_sensitive')
if case_sensitive is None:
case_sensitive = _guess_case_sensitivity(value)
use_filters = request.forms.get('use_filters')
books = search_books(search_type, case_sensitive, {'title': value}, None,
orderBy=('title',), use_filters=use_filters)
books_by_authors = {}
for book in books:
author = book.author1
if author in books_by_authors:
books_by_author = books_by_authors[author]
else:
books_by_author = books_by_authors[author] = []
books_by_author.append(book)
columns = get_config().getlist('columns', 'book', ['title'])
return {
'books_by_author': books_by_authors,
'search_books': value,
'search_type': search_type,
'case_sensitive': case_sensitive,
'columns': columns,
}
return search_books_raw(value, search_type, case_sensitive, use_filters)

0 comments on commit df6536a

Please sign in to comment.