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
134a10f5
Commit
134a10f5
authored
Feb 23, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/Develop' into Develop
# Conflicts: # cps/updater.py
parents
372c284a
371097eb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
epub.js
cps/static/js/reading/epub.js
+0
-1
updater.py
cps/updater.py
+1
-1
No files found.
cps/static/js/reading/epub.js
View file @
134a10f5
...
...
@@ -42,5 +42,4 @@ var reader;
alert
(
error
);
});
}
// reader.book.package.metadata.direction= "rtl"; wait for reader reader before changing reading direction
})();
cps/updater.py
View file @
134a10f5
...
...
@@ -198,7 +198,7 @@ class Updater(threading.Thread):
)
additional_path
=
self
.
is_venv
()
if
additional_path
:
exclude
=
exclude
+
(
additional_path
)
exclude
=
exclude
+
(
additional_path
,
)
for
root
,
dirs
,
files
in
os
.
walk
(
destination
,
topdown
=
True
):
for
name
in
files
:
old_list
.
append
(
os
.
path
.
join
(
root
,
name
)
.
replace
(
destination
,
''
))
...
...
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