From 28434b06a11051554ec070e86196e7e89fbd738b Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 5 Sep 2014 16:35:57 -0400 Subject: [PATCH] now do the same for epubs --- core/epub.py | 10 +- core/models.py | 36 ++++++-- frontend/templates/epub/ask.xhtml | 149 ++++++++++++++++++++++++++++++ frontend/templates/pdf/ask.html | 4 +- 4 files changed, 189 insertions(+), 10 deletions(-) create mode 100644 frontend/templates/epub/ask.xhtml diff --git a/core/epub.py b/core/epub.py index 52cd3ad4..27dc44ce 100644 --- a/core/epub.py +++ b/core/epub.py @@ -16,7 +16,15 @@ def personalize(epub_file, acq): output.writetodisk(personalized_epub) #logger.info("personalized") return personalized_epub - + +def ask_epub(epub_file, context): + output = EPUB(epub_file, "a") + part = StringIO(unicode(render_to_string('epub/ask.xhtml', context))) + output.addpart(part, "ask.xhtml", "application/xhtml+xml", 1) #after title, we hope + asking_epub= StringIO() + output.writetodisk(asking_epub) + return asking_epub + def ungluify(epub_file, campaign): output = EPUB(epub_file, "a") diff --git a/core/models.py b/core/models.py index f61ce326..574ff907 100755 --- a/core/models.py +++ b/core/models.py @@ -35,7 +35,7 @@ regluit imports import regluit import regluit.core.isbn import regluit.core.cc as cc -from regluit.core.epub import personalize, ungluify, test_epub +from regluit.core.epub import personalize, ungluify, test_epub, ask_epub from regluit.core.pdf import ask_pdf, pdf_append from regluit.core.signals import ( @@ -904,11 +904,11 @@ class Campaign(models.Model): def add_ask_to_ebfs(self, position=0): if not self.use_add_ask or self.type != THANKS : return - for ebf in self.work.ebookfiles().filter(asking = False): - if ebf.format=='pdf': + done_formats= [] + for ebf in self.work.ebookfiles().filter(asking = False).order_by('-created'): + if ebf.format=='pdf' and 'pdf' not in done_formats: try: added = ask_pdf({'campaign':self, 'work':self.work, 'site':Site.objects.get_current()}) - new_ebf = EbookFile.objects.create(edition=self.work.preferred_edition, format='pdf', asking=True) new_file = SpooledTemporaryFile() old_file = SpooledTemporaryFile() ebf.file.open() @@ -917,17 +917,37 @@ class Campaign(models.Model): pdf_append(added, old_file, new_file) else: pdf_append(old_file, added, new_file) - pdf_append(added, old_file, new_file) new_file.seek(0) + new_ebf = EbookFile.objects.create(edition=ebf.edition, format='pdf', asking=True) new_ebf.file.save(path_for_file(ebf,None),ContentFile(new_file.read())) new_ebf.save() - for old_ebf in self.work.ebookfiles().filter(asking = True).exclude(pk=new_ebf.pk): + for old_ebf in self.work.ebookfiles().filter(asking = True, format='pdf').exclude(pk=new_ebf.pk): obsolete = Ebook.objects.filter(url=old_ebf.file.url) for eb in obsolete: eb.deactivate() old_ebf.delete() + done_formats.append('pdf') except Exception as e: logger.error("error appending pdf ask %s" % (e)) + elif ebf.format=='epub' and 'epub' not in done_formats: + try: + new_file = SpooledTemporaryFile() + old_file = SpooledTemporaryFile() + ebf.file.open() + old_file.write(ebf.file.read()) + new_file= ask_epub(old_file, {'campaign':self, 'work':self.work, 'site':Site.objects.get_current()}) + new_file.seek(0) + new_ebf = EbookFile.objects.create(edition=ebf.edition, format='epub', asking=True) + new_ebf.file.save(path_for_file(ebf,None),ContentFile(new_file.read())) + new_ebf.save() + for old_ebf in self.work.ebookfiles().filter(asking = True, format='epub').exclude(pk=new_ebf.pk): + obsolete = Ebook.objects.filter(url=old_ebf.file.url) + for eb in obsolete: + eb.deactivate() + old_ebf.delete() + done_formats.append('epub') + except Exception as e: + logger.error("error making epub ask %s" % (e)) self.work.make_ebooks_from_ebfs() @@ -1207,7 +1227,6 @@ class Work(models.Model): return Ebook.objects.filter(edition__work=self,active=True).order_by('-created') def ebookfiles(self): - # filter out non-epub because that's what booxtream accepts return EbookFile.objects.filter(edition__work=self).exclude(file='').order_by('-created') def epubfiles(self): @@ -1249,6 +1268,9 @@ class Work(models.Model): eb.deactivate() else: done_formats.append(eb.format) + null_files=EbookFile.objects.filter(edition__work=self, file='') + for ebf in null_files: + ebf.delete() @property def download_count(self): diff --git a/frontend/templates/epub/ask.xhtml b/frontend/templates/epub/ask.xhtml new file mode 100644 index 00000000..08aa9b30 --- /dev/null +++ b/frontend/templates/epub/ask.xhtml @@ -0,0 +1,149 @@ + + + + + unglue.it +— Thank the Creators of {{ work.title }} + + + + + + +
+ + +
+
+ {{ work.last_campaign.description|safe }} + + +
+ {% if campaign.ask_money %} +
+

You can use Unglue.it to help to thank the creators for making {{ work.title }} free. The amount is up to you.

+ Click here to thank the creators

+
+ {% endif %} +
+ + + + + + +
+ + + + + + + diff --git a/frontend/templates/pdf/ask.html b/frontend/templates/pdf/ask.html index 2ddecdad..f1a496f0 100644 --- a/frontend/templates/pdf/ask.html +++ b/frontend/templates/pdf/ask.html @@ -137,14 +137,14 @@ a.nounderline{text-decoration:none}
-
+
{{ work.last_campaign.description|safe }}
{% if campaign.ask_money %}
-

You can use Unglue.it to help to thank the creators for making this book free. The amount is up to you.

+

You can use Unglue.it to help to thank the creators for making {{ work.title }} free. The amount is up to you.

Click here to thank the creators

{% endif %}