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
d64009e2
Commit
d64009e2
authored
Dec 13, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
preparation for filtered and ordered shelfs
parent
fd8b642d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
65 additions
and
64 deletions
+65
-64
shelf.py
cps/shelf.py
+44
-53
caliBlur.css
cps/static/css/caliBlur.css
+4
-4
shelf_order.html
cps/templates/shelf_order.html
+15
-6
web.py
cps/web.py
+2
-1
No files found.
cps/shelf.py
View file @
d64009e2
...
...
@@ -29,7 +29,7 @@ from flask_login import login_required, current_user
from
sqlalchemy.sql.expression
import
func
from
sqlalchemy.exc
import
OperationalError
,
InvalidRequestError
from
.
import
logger
,
ub
,
calibre_db
from
.
import
logger
,
ub
,
calibre_db
,
db
from
.render_template
import
render_title_template
from
.usermanagement
import
login_required_if_no_ano
...
...
@@ -139,18 +139,14 @@ def search_to_shelf(shelf_id):
books_for_shelf
=
ub
.
searched_ids
[
current_user
.
id
]
if
not
books_for_shelf
:
log
.
error
(
"Books are already part of
%
s"
,
shelf
)
log
.
error
(
"Books are already part of
%
s"
,
shelf
.
name
)
flash
(
_
(
u"Books are already part of the shelf:
%(name)
s"
,
name
=
shelf
.
name
),
category
=
"error"
)
return
redirect
(
url_for
(
'web.index'
))
maxOrder
=
ub
.
session
.
query
(
func
.
max
(
ub
.
BookShelf
.
order
))
.
filter
(
ub
.
BookShelf
.
shelf
==
shelf_id
)
.
first
()
if
maxOrder
[
0
]
is
None
:
maxOrder
=
0
else
:
maxOrder
=
maxOrder
[
0
]
maxOrder
=
ub
.
session
.
query
(
func
.
max
(
ub
.
BookShelf
.
order
))
.
filter
(
ub
.
BookShelf
.
shelf
==
shelf_id
)
.
first
()[
0
]
or
0
for
book
in
books_for_shelf
:
maxOrder
=
maxOrder
+
1
maxOrder
+=
1
shelf
.
books
.
append
(
ub
.
BookShelf
(
shelf
=
shelf
.
id
,
book_id
=
book
,
order
=
maxOrder
))
shelf
.
last_modified
=
datetime
.
utcnow
()
try
:
...
...
@@ -337,7 +333,7 @@ def delete_shelf(shelf_id):
cur_shelf
=
ub
.
session
.
query
(
ub
.
Shelf
)
.
filter
(
ub
.
Shelf
.
id
==
shelf_id
)
.
first
()
try
:
delete_shelf_helper
(
cur_shelf
)
except
(
OperationalError
,
InvalidRequestError
)
:
except
InvalidRequestError
:
ub
.
session
.
rollback
()
flash
(
_
(
u"Settings DB is not Writeable"
),
category
=
"error"
)
return
redirect
(
url_for
(
'web.index'
))
...
...
@@ -347,34 +343,10 @@ def delete_shelf(shelf_id):
@
shelf
.
route
(
"/shelf/<int:shelf_id>/<int:shelf_type>"
)
@
login_required_if_no_ano
def
show_shelf
(
shelf_type
,
shelf_id
):
shelf
=
ub
.
session
.
query
(
ub
.
Shelf
)
.
filter
(
ub
.
Shelf
.
id
==
shelf_id
)
.
first
()
result
=
list
()
# user is allowed to access shelf
if
shelf
and
check_shelf_view_permissions
(
shelf
):
page
=
"shelf.html"
if
shelf_type
==
1
else
'shelfdown.html'
books_in_shelf
=
ub
.
session
.
query
(
ub
.
BookShelf
)
.
filter
(
ub
.
BookShelf
.
shelf
==
shelf_id
)
\
.
order_by
(
ub
.
BookShelf
.
order
.
asc
())
.
all
()
for
book
in
books_in_shelf
:
cur_book
=
calibre_db
.
get_filtered_book
(
book
.
book_id
)
if
cur_book
:
result
.
append
(
cur_book
)
else
:
cur_book
=
calibre_db
.
get_book
(
book
.
book_id
)
if
not
cur_book
:
log
.
info
(
'Not existing book
%
s in
%
s deleted'
,
book
.
book_id
,
shelf
)
try
:
ub
.
session
.
query
(
ub
.
BookShelf
)
.
filter
(
ub
.
BookShelf
.
book_id
==
book
.
book_id
)
.
delete
()
ub
.
session
.
commit
()
except
(
OperationalError
,
InvalidRequestError
):
ub
.
session
.
rollback
()
flash
(
_
(
u"Settings DB is not Writeable"
),
category
=
"error"
)
return
render_title_template
(
page
,
entries
=
result
,
title
=
_
(
u"Shelf: '
%(name)
s'"
,
name
=
shelf
.
name
),
shelf
=
shelf
,
page
=
"shelf"
)
else
:
flash
(
_
(
u"Error opening shelf. Shelf does not exist or is not accessible"
),
category
=
"error"
)
return
redirect
(
url_for
(
"web.index"
))
page_no
=
0
offset
=
0
order
=
None
return
render_show_shelf
(
shelf_type
,
shelf_id
,
page_no
,
offset
,
order
)
@
shelf
.
route
(
"/shelf/order/<int:shelf_id>"
,
methods
=
[
"GET"
,
"POST"
])
...
...
@@ -398,22 +370,41 @@ def order_shelf(shelf_id):
shelf
=
ub
.
session
.
query
(
ub
.
Shelf
)
.
filter
(
ub
.
Shelf
.
id
==
shelf_id
)
.
first
()
result
=
list
()
if
shelf
and
check_shelf_view_permissions
(
shelf
):
books_in_shelf2
=
ub
.
session
.
query
(
ub
.
BookShelf
)
.
filter
(
ub
.
BookShelf
.
shelf
==
shelf_id
)
\
.
order_by
(
ub
.
BookShelf
.
order
.
asc
())
.
all
()
for
book
in
books_in_shelf2
:
cur_book
=
calibre_db
.
get_filtered_book
(
book
.
book_id
)
if
cur_book
:
result
.
append
({
'title'
:
cur_book
.
title
,
'id'
:
cur_book
.
id
,
'author'
:
cur_book
.
authors
,
'series'
:
cur_book
.
series
,
'series_index'
:
cur_book
.
series_index
})
else
:
cur_book
=
calibre_db
.
get_book
(
book
.
book_id
)
result
.
append
({
'title'
:
_
(
'Hidden Book'
),
'id'
:
cur_book
.
id
,
'author'
:
[],
'series'
:
[]})
result
=
calibre_db
.
session
.
query
(
db
.
Books
)
\
.
join
(
ub
.
BookShelf
,
ub
.
BookShelf
.
book_id
==
db
.
Books
.
id
,
isouter
=
True
)
\
.
add_columns
(
calibre_db
.
common_filters
()
.
label
(
"visible"
))
\
.
filter
(
ub
.
BookShelf
.
shelf
==
shelf_id
)
.
order_by
(
ub
.
BookShelf
.
order
.
asc
())
.
all
()
return
render_title_template
(
'shelf_order.html'
,
entries
=
result
,
title
=
_
(
u"Change order of Shelf: '
%(name)
s'"
,
name
=
shelf
.
name
),
shelf
=
shelf
,
page
=
"shelforder"
)
def
render_show_shelf
(
shelf_id
,
shelf_type
,
page_no
,
offset
,
order
):
shelf
=
ub
.
session
.
query
(
ub
.
Shelf
)
.
filter
(
ub
.
Shelf
.
id
==
shelf_id
)
.
first
()
# check user is allowed to access shelf
if
shelf
and
check_shelf_view_permissions
(
shelf
):
page
=
"shelf.html"
if
shelf_type
==
1
else
'shelfdown.html'
result
,
__
,
pagination
=
calibre_db
.
fill_indexpage
(
page_no
,
0
,
db
.
Books
,
ub
.
BookShelf
.
shelf
==
shelf_id
,
[
ub
.
BookShelf
.
order
.
asc
()],
ub
.
BookShelf
,
ub
.
BookShelf
.
book_id
==
db
.
Books
.
id
)
# delete chelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web
wrong_entries
=
calibre_db
.
session
.
query
(
ub
.
BookShelf
)
.
join
(
db
.
Books
,
ub
.
BookShelf
.
book_id
==
db
.
Books
.
id
,
isouter
=
True
)
.
filter
(
db
.
Books
.
id
==
None
)
.
all
()
for
entry
in
wrong_entries
:
log
.
info
(
'Not existing book {} in {} deleted'
.
format
(
entry
.
book_id
,
shelf
))
try
:
ub
.
session
.
query
(
ub
.
BookShelf
)
.
filter
(
ub
.
BookShelf
.
book_id
==
entry
.
book_id
)
.
delete
()
ub
.
session
.
commit
()
except
(
OperationalError
,
InvalidRequestError
):
ub
.
session
.
rollback
()
flash
(
_
(
u"Settings DB is not Writeable"
),
category
=
"error"
)
return
render_title_template
(
page
,
entries
=
result
,
title
=
_
(
u"Shelf: '
%(name)
s'"
,
name
=
shelf
.
name
),
shelf
=
shelf
,
page
=
"shelf"
)
else
:
flash
(
_
(
u"Error opening shelf. Shelf does not exist or is not accessible"
),
category
=
"error"
)
return
redirect
(
url_for
(
"web.index"
))
cps/static/css/caliBlur.css
View file @
d64009e2
...
...
@@ -4687,7 +4687,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
left
:
0
;
opacity
:
0
;
background
:
-webkit-radial-gradient
(
farthest-corner
at
50%
50%
,
rgba
(
50
,
50
,
50
,
.5
)
50%
,
#323232
100%
);
background
:
-o-radial-gradient
(
farthest-corner
50%
50%
,
rgba
(
50
,
50
,
50
,
.5
)
50%
,
#323232
100%
);
background
:
-o-radial-gradient
(
farthest-corner
at
50%
50%
,
rgba
(
50
,
50
,
50
,
.5
)
50%
,
#323232
100%
);
background
:
radial-gradient
(
farthest-corner
at
50%
50%
,
rgba
(
50
,
50
,
50
,
.5
)
50%
,
#323232
100%
)
}
...
...
@@ -5967,7 +5967,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
.home-btn
{
height
:
48px
;
line-height
:
28
.29
px
;
line-height
:
28px
;
right
:
10px
;
left
:
auto
}
...
...
@@ -5979,7 +5979,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
.plexBack
{
height
:
48px
;
line-height
:
28
.29
px
;
line-height
:
28px
;
left
:
48px
;
display
:
none
}
...
...
@@ -6281,7 +6281,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
}
#top_admin
,
#top_tasks
{
padding
:
1
1.5
px
15px
;
padding
:
1
2
px
15px
;
font-size
:
13px
;
line-height
:
1.71428571
;
overflow
:
hidden
...
...
cps/templates/shelf_order.html
View file @
d64009e2
...
...
@@ -5,24 +5,33 @@
<div>
{{_('Drag to Rearrange Order')}}
</div>
<div
id=
"sortTrue"
class=
"list-group"
>
{% for entry in entries %}
<div
id=
"{{entry['id']}}"
class=
"list-group-item"
>
<div
id=
"{{entry['
Books']['
id']}}"
class=
"list-group-item"
>
<div
class=
"row"
>
<div
class=
"col-lg-2 col-sm-4 hidden-xs"
>
<img
class=
"cover-height"
src=
"{{ url_for('web.get_cover', book_id=entry['id']) }}"
>
{% if entry['visible'] %}
<img
class=
"cover-height"
src=
"{{ url_for('web.get_cover', book_id=entry['Books']['id']) }}"
>
{% else %}
<img
class=
"cover-height"
src=
"{{ url_for('static', filename='generic_cover.jpg') }}"
>
{% endif %}
</div>
<div
class=
"col-lg-10 col-sm-8 col-xs-12"
>
{{entry['title']}}
{% if entry['series']|length > 0 %}
{% if entry['visible'] %}
{{entry['Books']['title']}}
{% if entry['Books']['series']|length > 0 %}
<br>
{{entry['
series_index']}} - {{entry
['series'][0].name}}
{{entry['
Books']['series_index']}} - {{entry['Books']
['series'][0].name}}
{% endif %}
<br>
{% for author in entry['author'] %}
{% for author in entry['
Books']['
author'] %}
{{author.name.replace('|',',')}}
{% if not loop.last %}
&
{% endif %}
{% endfor %}
{% else %}
{{_('Hidden Book')}}
<br>
{% endif %}
</div>
</div>
</div>
...
...
cps/web.py
View file @
d64009e2
...
...
@@ -612,7 +612,8 @@ def render_language_books(page, name, order):
return
render_title_template
(
'index.html'
,
random
=
random
,
entries
=
entries
,
pagination
=
pagination
,
id
=
name
,
title
=
_
(
u"Language:
%(name)
s"
,
name
=
lang_name
),
page
=
"language"
)
def
render_read_books
(
page
,
are_read
,
as_xml
=
False
,
order
=
None
,
*
args
,
**
kwargs
):
def
render_read_books
(
page
,
are_read
,
as_xml
=
False
,
order
=
None
):
order
=
order
or
[]
if
not
config
.
config_read_column
:
if
are_read
:
...
...
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