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
55fcf23d
Commit
55fcf23d
authored
Oct 31, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'sec_fixes/negate' into master
parents
1b0b4c4c
d2617322
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
33 deletions
+31
-33
gdrive.py
cps/gdrive.py
+31
-33
No files found.
cps/gdrive.py
View file @
55fcf23d
...
@@ -123,18 +123,17 @@ def revoke_watch_gdrive():
...
@@ -123,18 +123,17 @@ def revoke_watch_gdrive():
@
gdrive
.
route
(
"/gdrive/watch/callback"
,
methods
=
[
'GET'
,
'POST'
])
@
gdrive
.
route
(
"/gdrive/watch/callback"
,
methods
=
[
'GET'
,
'POST'
])
def
on_received_watch_confirmation
():
def
on_received_watch_confirmation
():
log
.
debug
(
'
%
r'
,
request
.
headers
)
if
request
.
headers
.
get
(
'X-Goog-Channel-Token'
)
!=
gdrive_watch_callback_token
\
if
request
.
headers
.
get
(
'X-Goog-Channel-Token'
)
==
gdrive_watch_callback_token
\
or
request
.
headers
.
get
(
'X-Goog-Resource-State'
)
!=
'change'
\
and
request
.
headers
.
get
(
'X-Goog-Resource-State'
)
==
'change'
\
or
not
request
.
data
:
and
request
.
data
:
return
redirect
(
url_for
(
'admin.configuration'
))
data
=
request
.
data
def
updateMetaData
():
log
.
debug
(
'
%
r'
,
request
.
headers
)
log
.
debug
(
'
%
r'
,
request
.
data
)
log
.
info
(
'Change received from gdrive'
)
log
.
info
(
'Change received from gdrive'
)
log
.
debug
(
'
%
r'
,
data
)
try
:
try
:
j
=
json
.
loads
(
data
)
j
=
json
.
loads
(
request
.
data
)
log
.
info
(
'Getting change details'
)
log
.
info
(
'Getting change details'
)
response
=
gdriveutils
.
getChangeById
(
gdriveutils
.
Gdrive
.
Instance
()
.
drive
,
j
[
'id'
])
response
=
gdriveutils
.
getChangeById
(
gdriveutils
.
Gdrive
.
Instance
()
.
drive
,
j
[
'id'
])
log
.
debug
(
'
%
r'
,
response
)
log
.
debug
(
'
%
r'
,
response
)
...
@@ -156,5 +155,4 @@ def on_received_watch_confirmation():
...
@@ -156,5 +155,4 @@ def on_received_watch_confirmation():
calibre_db
.
reconnect_db
(
config
,
ub
.
app_DB_path
)
calibre_db
.
reconnect_db
(
config
,
ub
.
app_DB_path
)
except
Exception
as
e
:
except
Exception
as
e
:
log
.
exception
(
e
)
log
.
exception
(
e
)
updateMetaData
()
return
''
return
''
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