EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #491 from Gluejar/handle_bad_ebook_links 

handle the bad link error  (Se test run locally -- so at the very least, this PR should not be destabilizing...will deploy and then test on some links.)
pull/1/head
Raymond Yee 2015-06-03 07:24:03 -07:00
parent a167c5ad08 6ec36e001d
commit 90df82954e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/templates/kindle_response_message.html
View File

@ -6,3 +6,5 @@
{% endifequal %}
{% ifequal message 3 %}Please <a href="{% url 'kindle_config' %}">enter</a> a valid Kindle email.
{% endifequal %}
{% ifequal message 4 %}Well, this is awkward: our ebook link is bad. We'll look into the error.
{% endifequal %}

16
frontend/views.py
View File

@ -3269,11 +3269,15 @@ def send_to_kindle(request, work_id, javascript='0'):
"""
filehandle = urllib.urlopen(ebook_url)
if not filesize:
filesize = int(filehandle.info().getheaders("Content-Length")[0])
if ebook:
ebook.filesize = filesize if filesize < 2147483647 else 2147483647 # largest safe positive integer
ebook.save()
try:
filesize = int(filehandle.info().getheaders("Content-Length")[0])
if ebook:
ebook.filesize = filesize if filesize < 2147483647 else 2147483647 # largest safe positive integer
ebook.save()
except IndexError:
# response has no Content-Length header probably a bad link
logger.error('Bad link error: %s', ebook_url)
return local_response(request, javascript, context, 4)
if filesize > models.send_to_kindle_limit:
logger.info('ebook %s is too large to be emailed' % work.id)
return local_response(request, javascript, context, 0)
@ -3284,7 +3288,7 @@ def send_to_kindle(request, work_id, javascript='0'):
email.attach(title + '.' + ebook_format, filehandle.read())
email.send()
except:
logger.warning('Unexpected error: %s', sys.exc_info())
logger.error('Unexpected error: %s', sys.exc_info())
return local_response(request, javascript, context, 1)
if request.POST.has_key('kindle_email') and not request.user.is_authenticated():