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
d82289e3
Commit
d82289e3
authored
Jul 14, 2019
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deactivate ldap
Fix setup for pypi
parent
8bfcdffe
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
13 deletions
+13
-13
admin.py
cps/admin.py
+1
-1
constants.py
cps/constants.py
+1
-1
gdriveutils.py
cps/gdriveutils.py
+3
-5
web.py
cps/web.py
+1
-1
setup.cfg
setup.cfg
+5
-5
setup.py
setup.py
+2
-0
No files found.
cps/admin.py
View file @
d82289e3
...
@@ -49,7 +49,7 @@ from .gdriveutils import is_gdrive_ready, gdrive_support
...
@@ -49,7 +49,7 @@ from .gdriveutils import is_gdrive_ready, gdrive_support
from
.web
import
admin_required
,
render_title_template
,
before_request
,
unconfigured
,
login_required_if_no_ano
from
.web
import
admin_required
,
render_title_template
,
before_request
,
unconfigured
,
login_required_if_no_ano
feature_support
=
{
feature_support
=
{
'ldap'
:
bool
(
services
.
ldap
),
'ldap'
:
False
,
#
bool(services.ldap),
'goodreads'
:
bool
(
services
.
goodreads
)
'goodreads'
:
bool
(
services
.
goodreads
)
}
}
...
...
cps/constants.py
View file @
d82289e3
...
@@ -125,7 +125,7 @@ def selected_roles(dictionary):
...
@@ -125,7 +125,7 @@ def selected_roles(dictionary):
BookMeta
=
namedtuple
(
'BookMeta'
,
'file_path, extension, title, author, cover, description, tags, series, '
BookMeta
=
namedtuple
(
'BookMeta'
,
'file_path, extension, title, author, cover, description, tags, series, '
'series_id, languages'
)
'series_id, languages'
)
STABLE_VERSION
=
{
'version'
:
'0.6.
4
Beta'
}
STABLE_VERSION
=
{
'version'
:
'0.6.
5
Beta'
}
NIGHTLY_VERSION
=
{}
NIGHTLY_VERSION
=
{}
NIGHTLY_VERSION
[
0
]
=
'$Format:
%
H$'
NIGHTLY_VERSION
[
0
]
=
'$Format:
%
H$'
...
...
cps/gdriveutils.py
View file @
d82289e3
...
@@ -34,11 +34,9 @@ try:
...
@@ -34,11 +34,9 @@ try:
from
pydrive.drive
import
GoogleDrive
from
pydrive.drive
import
GoogleDrive
from
pydrive.auth
import
RefreshError
from
pydrive.auth
import
RefreshError
from
apiclient
import
errors
from
apiclient
import
errors
feature_support
[
'gdrive'
]
=
True
gdrive_support
=
True
# gdrive_support = True
except
ImportError
:
except
ImportError
:
feature_support
[
'gdrive'
]
=
True
gdrive_support
=
False
#gdrive_support = False
from
.
import
logger
,
cli
,
config
from
.
import
logger
,
cli
,
config
from
.constants
import
CONFIG_DIR
as
_CONFIG_DIR
from
.constants
import
CONFIG_DIR
as
_CONFIG_DIR
...
@@ -576,7 +574,7 @@ def update_settings(client_id, client_secret, redirect_uri):
...
@@ -576,7 +574,7 @@ def update_settings(client_id, client_secret, redirect_uri):
def
get_error_text
(
client_secrets
=
None
):
def
get_error_text
(
client_secrets
=
None
):
if
not
feature_support
[
'gdrive'
]
:
if
not
gdrive_support
:
return
'Import of optional Google Drive requirements missing'
return
'Import of optional Google Drive requirements missing'
if
not
os
.
path
.
isfile
(
CLIENT_SECRETS
):
if
not
os
.
path
.
isfile
(
CLIENT_SECRETS
):
...
...
cps/web.py
View file @
d82289e3
...
@@ -52,7 +52,7 @@ from .pagination import Pagination
...
@@ -52,7 +52,7 @@ from .pagination import Pagination
from
.redirect
import
redirect_back
from
.redirect
import
redirect_back
feature_support
=
{
feature_support
=
{
'ldap'
:
bool
(
services
.
ldap
),
'ldap'
:
False
,
#
bool(services.ldap),
'goodreads'
:
bool
(
services
.
goodreads
)
'goodreads'
:
bool
(
services
.
goodreads
)
}
}
...
...
setup.cfg
View file @
d82289e3
...
@@ -31,14 +31,13 @@ keywords =
...
@@ -31,14 +31,13 @@ keywords =
calibre
calibre
calibre-web
calibre-web
library
library
python_requires = >=2.6
[options.entry_points]
[options.entry_points]
console_scripts =
console_scripts =
cps = calibreweb:main
cps = calibreweb:main
[options]
[options]
python_requires = >=2.6
include_package_data = True
include_package_data = True
zip_safe = False
install_requires =
install_requires =
Babel >= 1.3
Babel >= 1.3
Flask-Babel >= 0.11.1
Flask-Babel >= 0.11.1
...
@@ -80,7 +79,8 @@ metadata =
...
@@ -80,7 +79,8 @@ metadata =
Wand >= 0.4.4
Wand >= 0.4.4
comics=
comics=
natsort>=2.2.0
natsort>=2.2.0
# https://github.com/wildthyme/comicapi/archive/cb279168f9c5cec742b5a05ac8326b9c168a8a91.zip#egg=comicapi
# find solution for this should belong to comics
# comicapi @ git+https://github.com/wildthyme/comicapi.git@cb279168f9c5cec742b5a05ac8326b9c168a8a91#egg=comicapi
# comicapi @ git+https://github.com/decentral1se/comicapi.git@packaging-fix/remove-python-requires#egg=comicapi
# find solution for this
setup.py
View file @
d82289e3
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
# """Calibre-web distribution package setuptools installer."""
# """Calibre-web distribution package setuptools installer."""
from
setuptools
import
setup
from
setuptools
import
setup
from
setuptools
import
find_packages
import
os
import
os
import
re
import
re
import
codecs
import
codecs
...
@@ -39,6 +40,7 @@ def find_version(*file_paths):
...
@@ -39,6 +40,7 @@ def find_version(*file_paths):
raise
RuntimeError
(
"Unable to find version string."
)
raise
RuntimeError
(
"Unable to find version string."
)
setup
(
setup
(
packages
=
find_packages
(
"src"
),
package_dir
=
{
''
:
'src'
},
package_dir
=
{
''
:
'src'
},
version
=
find_version
(
"src"
,
"calibreweb"
,
"cps"
,
"constants.py"
)
version
=
find_version
(
"src"
,
"calibreweb"
,
"cps"
,
"constants.py"
)
)
)
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