vendor packagers rewrite

diff --git a/librarian/cover.py b/librarian/cover.py
index 27f7a70..9070344 100644 (file)
--- a/librarian/cover.py
+++ b/librarian/cover.py
@@ -124,8 +124,8 @@ class VirtualoCover(Cover):
     height = 730
     author_top = 73
     title_top = 73
     height = 730
     author_top = 73
     title_top = 73

-    logo_bottom = 0
-    logo_width = 300
+    logo_bottom = 25
+    logo_width = 250

 
 
 class PrestigioCover(Cover):
 
 
 class PrestigioCover(Cover):


@@ -173,3 +173,14 @@ class BookotekaCover(Cover):
     title_font = ImageFont.truetype(get_resource('fonts/JunicodeWL-Regular.ttf'), 140)
 
     format = 'PNG'
     title_font = ImageFont.truetype(get_resource('fonts/JunicodeWL-Regular.ttf'), 140)
 
     format = 'PNG'

+
+
+class GandalfCover(Cover):
+    width = 600
+    height = 730
+    background_img = get_resource('res/cover-gandalf.png')
+    author_font = ImageFont.truetype(get_resource('fonts/JunicodeWL-Regular.ttf'), 30)
+    title_font = ImageFont.truetype(get_resource('fonts/JunicodeWL-Regular.ttf'), 40)
+    logo_bottom = 25
+    logo_width = 250
+    format = 'PNG'

diff --git a/librarian/packagers.py b/librarian/packagers.py
new file mode 100644 (file)
index 0000000..285a15f
--- /dev/null
+++ b/librarian/packagers.py
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
+import os
+from copy import deepcopy
+from lxml import etree
+from librarian import epub, pdf, DirDocProvider, ParseError, cover
+from librarian.dcparser import BookInfo
+
+
+class Packager(object):
+    cover = None
+    flags = None
+
+    @classmethod
+    def prepare_file(cls, main_input, output_dir, verbose=False):
+        path, fname = os.path.realpath(main_input).rsplit('/', 1)
+        provider = DirDocProvider(path)
+        slug, ext = os.path.splitext(fname)
+
+        if output_dir != '':
+            try:
+                os.makedirs(output_dir)
+            except:
+                pass
+        outfile = os.path.join(output_dir, slug + '.' + cls.ext)
+        cls.converter.transform(provider, file_path=main_input, output_file=outfile,
+                cover=cls.cover, flags=cls.flags)
+
+
+    @classmethod
+    def prepare(cls, input_filenames, output_dir='', verbose=False):
+        try:
+            for main_input in input_filenames:
+                if verbose:
+                    print main_input
+                cls.prepare_file(main_input, output_dir, verbose)
+        except ParseError, e:
+            print '%(file)s:%(name)s:%(message)s' % {
+                'file': main_input,
+                'name': e.__class__.__name__,
+                'message': e.message
+            }
+
+
+class EpubPackager(Packager):
+    converter = epub
+    ext = 'epub'
+
+class PdfPackager(Packager):
+    converter = pdf
+    ext = 'pdf'
+
+
+class GandalfEpubPackager(EpubPackager):
+    cover = cover.GandalfCover
+
+class BookotekaEpubPackager(EpubPackager):
+    cover = cover.BookotekaCover
+
+class PrestigioEpubPackager(EpubPackager):
+    cover = cover.PrestigioCover
+    flags = ('less-advertising',)
+
+class PrestigioPdfPackager(PdfPackager):
+    cover = cover.PrestigioCover
+    flags = ('less-advertising',)
+
+
+class VirtualoEpubPackager(Packager):
+    @staticmethod
+    def utf_trunc(text, limit):
+        """ truncates text to at most `limit' bytes in utf-8 """
+        if text is None:
+            return text
+        orig_text = text
+        if len(text.encode('utf-8')) > limit:
+            newlimit = limit - 3
+            while len(text.encode('utf-8')) > newlimit:
+                text = text[:(newlimit - len(text.encode('utf-8'))) / 4]
+            text += '...'
+        return text
+
+    @classmethod
+    def prepare(cls, input_filenames, output_dir='', verbose=False):
+        xml = etree.fromstring("""<?xml version="1.0" encoding="utf-8"?>
+            <products xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"></products>""")
+        product = etree.fromstring("""<product>
+                <publisherProductId></publisherProductId>
+                <title></title>
+                <info></info>
+                <description></description>
+                <authors>
+                    <author>
+                        <names>Jan</names>
+                        <lastName>Kowalski</lastName>
+                    </author>
+                </authors>
+                <price>0.0</price>
+                <language>PL</language>
+            </product>""")
+
+        try:
+            for main_input in input_filenames:
+                if verbose:
+                    print main_input
+                path, fname = os.path.realpath(main_input).rsplit('/', 1)
+                provider = DirDocProvider(path)
+                slug, ext = os.path.splitext(fname)
+
+                outfile_dir = os.path.join(output_dir, slug)
+                os.makedirs(os.path.join(output_dir, slug))
+
+                info = BookInfo.from_file(main_input)
+
+                product_elem = deepcopy(product)
+                product_elem[0].text = cls.utf_trunc(slug, 100)
+                product_elem[1].text = cls.utf_trunc(info.title, 255)
+                product_elem[2].text = cls.utf_trunc(info.description, 255)
+                product_elem[3].text = cls.utf_trunc(info.source_name, 3000)
+                product_elem[4][0][0].text = cls.utf_trunc(u' '.join(info.author.first_names), 100)
+                product_elem[4][0][1].text = cls.utf_trunc(info.author.last_name, 100)
+                xml.append(product_elem)
+
+                cover.VirtualoCover(
+                    u' '.join(info.author.first_names + (info.author.last_name,)),
+                    info.title
+                    ).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')
+                epub.transform(provider, file_path=main_input, output_file=outfile)
+                epub.transform(provider, file_path=main_input, output_file=outfile_sample, sample=25)
+        except ParseError, e:
+            print '%(file)s:%(name)s:%(message)s' % {
+                'file': main_input,
+                'name': e.__class__.__name__,
+                'message': e.message
+            }
+
+        xml_file = open(os.path.join(output_dir, 'import_products.xml'), 'w')
+        xml_file.write(etree.tostring(xml, pretty_print=True, encoding=unicode).encode('utf-8'))
+        xml_file.close()

