Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
27ed9188
Commit
27ed9188
authored
May 27, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enabled search for archived books
parent
9b2df9cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
db.py
cps/db.py
+1
-2
web.py
cps/web.py
+10
-10
No files found.
cps/db.py
View file @
27ed9188
...
...
@@ -572,8 +572,7 @@ class CalibreDB(threading.Thread):
authorterms
=
re
.
split
(
"[, ]+"
,
term
)
for
authorterm
in
authorterms
:
q
.
append
(
Books
.
authors
.
any
(
func
.
lower
(
Authors
.
name
)
.
ilike
(
"
%
"
+
authorterm
+
"
%
"
)))
return
self
.
session
.
query
(
Books
)
.
filter
(
self
.
common_filters
())
.
filter
(
return
self
.
session
.
query
(
Books
)
.
filter
(
self
.
common_filters
(
True
))
.
filter
(
or_
(
Books
.
tags
.
any
(
func
.
lower
(
Tags
.
name
)
.
ilike
(
"
%
"
+
term
+
"
%
"
)),
Books
.
series
.
any
(
func
.
lower
(
Series
.
name
)
.
ilike
(
"
%
"
+
term
+
"
%
"
)),
Books
.
authors
.
any
(
and_
(
*
q
)),
...
...
cps/web.py
View file @
27ed9188
...
...
@@ -589,7 +589,7 @@ def get_languages_json():
@
login_required_if_no_ano
def
get_matching_tags
():
tag_dict
=
{
'tags'
:
[]}
q
=
calibre_db
.
session
.
query
(
db
.
Books
)
q
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
(
True
))
calibre_db
.
session
.
connection
()
.
connection
.
connection
.
create_function
(
"lower"
,
1
,
db
.
lcase
)
author_input
=
request
.
args
.
get
(
'author_name'
)
or
''
title_input
=
request
.
args
.
get
(
'book_title'
)
or
''
...
...
@@ -1022,7 +1022,7 @@ def advanced_search():
# Build custom columns names
cc
=
get_cc_columns
(
filter_config_custom_read
=
True
)
calibre_db
.
session
.
connection
()
.
connection
.
connection
.
create_function
(
"lower"
,
1
,
db
.
lcase
)
q
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
.
order_by
(
db
.
Books
.
sort
)
q
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
(
True
))
.
order_by
(
db
.
Books
.
sort
)
include_tag_inputs
=
request
.
args
.
getlist
(
'include_tag'
)
exclude_tag_inputs
=
request
.
args
.
getlist
(
'exclude_tag'
)
...
...
@@ -1641,8 +1641,8 @@ def profile():
def
read_book
(
book_id
,
book_format
):
book
=
calibre_db
.
get_filtered_book
(
book_id
)
if
not
book
:
flash
(
_
(
u"Error opening eBook. File does not exist or file is not accessible
:
"
),
category
=
"error"
)
log
.
debug
(
u"Error opening eBook. File does not exist or file is not accessible
:
"
)
flash
(
_
(
u"Error opening eBook. File does not exist or file is not accessible"
),
category
=
"error"
)
log
.
debug
(
u"Error opening eBook. File does not exist or file is not accessible"
)
return
redirect
(
url_for
(
"web.index"
))
# check if book has bookmark
...
...
@@ -1681,8 +1681,8 @@ def read_book(book_id, book_format):
# if book_format.lower() == fileext:
# return render_title_template('readcbr.html', comicfile=book_id,
# extension=fileext, title=_(u"Read a Book"), book=book)
log
.
debug
(
u"Error opening eBook. File does not exist or file is not accessible
:
"
)
flash
(
_
(
u"Error opening eBook. File does not exist or file is not accessible
.
"
),
category
=
"error"
)
log
.
debug
(
u"Error opening eBook. File does not exist or file is not accessible"
)
flash
(
_
(
u"Error opening eBook. File does not exist or file is not accessible"
),
category
=
"error"
)
return
redirect
(
url_for
(
"web.index"
))
...
...
@@ -1693,8 +1693,8 @@ def show_book(book_id):
if
entries
:
for
index
in
range
(
0
,
len
(
entries
.
languages
)):
try
:
entries
.
languages
[
index
]
.
language_name
=
LC
.
parse
(
entries
.
languages
[
index
]
.
lang_code
)
.
get_language_name
(
get_locale
())
entries
.
languages
[
index
]
.
language_name
=
LC
.
parse
(
entries
.
languages
[
index
]
.
lang_code
)
\
.
get_language_name
(
get_locale
())
except
UnknownLocaleError
:
entries
.
languages
[
index
]
.
language_name
=
_
(
isoLanguages
.
get
(
part3
=
entries
.
languages
[
index
]
.
lang_code
)
.
name
)
...
...
@@ -1743,6 +1743,6 @@ def show_book(book_id):
is_xhr
=
request
.
headers
.
get
(
'X-Requested-With'
)
==
'XMLHttpRequest'
,
title
=
entries
.
title
,
books_shelfs
=
book_in_shelfs
,
have_read
=
have_read
,
is_archived
=
is_archived
,
kindle_list
=
kindle_list
,
reader_list
=
reader_list
,
page
=
"book"
)
else
:
log
.
debug
(
u"Error opening eBook. File does not exist or file is not accessible
:
"
)
flash
(
_
(
u"Error opening eBook. File does not exist or file is not accessible
:
"
),
category
=
"error"
)
log
.
debug
(
u"Error opening eBook. File does not exist or file is not accessible"
)
flash
(
_
(
u"Error opening eBook. File does not exist or file is not accessible"
),
category
=
"error"
)
return
redirect
(
url_for
(
"web.index"
))
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment