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
90f2b3fb
Commit
90f2b3fb
authored
Apr 12, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactored list checkbox sort
parent
0f95800d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
28 deletions
+26
-28
admin.py
cps/admin.py
+6
-14
db.py
cps/db.py
+13
-0
web.py
cps/web.py
+7
-14
No files found.
cps/admin.py
View file @
90f2b3fb
...
@@ -246,14 +246,15 @@ def list_users():
...
@@ -246,14 +246,15 @@ def list_users():
limit
=
int
(
request
.
args
.
get
(
"limit"
)
or
10
)
limit
=
int
(
request
.
args
.
get
(
"limit"
)
or
10
)
search
=
request
.
args
.
get
(
"search"
)
search
=
request
.
args
.
get
(
"search"
)
sort
=
request
.
args
.
get
(
"sort"
,
"state"
)
sort
=
request
.
args
.
get
(
"sort"
,
"state"
)
order
=
request
.
args
.
get
(
"order"
)
order
=
request
.
args
.
get
(
"order"
,
""
)
.
lower
(
)
state
=
None
state
=
None
if
sort
==
"state"
:
state
=
json
.
loads
(
request
.
args
.
get
(
"state"
))
if
sort
!=
"state"
and
order
:
if
sort
!=
"state"
and
order
:
order
=
text
(
sort
+
" "
+
order
)
order
=
text
(
sort
+
" "
+
order
)
el
s
e
:
el
if
not
stat
e
:
order
=
ub
.
User
.
name
.
desc
()
order
=
ub
.
User
.
name
.
desc
()
if
sort
==
"state"
:
state
=
json
.
loads
(
request
.
args
.
get
(
"state"
))
all_user
=
ub
.
session
.
query
(
ub
.
User
)
all_user
=
ub
.
session
.
query
(
ub
.
User
)
if
not
config
.
config_anonbrowse
:
if
not
config
.
config_anonbrowse
:
...
@@ -266,16 +267,7 @@ def list_users():
...
@@ -266,16 +267,7 @@ def list_users():
func
.
lower
(
ub
.
User
.
kindle_mail
)
.
ilike
(
"
%
"
+
search
+
"
%
"
),
func
.
lower
(
ub
.
User
.
kindle_mail
)
.
ilike
(
"
%
"
+
search
+
"
%
"
),
func
.
lower
(
ub
.
User
.
email
)
.
ilike
(
"
%
"
+
search
+
"
%
"
)))
func
.
lower
(
ub
.
User
.
email
)
.
ilike
(
"
%
"
+
search
+
"
%
"
)))
if
state
:
if
state
:
outcome
=
list
()
users
=
calibre_db
.
get_checkbox_sorted
(
all_user
.
all
(),
state
,
off
,
limit
,
request
.
args
.
get
(
"order"
,
""
)
.
lower
())
userlist
=
{
user
.
id
:
user
for
user
in
all_user
.
all
()}
for
entry
in
state
:
outcome
.
append
(
userlist
[
entry
])
del
userlist
[
entry
]
for
entry
in
userlist
:
outcome
.
append
(
userlist
[
entry
])
if
request
.
args
.
get
(
"order"
,
""
)
.
lower
()
==
"asc"
:
outcome
.
reverse
()
users
=
outcome
[
off
:
off
+
limit
]
else
:
else
:
users
=
all_user
.
order_by
(
order
)
.
offset
(
off
)
.
limit
(
limit
)
.
all
()
users
=
all_user
.
order_by
(
order
)
.
offset
(
off
)
.
limit
(
limit
)
.
all
()
if
search
:
if
search
:
...
...
cps/db.py
View file @
90f2b3fb
...
@@ -616,6 +616,19 @@ class CalibreDB():
...
@@ -616,6 +616,19 @@ class CalibreDB():
return
and_
(
lang_filter
,
pos_content_tags_filter
,
~
neg_content_tags_filter
,
return
and_
(
lang_filter
,
pos_content_tags_filter
,
~
neg_content_tags_filter
,
pos_content_cc_filter
,
~
neg_content_cc_filter
,
archived_filter
)
pos_content_cc_filter
,
~
neg_content_cc_filter
,
archived_filter
)
@
staticmethod
def
get_checkbox_sorted
(
inputlist
,
state
,
offset
,
limit
,
order
):
outcome
=
list
()
elementlist
=
{
ele
.
id
:
ele
for
ele
in
inputlist
}
for
entry
in
state
:
outcome
.
append
(
elementlist
[
entry
])
del
elementlist
[
entry
]
for
entry
in
elementlist
:
outcome
.
append
(
elementlist
[
entry
])
if
order
==
"asc"
:
outcome
.
reverse
()
return
outcome
[
offset
:
offset
+
limit
]
# Fill indexpage with all requested data from database
# Fill indexpage with all requested data from database
def
fill_indexpage
(
self
,
page
,
pagesize
,
database
,
db_filter
,
order
,
*
join
):
def
fill_indexpage
(
self
,
page
,
pagesize
,
database
,
db_filter
,
order
,
*
join
):
return
self
.
fill_indexpage_with_archived_books
(
page
,
pagesize
,
database
,
db_filter
,
order
,
False
,
*
join
)
return
self
.
fill_indexpage_with_archived_books
(
page
,
pagesize
,
database
,
db_filter
,
order
,
False
,
*
join
)
...
...
cps/web.py
View file @
90f2b3fb
...
@@ -757,33 +757,26 @@ def list_books():
...
@@ -757,33 +757,26 @@ def list_books():
limit
=
int
(
request
.
args
.
get
(
"limit"
)
or
config
.
config_books_per_page
)
limit
=
int
(
request
.
args
.
get
(
"limit"
)
or
config
.
config_books_per_page
)
search
=
request
.
args
.
get
(
"search"
)
search
=
request
.
args
.
get
(
"search"
)
sort
=
request
.
args
.
get
(
"sort"
,
"state"
)
sort
=
request
.
args
.
get
(
"sort"
,
"state"
)
order
=
request
.
args
.
get
(
"order"
)
order
=
request
.
args
.
get
(
"order"
,
""
)
.
lower
(
)
state
=
None
state
=
None
if
sort
==
"state"
:
state
=
json
.
loads
(
request
.
args
.
get
(
"state"
))
if
sort
!=
"state"
and
order
:
if
sort
!=
"state"
and
order
:
order
=
[
text
(
sort
+
" "
+
order
)]
order
=
[
text
(
sort
+
" "
+
order
)]
el
s
e
:
el
if
not
stat
e
:
order
=
[
db
.
Books
.
timestamp
.
desc
()]
order
=
[
db
.
Books
.
timestamp
.
desc
()]
if
sort
==
"state"
:
state
=
json
.
loads
(
request
.
args
.
get
(
"state"
))
total_count
=
filtered_count
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
count
()
total_count
=
filtered_count
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
count
()
if
state
:
if
state
:
outcome
=
list
()
if
search
:
if
search
:
books
=
calibre_db
.
search_query
(
search
)
books
=
calibre_db
.
search_query
(
search
)
filtered_count
=
len
(
books
)
filtered_count
=
len
(
books
)
else
:
else
:
books
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
.
all
()
books
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
filter
(
calibre_db
.
common_filters
())
.
all
()
booklist
=
{
book
.
id
:
book
for
book
in
books
}
entries
=
calibre_db
.
get_checkbox_sorted
(
books
,
state
,
off
,
limit
,
order
)
for
entry
in
state
:
outcome
.
append
(
booklist
[
entry
])
del
booklist
[
entry
]
for
entry
in
booklist
:
outcome
.
append
(
booklist
[
entry
])
if
request
.
args
.
get
(
"order"
,
""
)
.
lower
()
==
"asc"
:
outcome
.
reverse
()
entries
=
outcome
[
off
:
off
+
limit
]
elif
search
:
elif
search
:
entries
,
filtered_count
,
__
=
calibre_db
.
get_search_results
(
search
,
off
,
order
,
limit
)
entries
,
filtered_count
,
__
=
calibre_db
.
get_search_results
(
search
,
off
,
order
,
limit
)
else
:
else
:
...
...
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