diff --git a/librarian/res/cover-gandalf.png b/librarian/res/cover-gandalf.png
new file mode 100644 (file)
index 0000000..3c15132
Binary files /dev/null and b/librarian/res/cover-gandalf.png differ

diff --git a/librarian/res/wl-logo.png b/librarian/res/wl-logo.png
index 03b46b5..1194a1c 100644 (file)
Binary files a/librarian/res/wl-logo.png and b/librarian/res/wl-logo.png differ

diff --git a/scripts/book2partner b/scripts/book2partner
index 136fffc..b121333 100755 (executable)
--- a/scripts/book2partner
+++ b/scripts/book2partner
@@ -4,162 +4,9 @@
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Librarian, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-import os.path

 import optparse
 import optparse

-from copy import deepcopy
-from lxml import etree
-
-from librarian import epub, pdf, DirDocProvider, ParseError, cover
-from librarian.dcparser import BookInfo
-
-
-def utf_trunc(text, limit):
-    """ truncates text to at most `limit' bytes in utf-8 """
-    if text is None:
-        return text
-    orig_text = text
-    if len(text.encode('utf-8')) > limit:
-        newlimit = limit - 3
-        while len(text.encode('utf-8')) > newlimit:
-            text = text[:(newlimit - len(text.encode('utf-8'))) / 4]
-        text += '...'
-    return text
-
-
-def virtualo(filenames, output_dir, verbose):
-    xml = etree.fromstring("""<?xml version="1.0" encoding="utf-8"?>
-        <products xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"></products>""")
-    product = etree.fromstring("""<product>
-            <publisherProductId></publisherProductId>
-            <title></title>
-            <info></info>
-            <description></description>
-            <authors>
-                <author>
-                    <names>Jan</names>
-                    <lastName>Kowalski</lastName>
-                </author>
-            </authors>
-            <price>0.0</price>
-            <language>PL</language>
-        </product>""")
-
-    try:
-        for main_input in input_filenames:
-            if options.verbose:
-                print main_input
-            path, fname = os.path.realpath(main_input).rsplit('/', 1)
-            provider = DirDocProvider(path)
-            slug, ext = os.path.splitext(fname)
-
-            outfile_dir = os.path.join(output_dir, slug)
-            os.makedirs(os.path.join(output_dir, slug))
-
-            info = BookInfo.from_file(main_input)
-
-            product_elem = deepcopy(product)
-            product_elem[0].text = utf_trunc(slug, 100)
-            product_elem[1].text = utf_trunc(info.title, 255)
-            product_elem[2].text = utf_trunc(info.description, 255)
-            product_elem[3].text = utf_trunc(info.source_name, 3000)
-            product_elem[4][0][0].text = utf_trunc(u' '.join(info.author.first_names), 100)
-            product_elem[4][0][1].text = utf_trunc(info.author.last_name, 100)
-            xml.append(product_elem)
-
-            cover.VirtualoCover(
-                u' '.join(info.author.first_names + (info.author.last_name,)),
-                info.title
-                ).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')
-            epub.transform(provider, file_path=main_input, output_file=outfile)
-            epub.transform(provider, file_path=main_input, output_file=outfile_sample, sample=25)
-    except ParseError, e:
-        print '%(file)s:%(name)s:%(message)s' % {
-            'file': main_input,
-            'name': e.__class__.__name__,
-            'message': e.message
-        }
-
-    xml_file = open(os.path.join(output_dir, 'import_products.xml'), 'w')
-    xml_file.write(etree.tostring(xml, pretty_print=True, encoding=unicode).encode('utf-8'))
-    xml_file.close()
-
-
-def prestigio(filenames, output_dir, verbose):
-    try:
-        for main_input in input_filenames:
-            if options.verbose:
-                print main_input
-            path, fname = os.path.realpath(main_input).rsplit('/', 1)
-            provider = DirDocProvider(path)
-            slug, ext = os.path.splitext(fname)
-
-            if output_dir != '':
-                try:
-                    os.makedirs(output_dir)
-                except:
-                    pass
-            outfile = os.path.join(output_dir, slug + '.epub')
-            epub.transform(provider, file_path=main_input, output_file=outfile,
-                    cover=cover.PrestigioCover, flags=('less-advertising',))
-    except ParseError, e:
-        print '%(file)s:%(name)s:%(message)s' % {
-            'file': main_input,
-            'name': e.__class__.__name__,
-            'message': e.message
-        }
-
-
-def prestigio_pdf(filenames, output_dir, verbose):
-    try:
-        for main_input in input_filenames:
-            if options.verbose:
-                print main_input
-            path, fname = os.path.realpath(main_input).rsplit('/', 1)
-            provider = DirDocProvider(path)
-            slug, ext = os.path.splitext(fname)
-
-            if output_dir != '':
-                try:
-                    os.makedirs(output_dir)
-                except:
-                    pass
-            outfile = os.path.join(output_dir, slug + '.pdf')
-            pdf.transform(provider, file_path=main_input, output_file=outfile,
-                    cover=cover.PrestigioCover, verbose=options.verbose, flags=('less-advertising',))
-    except ParseError, e:
-        print '%(file)s:%(name)s:%(message)s' % {
-            'file': main_input,
-            'name': e.__class__.__name__,
-            'message': e.message
-        }
-
-
-def bookoteka(filenames, output_dir, verbose):
-    try:
-        for main_input in input_filenames:
-            if options.verbose:
-                print main_input
-            path, fname = os.path.realpath(main_input).rsplit('/', 1)
-            provider = DirDocProvider(path)
-            slug, ext = os.path.splitext(fname)
-
-            if output_dir != '':
-                try:
-                    os.makedirs(output_dir)
-                except:
-                    pass
-            outfile = os.path.join(output_dir, slug + '.epub')
-            epub.transform(provider, file_path=main_input, output_file=outfile,
-                    cover=cover.BookotekaCover)
-    except ParseError, e:
-        print '%(file)s:%(name)s:%(message)s' % {
-            'file': main_input,
-            'name': e.__class__.__name__,
-            'message': e.message
-        }

 
 

