mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-09-27 14:48:22 +00:00
Code Issues Releases Wiki Activity

rolled back string repr of book, moved that part to a new method

Browse Source
This commit is contained in:
Daniel 2023-05-28 15:01:35 +02:00
parent cb5e66facd
commit 025a888906
1 changed files with 53 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cps/db.py
View File

@ -33,6 +33,7 @@ from sqlalchemy.orm import relationship, sessionmaker, scoped_session
from sqlalchemy.orm.collections import InstrumentedList
from sqlalchemy.ext.declarative import DeclarativeMeta
from sqlalchemy.exc import OperationalError
try:
# Compatibility with sqlalchemy 2.0
from sqlalchemy.orm import declarative_base
@ -41,6 +42,7 @@ except ImportError:
from sqlalchemy.pool import StaticPool
from sqlalchemy.sql.expression import and_, true, false, text, func, or_
from sqlalchemy.ext.associationproxy import association_proxy
from sqlalchemy import desc
from flask_login import current_user
from flask_babel import gettext as _
from flask_babel import get_locale
@ -381,12 +383,21 @@ class Books(Base):
self.has_cover = (has_cover != None)
def __repr__(self):
return "<Books('{0} , {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}')>".format(self.title, self.sort, self.author_sort,
return "<Books('{0},{1}{2}{3}{4}{5}{6}{7}{8}')>".format(self.title, self.sort, self.author_sort,
self.timestamp, self.pubdate, self.series_index,
self.last_modified, self.path, self.has_cover,
" ".join([tag.name for tag in self.tags]),
" ".join([series.name for series in self.series]), " ".join([author.name for author in self.authors])," ".join([publisher.name for publisher in self.publishers]))
self.last_modified, self.path, self.has_cover)
def __sort_str(self):
return "{0} {1} {2} {3} {4}".format(self.title, " ".join([tag.name for tag in self.tags]),
" ".join(
[series.name for series
in self.series]),
" ".join(
[author.name for author
in self.authors]),
" ".join([publisher.name for
publisher in
self.publishers]))
@property
def atom_timestamp(self):
@ -430,11 +441,13 @@ class CustomColumns(Base):
content['is_editable'] = self.editable
content['rec_index'] = sequence + 22 # toDo why ??
if isinstance(value, datetime):
content['#value#'] = {"__class__": "datetime.datetime", "__value__": value.strftime("%Y-%m-%dT%H:%M:%S+00:00")}
content['#value#'] = {"__class__": "datetime.datetime",
"__value__": value.strftime("%Y-%m-%dT%H:%M:%S+00:00")}
else:
content['#value#'] = value
content['#extra#'] = extra
content['is_multiple2'] = {} if not self.is_multiple else {"cache_to_list": "|", "ui_to_list": ",", "list_to_ui": ", "}
content['is_multiple2'] = {} if not self.is_multiple else {"cache_to_list": "|", "ui_to_list": ",",
"list_to_ui": ", "}
return json.dumps(content, ensure_ascii=False)
@ -494,7 +507,6 @@ class CalibreDB:
if init:
self.init_db(expire_on_commit)
def init_db(self, expire_on_commit=True):
if self._init:
self.init_session(expire_on_commit)
@ -954,10 +966,12 @@ class CalibreDB:
# read search results from calibre-database and return it (function is used for feed and simple search
def get_search_results(self, term, config, offset=None, order=None, limit=None, *join):
self.session.connection().connection.connection.create_function("partial_token_set_ratio", 2, partial_token_set_ratio)
self.session.connection().connection.connection.create_function("partial_token_set_ratio", 2,
partial_token_set_ratio)
order = order[0] if order else [Books.sort]
pagination = None
result = self.search_query(term, config, *join).order_by(func.desc(func.partial_token_set_ratio(str(Books),term))).all()
result = self.search_query(term, config, *join).order_by(
desc(func.partial_token_set_ratio(str(Books), term))).all()
for res in result:
print(res[0])
result_count = len(result)
@ -1090,6 +1104,7 @@ class Category:
self.rating = rating
self.count = 1
'''class Count:
count = None