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
2caee358
Commit
2caee358
authored
Aug 03, 2019
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into Develop
parents
eb31b4b0
3eae2e9c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
135 additions
and
130 deletions
+135
-130
comic.py
cps/comic.py
+19
-16
logger.py
cps/logger.py
+6
-7
opds.py
cps/opds.py
+2
-1
__init__.py
cps/services/__init__.py
+4
-2
layout.html
cps/templates/layout.html
+1
-1
messages.mo
cps/translations/nl/LC_MESSAGES/messages.mo
+0
-0
messages.po
cps/translations/nl/LC_MESSAGES/messages.po
+101
-101
web.py
cps/web.py
+2
-2
No files found.
cps/comic.py
View file @
2caee358
...
@@ -41,11 +41,13 @@ def extractCover(tmp_file_name, original_file_extension):
...
@@ -41,11 +41,13 @@ def extractCover(tmp_file_name, original_file_extension):
if
use_comic_meta
:
if
use_comic_meta
:
archive
=
ComicArchive
(
tmp_file_name
)
archive
=
ComicArchive
(
tmp_file_name
)
cover_data
=
None
cover_data
=
None
ext
=
os
.
path
.
splitext
(
archive
.
getPageName
(
0
))
for
index
,
name
in
enumerate
(
archive
.
getPageNameList
()):
if
len
(
ext
)
>
1
:
ext
=
os
.
path
.
splitext
(
name
)
extension
=
ext
[
1
]
.
lower
()
if
len
(
ext
)
>
1
:
if
extension
==
'.jpg'
or
extension
==
'.jpeg'
:
extension
=
ext
[
1
]
.
lower
()
cover_data
=
archive
.
getPage
(
0
)
if
extension
==
'.jpg'
or
extension
==
'.jpeg'
:
cover_data
=
archive
.
getPage
(
index
)
break
else
:
else
:
if
original_file_extension
.
upper
()
==
'.CBZ'
:
if
original_file_extension
.
upper
()
==
'.CBZ'
:
cf
=
zipfile
.
ZipFile
(
tmp_file_name
)
cf
=
zipfile
.
ZipFile
(
tmp_file_name
)
...
@@ -53,7 +55,7 @@ def extractCover(tmp_file_name, original_file_extension):
...
@@ -53,7 +55,7 @@ def extractCover(tmp_file_name, original_file_extension):
ext
=
os
.
path
.
splitext
(
name
)
ext
=
os
.
path
.
splitext
(
name
)
if
len
(
ext
)
>
1
:
if
len
(
ext
)
>
1
:
extension
=
ext
[
1
]
.
lower
()
extension
=
ext
[
1
]
.
lower
()
if
extension
==
'.jpg'
:
if
extension
==
'.jpg'
or
extension
==
'.jpeg'
:
cover_data
=
cf
.
read
(
name
)
cover_data
=
cf
.
read
(
name
)
break
break
elif
original_file_extension
.
upper
()
==
'.CBT'
:
elif
original_file_extension
.
upper
()
==
'.CBT'
:
...
@@ -62,7 +64,7 @@ def extractCover(tmp_file_name, original_file_extension):
...
@@ -62,7 +64,7 @@ def extractCover(tmp_file_name, original_file_extension):
ext
=
os
.
path
.
splitext
(
name
)
ext
=
os
.
path
.
splitext
(
name
)
if
len
(
ext
)
>
1
:
if
len
(
ext
)
>
1
:
extension
=
ext
[
1
]
.
lower
()
extension
=
ext
[
1
]
.
lower
()
if
extension
==
'.jpg'
:
if
extension
==
'.jpg'
or
extension
==
'.jpeg'
:
cover_data
=
cf
.
extractfile
(
name
)
.
read
()
cover_data
=
cf
.
extractfile
(
name
)
.
read
()
break
break
prefix
=
os
.
path
.
dirname
(
tmp_file_name
)
prefix
=
os
.
path
.
dirname
(
tmp_file_name
)
...
@@ -87,16 +89,17 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
...
@@ -87,16 +89,17 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension):
else
:
else
:
style
=
None
style
=
None
if
style
is
not
None
:
#
if style is not None:
loadedMetadata
=
archive
.
readMetadata
(
style
)
loadedMetadata
=
archive
.
readMetadata
(
style
)
lang
=
loadedMetadata
.
language
lang
=
loadedMetadata
.
language
if
len
(
lang
)
==
2
:
if
lang
:
loadedMetadata
.
language
=
isoLanguages
.
get
(
part1
=
lang
)
.
name
if
len
(
lang
)
==
2
:
elif
len
(
lang
)
==
3
:
loadedMetadata
.
language
=
isoLanguages
.
get
(
part1
=
lang
)
.
name
loadedMetadata
.
language
=
isoLanguages
.
get
(
part3
=
lang
)
.
name
elif
len
(
lang
)
==
3
:
else
:
loadedMetadata
.
language
=
isoLanguages
.
get
(
part3
=
lang
)
.
name
loadedMetadata
.
language
=
""
else
:
loadedMetadata
.
language
=
""
return
BookMeta
(
return
BookMeta
(
file_path
=
tmp_file_path
,
file_path
=
tmp_file_path
,
...
...
cps/logger.py
View file @
2caee358
...
@@ -95,13 +95,6 @@ def setup(log_file, log_level=None):
...
@@ -95,13 +95,6 @@ def setup(log_file, log_level=None):
Configure the logging output.
Configure the logging output.
May be called multiple times.
May be called multiple times.
'''
'''
# if debugging, start logging to stderr immediately
if
os
.
environ
.
get
(
'FLASK_DEBUG'
,
None
):
log_file
=
LOG_TO_STDERR
log_level
=
logging
.
DEBUG
log_file
=
_absolute_log_file
(
log_file
,
DEFAULT_LOG_FILE
)
log_level
=
log_level
or
DEFAULT_LOG_LEVEL
log_level
=
log_level
or
DEFAULT_LOG_LEVEL
logging
.
getLogger
(
__package__
)
.
setLevel
(
log_level
)
logging
.
getLogger
(
__package__
)
.
setLevel
(
log_level
)
...
@@ -110,6 +103,8 @@ def setup(log_file, log_level=None):
...
@@ -110,6 +103,8 @@ def setup(log_file, log_level=None):
# avoid spamming the log with debug messages from libraries
# avoid spamming the log with debug messages from libraries
r
.
setLevel
(
log_level
)
r
.
setLevel
(
log_level
)
log_file
=
_absolute_log_file
(
log_file
,
DEFAULT_LOG_FILE
)
previous_handler
=
r
.
handlers
[
0
]
if
r
.
handlers
else
None
previous_handler
=
r
.
handlers
[
0
]
if
r
.
handlers
else
None
if
previous_handler
:
if
previous_handler
:
# if the log_file has not changed, don't create a new handler
# if the log_file has not changed, don't create a new handler
...
@@ -167,3 +162,7 @@ class StderrLogger(object):
...
@@ -167,3 +162,7 @@ class StderrLogger(object):
self
.
buffer
+=
message
self
.
buffer
+=
message
except
Exception
:
except
Exception
:
self
.
log
.
debug
(
"Logging Error"
)
self
.
log
.
debug
(
"Logging Error"
)
# default configuration, before application settngs are applied
setup
(
LOG_TO_STDERR
,
logging
.
DEBUG
if
os
.
environ
.
get
(
'FLASK_DEBUG'
)
else
DEFAULT_LOG_LEVEL
)
cps/opds.py
View file @
2caee358
...
@@ -56,6 +56,7 @@ def requires_basic_auth_if_no_ano(f):
...
@@ -56,6 +56,7 @@ def requires_basic_auth_if_no_ano(f):
@
opds
.
route
(
"/opds/"
)
@
opds
.
route
(
"/opds/"
)
@
opds
.
route
(
"/opds"
)
@
requires_basic_auth_if_no_ano
@
requires_basic_auth_if_no_ano
def
feed_index
():
def
feed_index
():
return
render_xml_template
(
'index.xml'
)
return
render_xml_template
(
'index.xml'
)
...
@@ -288,7 +289,7 @@ def check_auth(username, password):
...
@@ -288,7 +289,7 @@ def check_auth(username, password):
username
=
username
.
encode
(
'windows-1252'
)
username
=
username
.
encode
(
'windows-1252'
)
user
=
ub
.
session
.
query
(
ub
.
User
)
.
filter
(
func
.
lower
(
ub
.
User
.
nickname
)
==
user
=
ub
.
session
.
query
(
ub
.
User
)
.
filter
(
func
.
lower
(
ub
.
User
.
nickname
)
==
username
.
decode
(
'utf-8'
)
.
lower
())
.
first
()
username
.
decode
(
'utf-8'
)
.
lower
())
.
first
()
return
bool
(
user
and
check_password_hash
(
user
.
password
,
password
))
return
bool
(
user
and
check_password_hash
(
str
(
user
.
password
)
,
password
))
def
authenticate
():
def
authenticate
():
...
...
cps/services/__init__.py
View file @
2caee358
...
@@ -26,11 +26,13 @@ log = logger.create()
...
@@ -26,11 +26,13 @@ log = logger.create()
try
:
from
.
import
goodreads
try
:
from
.
import
goodreads
except
ImportError
as
err
:
except
ImportError
as
err
:
log
.
warning
(
"goodreads
:
%
s"
,
err
)
log
.
debug
(
"cannot import goodreads, showing authors-metadata will not work
:
%
s"
,
err
)
goodreads
=
None
goodreads
=
None
try
:
from
.
import
simpleldap
as
ldap
try
:
from
.
import
simpleldap
as
ldap
except
ImportError
as
err
:
except
ImportError
as
err
:
log
.
warning
(
"simpleldap
:
%
s"
,
err
)
log
.
debug
(
"cannot import simpleldap, logging in with ldap will not work
:
%
s"
,
err
)
ldap
=
None
ldap
=
None
cps/templates/layout.html
View file @
2caee358
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
<div
class=
"navbar-collapse collapse"
>
<div
class=
"navbar-collapse collapse"
>
{% if g.user.is_authenticated or g.allow_anonymous %}
{% if g.user.is_authenticated or g.allow_anonymous %}
<ul
class=
"nav navbar-nav "
>
<ul
class=
"nav navbar-nav "
>
<li><a
href=
"{{url_for('web.advanced_search')}}"
><span
class=
"glyphicon glyphicon-search"
></span><span
class=
"hidden-sm"
>
{{_('Advanced Search')}}
</span></a></li>
<li><a
href=
"{{url_for('web.advanced_search')}}"
><span
class=
"glyphicon glyphicon-search"
></span><span
class=
"hidden-sm"
>
{{_('Advanced Search')}}
</span></a></li>
</ul>
</ul>
{% endif %}
{% endif %}
<ul
class=
"nav navbar-nav navbar-right"
id=
"main-nav"
>
<ul
class=
"nav navbar-nav navbar-right"
id=
"main-nav"
>
...
...
cps/translations/nl/LC_MESSAGES/messages.mo
View file @
2caee358
No preview for this file type
cps/translations/nl/LC_MESSAGES/messages.po
View file @
2caee358
This diff is collapsed.
Click to expand it.
cps/web.py
View file @
2caee358
...
@@ -133,7 +133,7 @@ def load_user_from_header(header_val):
...
@@ -133,7 +133,7 @@ def load_user_from_header(header_val):
except
TypeError
:
except
TypeError
:
pass
pass
user
=
ub
.
session
.
query
(
ub
.
User
)
.
filter
(
func
.
lower
(
ub
.
User
.
nickname
)
==
basic_username
.
lower
())
.
first
()
user
=
ub
.
session
.
query
(
ub
.
User
)
.
filter
(
func
.
lower
(
ub
.
User
.
nickname
)
==
basic_username
.
lower
())
.
first
()
if
user
and
check_password_hash
(
user
.
password
,
basic_password
):
if
user
and
check_password_hash
(
str
(
user
.
password
)
,
basic_password
):
return
user
return
user
return
return
...
@@ -1115,7 +1115,7 @@ def login():
...
@@ -1115,7 +1115,7 @@ def login():
log
.
info
(
'LDAP Login failed for user "
%
s" IP-adress:
%
s'
,
form
[
'username'
],
ipAdress
)
log
.
info
(
'LDAP Login failed for user "
%
s" IP-adress:
%
s'
,
form
[
'username'
],
ipAdress
)
flash
(
_
(
u"Wrong Username or Password"
),
category
=
"error"
)
flash
(
_
(
u"Wrong Username or Password"
),
category
=
"error"
)
else
:
else
:
if
user
and
check_password_hash
(
user
.
password
,
form
[
'password'
])
and
user
.
nickname
!=
"Guest"
:
if
user
and
check_password_hash
(
str
(
user
.
password
)
,
form
[
'password'
])
and
user
.
nickname
!=
"Guest"
:
login_user
(
user
,
remember
=
True
)
login_user
(
user
,
remember
=
True
)
flash
(
_
(
u"You are now logged in as: '
%(nickname)
s'"
,
nickname
=
user
.
nickname
),
category
=
"success"
)
flash
(
_
(
u"You are now logged in as: '
%(nickname)
s'"
,
nickname
=
user
.
nickname
),
category
=
"success"
)
return
redirect_back
(
url_for
(
"web.index"
))
return
redirect_back
(
url_for
(
"web.index"
))
...
...
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