From: Radek Czajka Date: Fri, 2 Mar 2012 13:00:12 +0000 (+0100) Subject: Merge branch 'master' into ofop X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/941b8e6effd4c0ffff52fa7e548d866f8454dddb?hp=-c Merge branch 'master' into ofop --- 941b8e6effd4c0ffff52fa7e548d866f8454dddb diff --combined librarian/cover.py index e7a8e1b,e58be4a..c345a50 --- a/librarian/cover.py +++ b/librarian/cover.py @@@ -34,29 -34,22 +34,29 @@@ class TextBox(object) self.height += height def text(self, text, color='#000', font=None, line_height=20, - shadow_color=None): + shadow_color=None, shortener=None): """Writes some centered text.""" if shadow_color: if not self.shadow_img: self.shadow_img = Image.new('RGBA', self.img.size) self.shadow_draw = ImageDraw.Draw(self.shadow_img) while text: - line = text - line_width = self.draw.textsize(line, font=font)[0] - while line_width > self.max_text_width: - parts = line.rsplit(' ', 1) - if len(parts) == 1: - line_width = self.max_text_width - break - line = parts[0] + if shortener: + for line in shortener(text): + if text_draw.textsize(line, font=font)[0] <= self.max_text_width: + break + text = '' + else: + line = text line_width = self.draw.textsize(line, font=font)[0] + while line_width > self.max_text_width: + parts = line.rsplit(' ', 1) + if len(parts) == 1: + line_width = self.max_text_width + break + line = parts[0] + line_width = self.draw.textsize(line, font=font)[0] + line = line.strip() + ' ' pos_x = (self.max_width - line_width) / 2 @@@ -72,30 -65,6 +72,30 @@@ # go to next line text = text[len(line):] + @staticmethod + def person_shortener(text): + yield text + chunks = text.split() + n_chunks = len(chunks) + # make initials from given names, starting from last + for i in range(n_chunks - 2, -1, -1): + chunks[i] = chunks[i][0] + '.' + yield " ".join(chunks) + # remove given names initials, starting from last + while len(chunks) > 2: + del chunks[1] + yield " ".join(chunks) + + @staticmethod + def title_shortener(text): + yield text + chunks = text.split() + n_chunks = len(chunks) + # remove words, starting from last one + while len(chunks) > 1: + del chunks[-1] + yield " ".join(chunks) + u'…' + def image(self): """Creates the actual Image object.""" image = Image.new('RGBA', (self.max_width, @@@ -116,7 -85,6 +116,7 @@@ class Cover(object) background_color = '#fff' background_img = None + author_align = 'c' author_top = 100 author_margin_left = 20 author_margin_right = 20 @@@ -124,9 -92,7 +124,9 @@@ author_color = '#000' author_shadow = None author_font = None + author_wrap = True + title_align = 'c' title_top = 100 title_margin_left = 20 title_margin_right = 20 @@@ -134,7 -100,6 +134,7 @@@ title_color = '#000' title_shadow = None title_font = None + title_wrap = True logo_bottom = None logo_width = None @@@ -169,10 -134,7 +169,10 @@@ if self.background_img: background = Image.open(self.background_img) - img.paste(background, None, background) + try: + img.paste(background, None, background) + except ValueError, e: + img.paste(background) del background # WL logo @@@ -188,9 -150,8 +188,9 @@@ ) author_font = self.author_font or ImageFont.truetype( get_resource('fonts/DejaVuSerif.ttf'), 30) + author_shortener = None if self.author_wrap else TextBox.person_shortener tbox.text(self.pretty_author(), self.author_color, author_font, - self.author_lineskip, self.author_shadow) + self.author_lineskip, self.author_shadow, author_shortener) text_img = tbox.image() img.paste(text_img, (self.author_margin_left, top), text_img) @@@ -201,9 -162,8 +201,9 @@@ ) title_font = self.author_font or ImageFont.truetype( get_resource('fonts/DejaVuSerif.ttf'), 40) + title_shortener = None if self.title_wrap else TextBox.title_shortener tbox.text(self.pretty_title(), self.title_color, title_font, - self.title_lineskip, self.title_shadow) + self.title_lineskip, self.title_shadow, title_shortener) text_img = tbox.image() img.paste(text_img, (self.title_margin_left, top), text_img) @@@ -232,6 -192,8 +232,8 @@@ class WLCover(Cover) bar_width = 35 background_color = '#444' author_color = '#444' + default_background = get_resource('res/cover.png') + format = 'JPEG' epochs = { u'Starożytność': 0, @@@ -257,6 -219,8 +259,8 @@@ bg_src = urlopen(book_info.cover_url) self.background_img = StringIO(bg_src.read()) bg_src.close() + else: + self.background_img = self.default_background def pretty_author(self): return self.author.upper() @@@ -404,42 -368,3 +408,42 @@@ class GandalfCover(Cover) logo_bottom = 25 logo_width = 250 format = 'PNG' + + +class ArtaTechCover(Cover): + width = 600 + height = 800 + background_img = get_resource('res/cover-arta-tech.jpg') + author_top = 132 + author_margin_left = 235 + author_margin_right = 23 + author_align = 'r' + author_font = ImageFont.truetype(get_resource('fonts/DroidSans.ttf'), 32) + author_color = '#555555' + author_wrap = False + title_top = 17 + title_margin_right = 21 + title_margin_left = 60 + title_align = 'r' + title_font = ImageFont.truetype(get_resource('fonts/EBGaramond-Regular.ttf'), 42) + title_color = '#222222' + title_wrap = False + format = 'JPEG' + + def pretty_author(self): + return self.author.upper() + + +def ImageCover(img): + """ a class factory for simple image covers """ + img = Image.open(img) + + class ImgCover(Cover): + def image(self): + return img + + @property + def format(self): + return self.image().format + + return ImgCover diff --combined librarian/packagers.py index 9a93e56,ddfd7c8..cc9902b --- a/librarian/packagers.py +++ b/librarian/packagers.py @@@ -63,12 -63,6 +63,12 @@@ class GandalfEpubPackager(EpubPackager) class GandalfPdfPackager(PdfPackager): cover = cover.GandalfCover +class ArtaTechEpubPackager(EpubPackager): + cover = cover.ArtaTechCover + +class ArtaTechPdfPackager(PdfPackager): + cover = cover.ArtaTechCover + class BookotekaEpubPackager(EpubPackager): cover = cover.BookotekaCover @@@ -81,7 -75,7 +81,7 @@@ class PrestigioPdfPackager(PdfPackager) flags = ('less-advertising',) - class VirtualoEpubPackager(Packager): + class VirtualoPackager(Packager): @staticmethod def utf_trunc(text, limit): """ truncates text to at most `limit' bytes in utf-8 """ @@@ -139,9 -133,16 +139,16 @@@ cover.VirtualoCover(info).save(os.path.join(outfile_dir, slug+'.jpg')) outfile = os.path.join(outfile_dir, '1.epub') outfile_sample = os.path.join(outfile_dir, '1.sample.epub') - doc.save_output_file(epub.transform(doc), + doc.save_output_file(doc.as_epub(), output_path=outfile) - doc.save_output_file(epub.transform(doc, sample=25), + doc.save_output_file(doc.as_epub(doc, sample=25), + output_path=outfile_sample) + outfile = os.path.join(outfile_dir, '1.mobi') + outfile_sample = os.path.join(outfile_dir, '1.sample.mobi') + doc.save_output_file(doc.as_mobi(cover=cover.VirtualoCover), + output_path=outfile) + doc.save_output_file( + doc.as_mobi(doc, cover=cover.VirtualoCover, sample=25), output_path=outfile_sample) except ParseError, e: print '%(file)s:%(name)s:%(message)s' % { diff --combined librarian/xslt/book2html.xslt index 441f641,81e865b..f81f981 --- a/librarian/xslt/book2html.xslt +++ b/librarian/xslt/book2html.xslt @@@ -10,12 -10,13 +10,13 @@@ xmlns:dc="http://purl.org/dc/elements/1.1/" > + - Książka z serwisu WolneLektury.pl + <xsl:apply-templates mode="inline" select="//nazwa_utworu" />