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
bf8688fe
Commit
bf8688fe
authored
Mar 05, 2017
by
林檎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
missing urllib migration
parent
c3fd205b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
helper.py
cps/helper.py
+4
-1
web.py
cps/web.py
+9
-8
No files found.
cps/helper.py
View file @
bf8688fe
...
...
@@ -245,7 +245,10 @@ def get_valid_filename(value, replace_whitespace=True):
value
=
value
.
replace
(
u'ß'
,
u'ss'
)
value
=
unicodedata
.
normalize
(
'NFKD'
,
value
)
re_slugify
=
re
.
compile
(
'[
\
W
\
s-]'
,
re
.
UNICODE
)
value
=
str
(
re_slugify
.
sub
(
''
,
value
)
.
strip
())
try
:
value
=
str
(
re_slugify
.
sub
(
''
,
value
)
.
strip
())
except
:
#will exception on Python2.7
value
=
unicode
(
re_slugify
.
sub
(
''
,
value
)
.
strip
())
if
replace_whitespace
:
#*+:\"/<>? werden durch _ ersetzt
value
=
re
.
sub
(
'[
\
*
\
+:
\\\"
/<>
\
?]+'
,
u'_'
,
value
,
flags
=
re
.
U
)
...
...
cps/web.py
View file @
bf8688fe
...
...
@@ -50,10 +50,11 @@ from tornado import version as tornadoVersion
from
builtins
import
str
try
:
from
urllib.parse
import
quote
from
imp
import
reload
from
past.builtins
import
xrange
except
:
pass
from
urllib
import
quote
try
:
from
wand.image
import
Image
...
...
@@ -1243,22 +1244,22 @@ def read_book(book_id, format):
zfile
.
close
()
return
render_title_template
(
'read.html'
,
bookid
=
book_id
,
title
=
_
(
u"Read a Book"
))
elif
format
.
lower
()
==
"pdf"
:
all_name
=
str
(
book_id
)
+
"/"
+
urllib
.
quote
(
book
.
data
[
0
]
.
name
)
+
".pdf"
tmp_file
=
os
.
path
.
join
(
book_dir
,
urllib
.
quote
(
book
.
data
[
0
]
.
name
))
+
".pdf"
all_name
=
str
(
book_id
)
+
"/"
+
quote
(
book
.
data
[
0
]
.
name
)
+
".pdf"
tmp_file
=
os
.
path
.
join
(
book_dir
,
quote
(
book
.
data
[
0
]
.
name
))
+
".pdf"
if
not
os
.
path
.
exists
(
tmp_file
):
pdf_file
=
os
.
path
.
join
(
config
.
config_calibre_dir
,
book
.
path
,
book
.
data
[
0
]
.
name
)
+
".pdf"
copyfile
(
pdf_file
,
tmp_file
)
return
render_title_template
(
'readpdf.html'
,
pdffile
=
all_name
,
title
=
_
(
u"Read a Book"
))
elif
format
.
lower
()
==
"txt"
:
all_name
=
str
(
book_id
)
+
"/"
+
urllib
.
quote
(
book
.
data
[
0
]
.
name
)
+
".txt"
tmp_file
=
os
.
path
.
join
(
book_dir
,
urllib
.
quote
(
book
.
data
[
0
]
.
name
))
+
".txt"
all_name
=
str
(
book_id
)
+
"/"
+
quote
(
book
.
data
[
0
]
.
name
)
+
".txt"
tmp_file
=
os
.
path
.
join
(
book_dir
,
quote
(
book
.
data
[
0
]
.
name
))
+
".txt"
if
not
os
.
path
.
exists
(
all_name
):
txt_file
=
os
.
path
.
join
(
config
.
config_calibre_dir
,
book
.
path
,
book
.
data
[
0
]
.
name
)
+
".txt"
copyfile
(
txt_file
,
tmp_file
)
return
render_title_template
(
'readtxt.html'
,
txtfile
=
all_name
,
title
=
_
(
u"Read a Book"
))
elif
format
.
lower
()
==
"cbr"
:
all_name
=
str
(
book_id
)
+
"/"
+
urllib
.
quote
(
book
.
data
[
0
]
.
name
)
+
".cbr"
tmp_file
=
os
.
path
.
join
(
book_dir
,
urllib
.
quote
(
book
.
data
[
0
]
.
name
))
+
".cbr"
all_name
=
str
(
book_id
)
+
"/"
+
quote
(
book
.
data
[
0
]
.
name
)
+
".cbr"
tmp_file
=
os
.
path
.
join
(
book_dir
,
quote
(
book
.
data
[
0
]
.
name
))
+
".cbr"
if
not
os
.
path
.
exists
(
all_name
):
cbr_file
=
os
.
path
.
join
(
config
.
config_calibre_dir
,
book
.
path
,
book
.
data
[
0
]
.
name
)
+
".cbr"
copyfile
(
cbr_file
,
tmp_file
)
...
...
@@ -1290,7 +1291,7 @@ def get_download_link(book_id, format):
response
.
headers
[
"Content-Type"
]
=
mimetypes
.
types_map
[
'.'
+
format
]
except
:
pass
response
.
headers
[
"Content-Disposition"
]
=
"attachment; filename=
\"
%
s.
%
s
\"
"
%
(
file_name
.
encode
(
'utf-8'
),
format
)
response
.
headers
[
"Content-Disposition"
]
=
"attachment; filename=
\"
%
s.
%
s
\"
"
%
(
quote
(
file_name
.
encode
(
'utf-8'
)
),
format
)
return
response
else
:
abort
(
404
)
...
...
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