+from librarian import packagers

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':


@@ -175,6 +22,8 @@ if __name__ == '__main__':
                       help='specifies the directory for output')
     parser.add_option('--bookoteka', action='store_true', dest='bookoteka', default=False,
                       help='prepare files for Bookoteka')
                       help='specifies the directory for output')
     parser.add_option('--bookoteka', action='store_true', dest='bookoteka', default=False,
                       help='prepare files for Bookoteka')

+    parser.add_option('--gandalf', action='store_true', dest='gandalf', default=False,
+                      help='prepare files for Gandalf')

     parser.add_option('--virtualo', action='store_true', dest='virtualo', default=False,
                       help='prepare files for Virtualo API')
     parser.add_option('--prestigio', action='store_true', dest='prestigio', default=False,
     parser.add_option('--virtualo', action='store_true', dest='virtualo', default=False,
                       help='prepare files for Virtualo API')
     parser.add_option('--prestigio', action='store_true', dest='prestigio', default=False,


@@ -189,10 +38,12 @@ if __name__ == '__main__':
         exit(1)
 
     if options.bookoteka:
         exit(1)
 
     if options.bookoteka:

-        bookoteka(input_filenames, options.output_dir, options.verbose)
+        packagers.BookotekaEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)
+    if options.gandalf:
+        packagers.GandalfEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)

     if options.virtualo:
     if options.virtualo:

-        virtualo(input_filenames, options.output_dir, options.verbose)
+        packagers.VirtualoEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)

     if options.prestigio:
     if options.prestigio:

-        prestigio(input_filenames, options.output_dir, options.verbose)
+        packagers.PrestigioEpubPackager.prepare(input_filenames, options.output_dir, options.verbose)

     if options.prestigio_pdf:
     if options.prestigio_pdf:

-        prestigio_pdf(input_filenames, options.output_dir, options.verbose)
+        packagers.PrestigioPdfPackager.prepare(input_filenames, options.output_dir, options.verbose)