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
1a10859a
Commit
1a10859a
authored
Mar 03, 2017
by
林檎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
When upload pub, add description to comment accord opf file
parent
d5e52530
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
5 deletions
+20
-5
book_formats.py
cps/book_formats.py
+2
-0
epub.py
cps/epub.py
+9
-3
uploader.py
cps/uploader.py
+1
-1
web.py
cps/web.py
+8
-1
No files found.
cps/book_formats.py
View file @
1a10859a
...
...
@@ -64,6 +64,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
tags
=
""
,
series
=
""
,
series_id
=
""
,
comments
=
""
,
languages
=
""
)
...
...
@@ -93,6 +94,7 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
tags
=
""
,
series
=
""
,
series_id
=
""
,
comments
=
""
,
languages
=
""
)
...
...
cps/epub.py
View file @
1a10859a
...
...
@@ -41,6 +41,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
p
=
tree
.
xpath
(
'/pkg:package/pkg:metadata'
,
namespaces
=
ns
)[
0
]
epub_metadata
=
{}
try
:
#maybe description isn't present
comments
=
tree
.
xpath
(
"//*[local-name() = 'description']/text()"
)[
0
]
epub_metadata
[
'comments'
]
=
comments
except
:
epub_metadata
[
'comments'
]
=
""
for
s
in
[
'title'
,
'description'
,
'creator'
]:
tmp
=
p
.
xpath
(
'dc:
%
s/text()'
%
s
,
namespaces
=
ns
)
if
len
(
tmp
)
>
0
:
...
...
@@ -62,6 +68,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
epub_metadata
[
'languages'
]
=
""
coversection
=
tree
.
xpath
(
"/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href"
,
namespaces
=
ns
)
coverfile
=
None
if
len
(
coversection
)
>
0
:
coverfile
=
extractCover
(
zip
,
coversection
[
0
],
coverpath
,
tmp_file_path
)
else
:
...
...
@@ -84,9 +91,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
meta_cover_content
=
tree
.
xpath
(
"/pkg:package/pkg:manifest/pkg:item[@id='"
+
meta_cover
[
0
]
+
"']/@href"
,
namespaces
=
ns
)
if
len
(
meta_cover_content
)
>
0
:
coverfile
=
extractCover
(
zip
,
meta_cover_content
[
0
],
coverpath
,
tmp_file_path
)
else
:
coverfile
=
None
if
epub_metadata
[
'title'
]
is
None
:
title
=
original_file_name
else
:
...
...
@@ -102,4 +107,5 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
tags
=
""
,
series
=
""
,
series_id
=
""
,
comments
=
epub_metadata
[
'comments'
],
languages
=
epub_metadata
[
'languages'
])
cps/uploader.py
View file @
1a10859a
...
...
@@ -7,7 +7,7 @@ import hashlib
from
collections
import
namedtuple
import
book_formats
BookMeta
=
namedtuple
(
'BookMeta'
,
'file_path, extension, title, author, cover, description, tags, series, series_id, languages'
)
BookMeta
=
namedtuple
(
'BookMeta'
,
'file_path, extension, title, author, cover, description, tags, series, series_id,
comments,
languages'
)
"""
:rtype: BookMeta
...
...
cps/web.py
View file @
1a10859a
...
...
@@ -5,7 +5,7 @@ import logging
from
logging.handlers
import
RotatingFileHandler
import
textwrap
from
flask
import
Flask
,
render_template
,
request
,
Response
,
redirect
,
url_for
,
send_from_directory
,
\
make_response
,
g
,
flash
,
abort
make_response
,
g
,
flash
,
abort
,
Markup
from
flask
import
__version__
as
flaskVersion
import
ub
from
ub
import
config
...
...
@@ -2232,6 +2232,13 @@ def upload():
db_book
.
data
.
append
(
db_data
)
db
.
session
.
add
(
db_book
)
db
.
session
.
flush
()
# flush content get db_book.id avalible
#add comment
upload_comment
=
Markup
(
meta
.
comments
)
.
unescape
()
db_comment
=
None
if
upload_comment
!=
""
:
db_comment
=
db
.
Comments
(
upload_comment
,
db_book
.
id
)
db
.
session
.
add
(
db_comment
)
db
.
session
.
commit
()
if
db_language
is
not
None
:
#display Full name instead of iso639.part3
db_book
.
languages
[
0
]
.
language_name
=
meta
.
languages
...
...
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