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
7bae79d8
Commit
7bae79d8
authored
Mar 08, 2017
by
林檎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix conflict
parent
a7d361a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
14 deletions
+0
-14
epub.py
cps/epub.py
+0
-12
book_edit.html
cps/templates/book_edit.html
+0
-2
No files found.
cps/epub.py
View file @
7bae79d8
...
...
@@ -41,14 +41,6 @@ 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
=
{}
<<<<<<<
HEAD
try
:
#maybe description isn't present
comments
=
tree
.
xpath
(
"//*[local-name() = 'description']/text()"
)[
0
]
epub_metadata
[
'comments'
]
=
comments
except
IndexError
as
e
:
epub_metadata
[
'comments'
]
=
""
=======
>>>>>>>
master
for
s
in
[
'title'
,
'description'
,
'creator'
,
'language'
]:
tmp
=
p
.
xpath
(
'dc:
%
s/text()'
%
s
,
namespaces
=
ns
)
...
...
@@ -74,11 +66,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
epub_metadata
[
'language'
]
=
isoLanguages
.
get
(
part3
=
lang
)
.
name
else
:
epub_metadata
[
'language'
]
=
""
<<<<<<<
HEAD
=======
>>>>>>>
master
coversection
=
tree
.
xpath
(
"/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href"
,
namespaces
=
ns
)
coverfile
=
None
if
len
(
coversection
)
>
0
:
...
...
cps/templates/book_edit.html
View file @
7bae79d8
...
...
@@ -150,9 +150,7 @@
</script>
<script
src=
"{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/edit_books.js') }}"
></script>
<
<<<<<<
HEAD
<script
src=
"{{ url_for('static', filename='js/libs/bootstrap-rating-input.min.js') }}"
></script>
=======
<script
src=
"{{ url_for('static', filename='js/get_meta.js') }}"
></script>
{% endblock %}
{% block header %}
...
...
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