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
37600110
Commit
37600110
authored
Sep 28, 2020
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfixes from last testrun
parent
cc0b0196
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
817 additions
and
216 deletions
+817
-216
user_edit.html
cps/templates/user_edit.html
+0
-25
web.py
cps/web.py
+22
-22
Calibre-Web TestSummary_Linux.html
test/Calibre-Web TestSummary_Linux.html
+795
-169
No files found.
cps/templates/user_edit.html
View file @
37600110
...
@@ -141,30 +141,6 @@
...
@@ -141,30 +141,6 @@
</div>
</div>
</form>
</form>
</div>
</div>
{% if downloads %}
<div
class=
"col-md-12 col-lg-12"
>
<div
class=
"discover1 load-more1"
>
<h2>
{{_('Recent Downloads')}}
</h2>
<div
class=
"row"
>
{% for entry in downloads %}
<div
class=
"col-sm-3 col-lg-2 col-xs-6 book"
id=
"books"
>
<div
class=
"cover"
>
<a
href=
"{{ url_for('web.show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
<img
src=
"{{ url_for('web.get_cover', book_id=entry.id) }}"
alt=
"{{ entry.title }}"
/>
</a>
</div>
<div
class=
"meta"
>
<a
href=
"{{ url_for('web.show_book', book_id=entry.id) }}"
data-toggle=
"modal"
data-target=
"#bookDetailsModal"
data-remote=
"false"
>
<p
class=
"title"
>
{{entry.title|shortentitle}}
</p>
</a>
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% endif %}
<div
class=
"modal fade"
id=
"modal_kobo_token"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"kobo_tokenModalLabel"
>
<div
class=
"modal fade"
id=
"modal_kobo_token"
tabindex=
"-1"
role=
"dialog"
aria-labelledby=
"kobo_tokenModalLabel"
>
<div
class=
"modal-dialog modal-lg"
role=
"document"
>
<div
class=
"modal-dialog modal-lg"
role=
"document"
>
...
@@ -204,5 +180,4 @@
...
@@ -204,5 +180,4 @@
<script
src=
"{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table-editable.min.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-editable.min.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/table.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/table.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/libs/plugins.js') }}"
></script>
{% endblock %}
{% endblock %}
cps/web.py
View file @
37600110
...
@@ -999,11 +999,11 @@ def books_table():
...
@@ -999,11 +999,11 @@ def books_table():
def
list_books
():
def
list_books
():
off
=
request
.
args
.
get
(
"offset"
)
or
0
off
=
request
.
args
.
get
(
"offset"
)
or
0
limit
=
request
.
args
.
get
(
"limit"
)
or
config
.
config_books_per_page
limit
=
request
.
args
.
get
(
"limit"
)
or
config
.
config_books_per_page
sort
=
request
.
args
.
get
(
"sort"
)
# sort = request.args.get("sort")
if
request
.
args
.
get
(
"order"
)
==
'asc'
:
if
request
.
args
.
get
(
"order"
)
==
'desc'
:
order
=
[
db
.
Books
.
timestamp
.
asc
()]
else
:
order
=
[
db
.
Books
.
timestamp
.
desc
()]
order
=
[
db
.
Books
.
timestamp
.
desc
()]
else
:
order
=
[
db
.
Books
.
timestamp
.
asc
()]
search
=
request
.
args
.
get
(
"search"
)
search
=
request
.
args
.
get
(
"search"
)
total_count
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
count
()
total_count
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
count
()
if
search
:
if
search
:
...
@@ -1047,10 +1047,10 @@ def update_table_settings():
...
@@ -1047,10 +1047,10 @@ def update_table_settings():
@
login_required_if_no_ano
@
login_required_if_no_ano
def
author_list
():
def
author_list
():
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_AUTHOR
):
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_AUTHOR
):
if
current_user
.
get_view_property
(
'author'
,
'dir'
)
==
'asc'
:
if
current_user
.
get_view_property
(
'author'
,
'dir'
)
==
'desc'
:
order
=
db
.
Authors
.
sort
.
asc
()
else
:
order
=
db
.
Authors
.
sort
.
desc
()
order
=
db
.
Authors
.
sort
.
desc
()
else
:
order
=
db
.
Authors
.
sort
.
asc
()
entries
=
calibre_db
.
session
.
query
(
db
.
Authors
,
func
.
count
(
'books_authors_link.book'
)
.
label
(
'count'
))
\
entries
=
calibre_db
.
session
.
query
(
db
.
Authors
,
func
.
count
(
'books_authors_link.book'
)
.
label
(
'count'
))
\
.
join
(
db
.
books_authors_link
)
.
join
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
\
.
join
(
db
.
books_authors_link
)
.
join
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
\
.
group_by
(
text
(
'books_authors_link.author'
))
.
order_by
(
order
)
.
all
()
.
group_by
(
text
(
'books_authors_link.author'
))
.
order_by
(
order
)
.
all
()
...
@@ -1068,10 +1068,10 @@ def author_list():
...
@@ -1068,10 +1068,10 @@ def author_list():
@
web
.
route
(
"/publisher"
)
@
web
.
route
(
"/publisher"
)
@
login_required_if_no_ano
@
login_required_if_no_ano
def
publisher_list
():
def
publisher_list
():
if
current_user
.
get_view_property
(
'publisher'
,
'dir'
)
==
'asc'
:
if
current_user
.
get_view_property
(
'publisher'
,
'dir'
)
==
'desc'
:
order
=
db
.
Publishers
.
name
.
asc
()
else
:
order
=
db
.
Publishers
.
name
.
desc
()
order
=
db
.
Publishers
.
name
.
desc
()
else
:
order
=
db
.
Publishers
.
name
.
asc
()
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_PUBLISHER
):
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_PUBLISHER
):
entries
=
calibre_db
.
session
.
query
(
db
.
Publishers
,
func
.
count
(
'books_publishers_link.book'
)
.
label
(
'count'
))
\
entries
=
calibre_db
.
session
.
query
(
db
.
Publishers
,
func
.
count
(
'books_publishers_link.book'
)
.
label
(
'count'
))
\
.
join
(
db
.
books_publishers_link
)
.
join
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
\
.
join
(
db
.
books_publishers_link
)
.
join
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
\
...
@@ -1089,10 +1089,10 @@ def publisher_list():
...
@@ -1089,10 +1089,10 @@ def publisher_list():
@
login_required_if_no_ano
@
login_required_if_no_ano
def
series_list
():
def
series_list
():
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_SERIES
):
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_SERIES
):
if
current_user
.
get_view_property
(
'series'
,
'dir'
)
==
'asc'
:
if
current_user
.
get_view_property
(
'series'
,
'dir'
)
==
'desc'
:
order
=
db
.
Series
.
sort
.
asc
()
else
:
order
=
db
.
Series
.
sort
.
desc
()
order
=
db
.
Series
.
sort
.
desc
()
else
:
order
=
db
.
Series
.
sort
.
asc
()
if
current_user
.
get_view_property
(
'series'
,
'series_view'
)
==
'list'
:
if
current_user
.
get_view_property
(
'series'
,
'series_view'
)
==
'list'
:
entries
=
calibre_db
.
session
.
query
(
db
.
Series
,
func
.
count
(
'books_series_link.book'
)
.
label
(
'count'
))
\
entries
=
calibre_db
.
session
.
query
(
db
.
Series
,
func
.
count
(
'books_series_link.book'
)
.
label
(
'count'
))
\
.
join
(
db
.
books_series_link
)
.
join
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
\
.
join
(
db
.
books_series_link
)
.
join
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
\
...
@@ -1120,10 +1120,10 @@ def series_list():
...
@@ -1120,10 +1120,10 @@ def series_list():
@
login_required_if_no_ano
@
login_required_if_no_ano
def
ratings_list
():
def
ratings_list
():
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_RATING
):
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_RATING
):
if
current_user
.
get_view_property
(
'ratings'
,
'dir'
)
==
'asc'
:
if
current_user
.
get_view_property
(
'ratings'
,
'dir'
)
==
'desc'
:
order
=
db
.
Ratings
.
rating
.
asc
()
else
:
order
=
db
.
Ratings
.
rating
.
desc
()
order
=
db
.
Ratings
.
rating
.
desc
()
else
:
order
=
db
.
Ratings
.
rating
.
asc
()
entries
=
calibre_db
.
session
.
query
(
db
.
Ratings
,
func
.
count
(
'books_ratings_link.book'
)
.
label
(
'count'
),
entries
=
calibre_db
.
session
.
query
(
db
.
Ratings
,
func
.
count
(
'books_ratings_link.book'
)
.
label
(
'count'
),
(
db
.
Ratings
.
rating
/
2
)
.
label
(
'name'
))
\
(
db
.
Ratings
.
rating
/
2
)
.
label
(
'name'
))
\
.
join
(
db
.
books_ratings_link
)
.
join
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
\
.
join
(
db
.
books_ratings_link
)
.
join
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
\
...
@@ -1138,10 +1138,10 @@ def ratings_list():
...
@@ -1138,10 +1138,10 @@ def ratings_list():
@
login_required_if_no_ano
@
login_required_if_no_ano
def
formats_list
():
def
formats_list
():
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_FORMAT
):
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_FORMAT
):
if
current_user
.
get_view_property
(
'ratings'
,
'dir'
)
==
'asc'
:
if
current_user
.
get_view_property
(
'ratings'
,
'dir'
)
==
'desc'
:
order
=
db
.
Data
.
format
.
asc
()
else
:
order
=
db
.
Data
.
format
.
desc
()
order
=
db
.
Data
.
format
.
desc
()
else
:
order
=
db
.
Data
.
format
.
asc
()
entries
=
calibre_db
.
session
.
query
(
db
.
Data
,
entries
=
calibre_db
.
session
.
query
(
db
.
Data
,
func
.
count
(
'data.book'
)
.
label
(
'count'
),
func
.
count
(
'data.book'
)
.
label
(
'count'
),
db
.
Data
.
format
.
label
(
'format'
))
\
db
.
Data
.
format
.
label
(
'format'
))
\
...
@@ -1186,10 +1186,10 @@ def language_overview():
...
@@ -1186,10 +1186,10 @@ def language_overview():
@
login_required_if_no_ano
@
login_required_if_no_ano
def
category_list
():
def
category_list
():
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_CATEGORY
):
if
current_user
.
check_visibility
(
constants
.
SIDEBAR_CATEGORY
):
if
current_user
.
get_view_property
(
'category'
,
'dir'
)
==
'asc'
:
if
current_user
.
get_view_property
(
'category'
,
'dir'
)
==
'desc'
:
order
=
db
.
Tags
.
name
.
asc
()
else
:
order
=
db
.
Tags
.
name
.
desc
()
order
=
db
.
Tags
.
name
.
desc
()
else
:
order
=
db
.
Tags
.
name
.
asc
()
entries
=
calibre_db
.
session
.
query
(
db
.
Tags
,
func
.
count
(
'books_tags_link.book'
)
.
label
(
'count'
))
\
entries
=
calibre_db
.
session
.
query
(
db
.
Tags
,
func
.
count
(
'books_tags_link.book'
)
.
label
(
'count'
))
\
.
join
(
db
.
books_tags_link
)
.
join
(
db
.
Books
)
.
order_by
(
order
)
.
filter
(
calibre_db
.
common_filters
())
\
.
join
(
db
.
books_tags_link
)
.
join
(
db
.
Books
)
.
order_by
(
order
)
.
filter
(
calibre_db
.
common_filters
())
\
.
group_by
(
text
(
'books_tags_link.tag'
))
.
all
()
.
group_by
(
text
(
'books_tags_link.tag'
))
.
all
()
...
...
test/Calibre-Web TestSummary_Linux.html
View file @
37600110
This diff is collapsed.
Click to expand it.
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