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
130a4ed2
Commit
130a4ed2
authored
Mar 21, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix opds and error logging in mail
parent
59ebc1af
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
opds.py
cps/opds.py
+1
-1
mail.py
cps/tasks/mail.py
+2
-1
feed.xml
cps/templates/feed.xml
+4
-4
index.xml
cps/templates/index.xml
+1
-0
No files found.
cps/opds.py
View file @
130a4ed2
...
...
@@ -94,7 +94,7 @@ def feed_cc_search(query):
@
opds
.
route
(
"/opds/search"
,
methods
=
[
"GET"
])
@
requires_basic_auth_if_no_ano
def
feed_normal_search
():
return
feed_search
(
request
.
args
.
get
(
"query"
)
.
strip
())
return
feed_search
(
request
.
args
.
get
(
"query"
,
""
)
.
strip
())
@
opds
.
route
(
"/opds/new"
)
...
...
cps/tasks/mail.py
View file @
130a4ed2
...
...
@@ -172,6 +172,7 @@ class TaskEmail(CalibreTask):
log
.
debug_or_exception
(
e
)
self
.
_handleError
(
u'MemoryError sending email: '
+
str
(
e
))
except
(
smtplib
.
SMTPException
,
smtplib
.
SMTPAuthenticationError
)
as
e
:
log
.
debug_or_exception
(
e
)
if
hasattr
(
e
,
"smtp_error"
):
text
=
e
.
smtp_error
.
decode
(
'utf-8'
)
.
replace
(
"
\n
"
,
'. '
)
elif
hasattr
(
e
,
"message"
):
...
...
@@ -179,10 +180,10 @@ class TaskEmail(CalibreTask):
elif
hasattr
(
e
,
"args"
):
text
=
'
\n
'
.
join
(
e
.
args
)
else
:
log
.
debug_or_exception
(
e
)
text
=
''
self
.
_handleError
(
u'Smtplib Error sending email: '
+
text
)
except
(
socket
.
error
)
as
e
:
log
.
debug_or_exception
(
e
)
self
.
_handleError
(
u'Socket Error sending email: '
+
e
.
strerror
)
...
...
cps/templates/feed.xml
View file @
130a4ed2
...
...
@@ -11,18 +11,18 @@
<link
rel=
"up"
href=
"{{url_for('opds.feed_index')}}"
type=
"application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"
/>
{% if pagination.has_prev %}
{% if pagination
and pagination
.has_prev %}
<link
rel=
"first"
href=
"{{request.script_root + request.path}}"
type=
"application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"
/>
{% endif %}
{% if pagination.has_next %}
{% if pagination
and pagination
.has_next %}
<link
rel=
"next"
title=
"{{_('Next')}}"
href=
"{{ request.script_root + request.path }}?offset={{ pagination.next_offset }}"
type=
"application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"
/>
{% endif %}
{% if pagination.has_prev %}
{% if pagination
and pagination
.has_prev %}
<link
rel=
"previous"
href=
"{{request.script_root + request.path}}?offset={{ pagination.previous_offset }}"
type=
"application/atom+xml;profile=opds-catalog;type=feed;kind=navigation"
/>
...
...
@@ -30,7 +30,7 @@
<link
rel=
"search"
href=
"{{url_for('opds.feed_osd')}}"
type=
"application/opensearchdescription+xml"
/>
<
!--link title="{{_('Search')}}" type="application/atom+xml" href="{{url_for('opds.feed_normal_search')}}?query={searchTerms}" rel="search"/--
>
<
link
type=
"application/atom+xml"
rel=
"search"
title=
"{{_('Search')}}"
href=
"{{url_for('opds.feed_cc_search')}}/{searchTerms}"
/
>
<title>
{{instance}}
</title>
<author>
<name>
{{instance}}
</name>
...
...
cps/templates/index.xml
View file @
130a4ed2
...
...
@@ -8,6 +8,7 @@
<link
rel=
"search"
href=
"{{url_for('opds.feed_osd')}}"
type=
"application/opensearchdescription+xml"
/>
<link
type=
"application/atom+xml"
rel=
"search"
title=
"{{_('Search')}}"
href=
"{{url_for('opds.feed_cc_search')}}/{searchTerms}"
/>
<title>
{{instance}}
</title>
<author>
<name>
{{instance}}
</name>
...
...
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