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
f543d7f4
Commit
f543d7f4
authored
Aug 20, 2019
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #1016
parent
7e530618
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
8 deletions
+12
-8
__init__.py
cps/__init__.py
+4
-2
about.py
cps/about.py
+1
-1
admin.py
cps/admin.py
+5
-3
__init__.py
cps/services/__init__.py
+1
-1
goodreads_support.py
cps/services/goodreads_support.py
+0
-0
web.py
cps/web.py
+1
-1
No files found.
cps/__init__.py
View file @
f543d7f4
...
...
@@ -100,8 +100,10 @@ def create_app():
if
services
.
ldap
:
services
.
ldap
.
init_app
(
app
,
config
)
if
services
.
goodreads
:
services
.
goodreads
.
connect
(
config
.
config_goodreads_api_key
,
config
.
config_goodreads_api_secret
,
config
.
config_use_goodreads
)
if
services
.
goodreads_support
:
services
.
goodreads_support
.
connect
(
config
.
config_goodreads_api_key
,
config
.
config_goodreads_api_secret
,
config
.
config_use_goodreads
)
return
app
...
...
cps/about.py
View file @
f543d7f4
...
...
@@ -63,7 +63,7 @@ _VERSIONS = OrderedDict(
pytz
=
pytz
.
__version__
,
Unidecode
=
unidecode_version
,
Flask_SimpleLDAP
=
_
(
u'installed'
)
if
bool
(
services
.
ldap
)
else
_
(
u'not installed'
),
Goodreads
=
_
(
u'installed'
)
if
bool
(
services
.
goodreads
)
else
_
(
u'not installed'
),
Goodreads
=
_
(
u'installed'
)
if
bool
(
services
.
goodreads
_support
)
else
_
(
u'not installed'
),
)
_VERSIONS
.
update
(
uploader
.
get_versions
())
...
...
cps/admin.py
View file @
f543d7f4
...
...
@@ -46,7 +46,7 @@ from .web import admin_required, render_title_template, before_request, unconfig
feature_support
=
{
'ldap'
:
False
,
# bool(services.ldap),
'goodreads'
:
bool
(
services
.
goodreads
)
'goodreads'
:
bool
(
services
.
goodreads
_support
)
}
# try:
...
...
@@ -338,8 +338,10 @@ def _configuration_update_helper():
_config_checkbox
(
"config_use_goodreads"
)
_config_string
(
"config_goodreads_api_key"
)
_config_string
(
"config_goodreads_api_secret"
)
if
services
.
goodreads
:
services
.
goodreads
.
connect
(
config
.
config_goodreads_api_key
,
config
.
config_goodreads_api_secret
,
config
.
config_use_goodreads
)
if
services
.
goodreads_support
:
services
.
goodreads_support
.
connect
(
config
.
config_goodreads_api_key
,
config
.
config_goodreads_api_secret
,
config
.
config_use_goodreads
)
_config_int
(
"config_updatechannel"
)
...
...
cps/services/__init__.py
View file @
f543d7f4
...
...
@@ -24,7 +24,7 @@ from .. import logger
log
=
logger
.
create
()
try
:
from
.
import
goodreads
try
:
from
.
import
goodreads
_support
except
ImportError
as
err
:
log
.
debug
(
"cannot import goodreads, showing authors-metadata will not work:
%
s"
,
err
)
goodreads
=
None
...
...
cps/services/goodreads.py
→
cps/services/goodreads
_support
.py
View file @
f543d7f4
File moved
cps/web.py
View file @
f543d7f4
...
...
@@ -55,7 +55,7 @@ from .redirect import redirect_back
feature_support
=
{
'ldap'
:
False
,
# bool(services.ldap),
'goodreads'
:
bool
(
services
.
goodreads
)
'goodreads'
:
bool
(
services
.
goodreads
_support
)
}
try
:
...
...
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