mirror of
https://github.com/janeczku/calibre-web
synced 2024-09-27 22:58:22 +00:00
Merge pull request #3 from quarz12/sorting
removed unwanted refactoring
This commit is contained in:
commit
2ac1566df9
23
cps/db.py
23
cps/db.py
@ -20,7 +20,6 @@
|
|||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import json
|
import json
|
||||||
import traceback
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
from urllib.parse import quote
|
from urllib.parse import quote
|
||||||
import unidecode
|
import unidecode
|
||||||
@ -33,7 +32,6 @@ from sqlalchemy.orm import relationship, sessionmaker, scoped_session
|
|||||||
from sqlalchemy.orm.collections import InstrumentedList
|
from sqlalchemy.orm.collections import InstrumentedList
|
||||||
from sqlalchemy.ext.declarative import DeclarativeMeta
|
from sqlalchemy.ext.declarative import DeclarativeMeta
|
||||||
from sqlalchemy.exc import OperationalError
|
from sqlalchemy.exc import OperationalError
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Compatibility with sqlalchemy 2.0
|
# Compatibility with sqlalchemy 2.0
|
||||||
from sqlalchemy.orm import declarative_base
|
from sqlalchemy.orm import declarative_base
|
||||||
@ -42,7 +40,6 @@ except ImportError:
|
|||||||
from sqlalchemy.pool import StaticPool
|
from sqlalchemy.pool import StaticPool
|
||||||
from sqlalchemy.sql.expression import and_, true, false, text, func, or_
|
from sqlalchemy.sql.expression import and_, true, false, text, func, or_
|
||||||
from sqlalchemy.ext.associationproxy import association_proxy
|
from sqlalchemy.ext.associationproxy import association_proxy
|
||||||
from sqlalchemy import desc
|
|
||||||
from flask_login import current_user
|
from flask_login import current_user
|
||||||
from flask_babel import gettext as _
|
from flask_babel import gettext as _
|
||||||
from flask_babel import get_locale
|
from flask_babel import get_locale
|
||||||
@ -52,7 +49,7 @@ from . import logger, ub, isoLanguages
|
|||||||
from .pagination import Pagination
|
from .pagination import Pagination
|
||||||
|
|
||||||
from weakref import WeakSet
|
from weakref import WeakSet
|
||||||
from thefuzz.fuzz import partial_ratio, partial_token_set_ratio, partial_token_sort_ratio, ratio
|
from thefuzz.fuzz import partial_token_sort_ratio, ratio
|
||||||
|
|
||||||
# %-level, 100 means exact match, 75 allows exactly 1 wrong character in a 4 letter word
|
# %-level, 100 means exact match, 75 allows exactly 1 wrong character in a 4 letter word
|
||||||
FUZZY_SEARCH_ACCURACY = 75
|
FUZZY_SEARCH_ACCURACY = 75
|
||||||
@ -441,13 +438,11 @@ class CustomColumns(Base):
|
|||||||
content['is_editable'] = self.editable
|
content['is_editable'] = self.editable
|
||||||
content['rec_index'] = sequence + 22 # toDo why ??
|
content['rec_index'] = sequence + 22 # toDo why ??
|
||||||
if isinstance(value, datetime):
|
if isinstance(value, datetime):
|
||||||
content['#value#'] = {"__class__": "datetime.datetime",
|
content['#value#'] = {"__class__": "datetime.datetime", "__value__": value.strftime("%Y-%m-%dT%H:%M:%S+00:00")}
|
||||||
"__value__": value.strftime("%Y-%m-%dT%H:%M:%S+00:00")}
|
|
||||||
else:
|
else:
|
||||||
content['#value#'] = value
|
content['#value#'] = value
|
||||||
content['#extra#'] = extra
|
content['#extra#'] = extra
|
||||||
content['is_multiple2'] = {} if not self.is_multiple else {"cache_to_list": "|", "ui_to_list": ",",
|
content['is_multiple2'] = {} if not self.is_multiple else {"cache_to_list": "|", "ui_to_list": ",", "list_to_ui": ", "}
|
||||||
"list_to_ui": ", "}
|
|
||||||
return json.dumps(content, ensure_ascii=False)
|
return json.dumps(content, ensure_ascii=False)
|
||||||
|
|
||||||
|
|
||||||
@ -507,6 +502,7 @@ class CalibreDB:
|
|||||||
if init:
|
if init:
|
||||||
self.init_db(expire_on_commit)
|
self.init_db(expire_on_commit)
|
||||||
|
|
||||||
|
|
||||||
def init_db(self, expire_on_commit=True):
|
def init_db(self, expire_on_commit=True):
|
||||||
if self._init:
|
if self._init:
|
||||||
self.init_session(expire_on_commit)
|
self.init_session(expire_on_commit)
|
||||||
@ -821,18 +817,18 @@ class CalibreDB:
|
|||||||
element = 0
|
element = 0
|
||||||
while indx:
|
while indx:
|
||||||
if indx >= 3:
|
if indx >= 3:
|
||||||
query = query.outerjoin(join[element], join[element + 1]).outerjoin(join[element + 2])
|
query = query.outerjoin(join[element], join[element+1]).outerjoin(join[element+2])
|
||||||
indx -= 3
|
indx -= 3
|
||||||
element += 3
|
element += 3
|
||||||
elif indx == 2:
|
elif indx == 2:
|
||||||
query = query.outerjoin(join[element], join[element + 1])
|
query = query.outerjoin(join[element], join[element+1])
|
||||||
indx -= 2
|
indx -= 2
|
||||||
element += 2
|
element += 2
|
||||||
elif indx == 1:
|
elif indx == 1:
|
||||||
query = query.outerjoin(join[element])
|
query = query.outerjoin(join[element])
|
||||||
indx -= 1
|
indx -= 1
|
||||||
element += 1
|
element += 1
|
||||||
query = query.filter(db_filter) \
|
query = query.filter(db_filter)\
|
||||||
.filter(self.common_filters(allow_show_archived))
|
.filter(self.common_filters(allow_show_archived))
|
||||||
entries = list()
|
entries = list()
|
||||||
pagination = list()
|
pagination = list()
|
||||||
@ -1008,8 +1004,8 @@ class CalibreDB:
|
|||||||
return sorted(tags, key=lambda x: x[0].name.lower(), reverse=reverse_order)
|
return sorted(tags, key=lambda x: x[0].name.lower(), reverse=reverse_order)
|
||||||
else:
|
else:
|
||||||
if not languages:
|
if not languages:
|
||||||
languages = self.session.query(Languages) \
|
languages = self.session.query(Languages)\
|
||||||
.join(books_languages_link) \
|
.join(books_languages_link)\
|
||||||
.join(Books) \
|
.join(Books) \
|
||||||
.filter(self.common_filters(return_all_languages=return_all_languages)) \
|
.filter(self.common_filters(return_all_languages=return_all_languages)) \
|
||||||
.group_by(text('books_languages_link.lang_code')).all()
|
.group_by(text('books_languages_link.lang_code')).all()
|
||||||
@ -1104,7 +1100,6 @@ class Category:
|
|||||||
self.rating = rating
|
self.rating = rating
|
||||||
self.count = 1
|
self.count = 1
|
||||||
|
|
||||||
|
|
||||||
'''class Count:
|
'''class Count:
|
||||||
count = None
|
count = None
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user