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
c85cfa90
Commit
c85cfa90
authored
May 18, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update testresults on windows
Added encoding on fb2 upload
parent
a0449b50
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2558 additions
and
1032 deletions
+2558
-1032
admin.py
cps/admin.py
+6
-3
fb2.py
cps/fb2.py
+1
-1
Calibre-Web TestSummary_Windows.html
test/Calibre-Web TestSummary_Windows.html
+2551
-1028
No files found.
cps/admin.py
View file @
c85cfa90
...
...
@@ -985,10 +985,13 @@ def _config_string(to_save, x):
def
_configuration_gdrive_helper
(
to_save
):
gdrive_error
=
None
gdrive_secrets
=
{}
if
not
os
.
path
.
isfile
(
gdriveutils
.
SETTINGS_YAML
):
config
.
config_use_google_drive
=
False
gdrive_secrets
=
{}
if
gdrive_support
:
gdrive_error
=
gdriveutils
.
get_error_text
(
gdrive_secrets
)
if
"config_use_google_drive"
in
to_save
and
not
config
.
config_use_google_drive
and
not
gdrive_error
:
with
open
(
gdriveutils
.
CLIENT_SECRETS
,
'r'
)
as
settings
:
...
...
@@ -1254,7 +1257,7 @@ def _configuration_result(error_flash=None, gdrive_error=None, configured=True):
gdrivefolders
=
[]
if
gdrive_error
is
None
:
gdrive_error
=
gdriveutils
.
get_error_text
()
if
gdrive_error
:
if
gdrive_error
and
gdrive_support
:
log
.
error
(
gdrive_error
)
gdrive_error
=
_
(
gdrive_error
)
else
:
...
...
cps/fb2.py
View file @
c85cfa90
...
...
@@ -29,7 +29,7 @@ def get_fb2_info(tmp_file_path, original_file_extension):
'l'
:
'http://www.w3.org/1999/xlink'
,
}
fb2_file
=
open
(
tmp_file_path
)
fb2_file
=
open
(
tmp_file_path
,
encoding
=
"utf-8"
)
tree
=
etree
.
fromstring
(
fb2_file
.
read
()
.
encode
())
authors
=
tree
.
xpath
(
'/fb:FictionBook/fb:description/fb:title-info/fb:author'
,
namespaces
=
ns
)
...
...
test/Calibre-Web TestSummary_Windows.html
View file @
c85cfa90
This diff is collapsed.
Click to expand it.
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