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
ec121818
Unverified
Commit
ec121818
authored
Nov 19, 2017
by
Andriy Zasypkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added python3 compatibility for comic reader
parent
9f8cbe8c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
3 deletions
+19
-3
web.py
cps/web.py
+19
-3
No files found.
cps/web.py
View file @
ec121818
...
...
@@ -99,6 +99,9 @@ try:
except
ImportError
:
from
flask_login.__about__
import
__version__
as
flask_loginVersion
if
sys
.
version_info
.
major
>=
3
:
import
codecs
import
time
current_milli_time
=
lambda
:
int
(
round
(
time
.
time
()
*
1000
))
...
...
@@ -931,25 +934,38 @@ def get_comic_book(book_id, book_format, page):
try
:
rf
=
rarfile
.
RarFile
(
cbr_file
)
rarNames
=
rf
.
namelist
()
extractedfile
=
"data:image/png;base64,"
+
(
rf
.
read
(
rarNames
[
page
]))
.
encode
(
'base64'
)
if
sys
.
version_info
.
major
>=
3
:
b64
=
codecs
.
encode
(
rf
.
read
(
rarNames
[
page
]),
'base64'
)
.
decode
()
else
:
b64
=
rf
.
read
(
rarNames
[
page
])
.
encode
(
'base64'
)
extractedfile
=
"data:image/png;base64,"
+
b64
fileData
=
{
"name"
:
rarNames
[
page
],
"page"
:
page
,
"last"
:
rarNames
.
__len__
()
-
1
,
"content"
:
extractedfile
}
except
:
return
""
# rarfile not valid
# ToDo: error handling
else
:
# no support means return nothing
return
""
if
book_format
==
"cbz"
:
zf
=
zipfile
.
ZipFile
(
cbr_file
)
zipNames
=
zf
.
namelist
()
extractedfile
=
"data:image/png;base64,"
+
(
zf
.
read
(
zipNames
[
page
]))
.
encode
(
'base64'
)
if
sys
.
version_info
.
major
>=
3
:
b64
=
codecs
.
encode
(
zf
.
read
(
zipNames
[
page
]),
'base64'
)
.
decode
()
else
:
b64
=
zf
.
read
(
zipNames
[
page
])
.
encode
(
'base64'
)
extractedfile
=
"data:image/png;base64,"
+
b64
fileData
=
{
"name"
:
zipNames
[
page
],
"page"
:
page
,
"last"
:
zipNames
.
__len__
()
-
1
,
"content"
:
extractedfile
}
if
book_format
==
"cbt"
:
tf
=
tarfile
.
TarFile
(
u'D:
\\
zip
\\
test.cbt'
)
tarNames
=
tf
.
getnames
()
extractedfile
=
"data:image/png;base64,"
+
(
tf
.
extractfile
(
tarNames
[
page
])
.
read
())
.
encode
(
'base64'
)
if
sys
.
version_info
.
major
>=
3
:
b64
=
codecs
.
encode
(
tf
.
extractfile
(
tarNames
[
page
])
.
read
(),
'base64'
)
.
decode
()
else
:
b64
=
(
tf
.
extractfile
(
tarNames
[
page
])
.
read
())
.
encode
(
'base64'
)
extractedfile
=
"data:image/png;base64,"
+
bs
fileData
=
{
"name"
:
tarNames
[
page
],
"page"
:
page
,
"last"
:
tarNames
.
__len__
()
-
1
,
"content"
:
extractedfile
}
return
make_response
(
json
.
dumps
(
fileData
))
...
...
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