exclude google books, align error message with page text
parent
8ff9bfc52f
commit
6e853fc8f9
|
@ -1,4 +1,4 @@
|
||||||
{% ifequal message 0 %}This ebook is too big to be sent by email. Please download the file and then sideload it to your device using the instructions under Ereaders or Desktop.
|
{% ifequal message 0 %}This ebook is too big to be sent by email. Please download the file and then sideload it to your device using the instructions under Ereaders or PC/Mac/Linux.
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
{% ifequal message 1 %}Well, this is awkward. We can't seem to email that. Please download it using the instructions for your device, and we'll look into the error.
|
{% ifequal message 1 %}Well, this is awkward. We can't seem to email that. Please download it using the instructions for your device, and we'll look into the error.
|
||||||
{% endifequal %}
|
{% endifequal %}
|
||||||
|
|
|
@ -2414,16 +2414,20 @@ def download(request, work_id):
|
||||||
|
|
||||||
for ebook in work.ebooks().all():
|
for ebook in work.ebooks().all():
|
||||||
formats[ebook.format] = ebook
|
formats[ebook.format] = ebook
|
||||||
|
|
||||||
if formats.has_key('mobi'):
|
# google ebooks have a captcha which breaks some of our services
|
||||||
kindle_ebook_id = formats['mobi'].id
|
non_google_ebooks = work.ebooks().exclude(provider='Google Books')
|
||||||
elif formats.has_key('pdf'):
|
|
||||||
kindle_ebook_id = formats['pdf'].id
|
try:
|
||||||
else:
|
kindle_ebook_id = non_google_ebooks.filter(format='mobi')[0].id
|
||||||
kindle_ebook_id = None
|
except IndexError:
|
||||||
|
try:
|
||||||
|
kindle_ebook_id = non_google_ebooks.filter(format='pdf')[0].id
|
||||||
|
except IndexError:
|
||||||
|
kindle_ebook_id = None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
readmill_epub_ebook = work.ebooks().filter(format='epub').exclude(provider='Google Books')[0]
|
readmill_epub_ebook = non_google_ebooks.filter(format='epub')[0]
|
||||||
#readmill_epub_url = settings.BASE_URL_SECURE + reverse('download_ebook',args=[readmill_epub_ebook.id])
|
#readmill_epub_url = settings.BASE_URL_SECURE + reverse('download_ebook',args=[readmill_epub_ebook.id])
|
||||||
readmill_epub_url = readmill_epub_ebook.url
|
readmill_epub_url = readmill_epub_ebook.url
|
||||||
except:
|
except:
|
||||||
|
|
Loading…
Reference in New Issue