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
7fa5865c
Commit
7fa5865c
authored
Jan 30, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'autoconv/kepub_autoconv' into development
# Conflicts: # cps/kobo.py # cps/kobo_auth.py
parents
e0b8fe3b
bdf60523
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
kobo.py
cps/kobo.py
+4
-1
kobo_auth.py
cps/kobo_auth.py
+10
-2
No files found.
cps/kobo.py
View file @
7fa5865c
...
...
@@ -176,6 +176,10 @@ def HandleSyncRequest():
reading_states_in_new_entitlements
=
[]
for
book
in
changed_entries
:
formats
=
[
data
.
format
for
data
in
book
.
Books
.
data
]
if
not
'KEPUB'
in
formats
and
config
.
config_kepubifypath
and
'EPUB'
in
formats
:
helper
.
convert_book_format
(
book
.
id
,
config
.
config_calibre_dir
,
'EPUB'
,
'KEPUB'
,
current_user
.
nickname
)
kobo_reading_state
=
get_or_create_reading_state
(
book
.
Books
.
id
)
entitlement
=
{
"BookEntitlement"
:
create_book_entitlement
(
book
.
Books
,
archived
=
(
book
.
is_archived
==
True
)),
...
...
@@ -1004,7 +1008,6 @@ def HandleInitRequest():
@
requires_kobo_auth
@
download_required
def
download_book
(
book_id
,
book_format
):
return
get_download_link
(
book_id
,
book_format
,
"kobo"
)
...
...
cps/kobo_auth.py
View file @
7fa5865c
...
...
@@ -64,10 +64,10 @@ from datetime import datetime
from
os
import
urandom
from
flask
import
g
,
Blueprint
,
url_for
,
abort
,
request
from
flask_login
import
login_user
,
login_required
from
flask_login
import
login_user
,
current_user
,
login_required
from
flask_babel
import
gettext
as
_
from
.
import
logger
,
ub
,
lm
from
.
import
logger
,
config
,
calibre_db
,
db
,
helper
,
ub
,
lm
from
.render_template
import
render_title_template
try
:
...
...
@@ -148,6 +148,14 @@ def generate_auth_token(user_id):
ub
.
session
.
add
(
auth_token
)
ub
.
session_commit
()
books
=
calibre_db
.
session
.
query
(
db
.
Books
)
.
join
(
db
.
Data
)
.
all
()
for
book
in
books
:
formats
=
[
data
.
format
for
data
in
book
.
data
]
if
not
'KEPUB'
in
formats
and
config
.
config_kepubifypath
and
'EPUB'
in
formats
:
helper
.
convert_book_format
(
book
.
id
,
config
.
config_calibre_dir
,
'EPUB'
,
'KEPUB'
,
current_user
.
nickname
)
return
render_title_template
(
"generate_kobo_auth_url.html"
,
title
=
_
(
u"Kobo Setup"
),
...
...
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