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
4d6299f0
Commit
4d6299f0
authored
Jul 29, 2018
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved gdrive error messages (#554)
parent
6a76dce8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
gdriveutils.py
cps/gdriveutils.py
+5
-2
web.py
cps/web.py
+4
-3
No files found.
cps/gdriveutils.py
View file @
4d6299f0
try
:
from
pydrive.auth
import
GoogleAuth
from
pydrive.drive
import
GoogleDrive
from
pydrive.auth
import
RefreshError
from
apiclient
import
errors
except
ImportError
:
pass
...
...
@@ -132,8 +133,10 @@ def getDrive(drive=None, gauth=None):
# Refresh them if expired
try
:
gauth
.
Refresh
()
except
:
web
.
app
.
logger
.
error
(
"Google Drive gdrive_credentials file not present, reauthenticate in config section"
)
except
RefreshError
as
e
:
web
.
app
.
logger
.
error
(
"Google Drive error: "
+
e
.
message
)
except
Exception
as
e
:
web
.
app
.
logger
.
exception
(
e
)
else
:
# Initialize the saved creds
gauth
.
Authorize
()
...
...
cps/web.py
View file @
4d6299f0
...
...
@@ -1800,7 +1800,8 @@ def get_cover(cover_path):
app
.
logger
.
error
(
cover_path
+
'/cover.jpg not found on Google Drive'
)
return
send_from_directory
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
"static"
),
"generic_cover.jpg"
)
except
Exception
as
e
:
app
.
logger
.
error
(
"Message "
+
e
.
message
)
app
.
logger
.
error
(
"Error Message: "
+
e
.
message
)
app
.
logger
.
exception
(
e
)
# traceback.print_exc()
return
send_from_directory
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
"static"
),
"generic_cover.jpg"
)
else
:
...
...
@@ -2721,7 +2722,7 @@ def configuration_helper(origin):
config
.
loadSettings
()
app
.
logger
.
setLevel
(
config
.
config_log_level
)
logging
.
getLogger
(
"book_formats"
)
.
setLevel
(
config
.
config_log_level
)
except
e
:
except
Exception
as
e
:
flash
(
e
,
category
=
"error"
)
return
render_title_template
(
"config_edit.html"
,
content
=
config
,
origin
=
origin
,
gdrive
=
gdrive_support
,
gdriveError
=
gdriveError
,
goodreads
=
goodreads_support
,
...
...
@@ -2846,7 +2847,7 @@ def edit_mailsettings():
try
:
ub
.
session
.
commit
()
flash
(
_
(
u"Mail settings updated"
),
category
=
"success"
)
except
e
:
except
Exception
as
e
:
flash
(
e
,
category
=
"error"
)
if
"test"
in
to_save
and
to_save
[
"test"
]:
if
current_user
.
kindle_mail
:
...
...
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