Ticket #3481: wiki_to_pdf_clean_and_fix.patch

docs/cover/cover.html

@@ -53 +53 @@
-</P>
-<P CLASS="western" ALIGN=JUSTIFY STYLE="margin-bottom: 0cm"><IMG SRC="/path/to/cover/logo.png" NAME="figura2" ALIGN=RIGHT BORDER=0 width="230px" height="72px"><BR CLEAR=LEFT><BR>
-</P>
-AO
-A
+ION
+E
-<P CLASS="western" ALIGN=JUSTIFY STYLE="margin-bottom: 0cm"><BR><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-<P CLASS="western" ALIGN=JUSTIFY STYLE="margin-bottom: 0cm"><BR>
-</P>

setup.py

@@ -7 +7 @@
-
-setup(
-    name = 'TracWikiToPdfPlugin',
-0
+1
-    packages = ['wikitopdf'],
-    package_data={ 'wikitopdf' : [ 'templates/*.cs', 'htdocs/js/*.js' ] },     
-    author = "Diorgenes Felipe Grzesiuk",

wikitopdf/formats.py

@@ -21 +21 @@
-import urllib2
-import base64
-
-
+
+
-
-EXCLUDE_RES = [
-    re.compile(r'\[\[PageOutline([^]]*)\]\]'),
@@ -36 +37 @@
-        
-    def wikitopdf_formats(self, req):
-        yield 'pdf', 'PDF'
-#        yield 'ps', 'PS'
-        
-    def process_wikitopdf(self, req, format, title, subject, pages, version, date, pdfname):
-
-        os.system("rm -f /tmp/tmp*wikitopdf")
-
-       
-       
+        
+        
-        
-        #Setup the title and license pages
-        title_template = self.env.config.get('wikitopdf', 'titlefile')
-self.get_titlepage(title_template, title, subject, date, version)
+title_template and self.get_titlepage(title_template, title, subject, date, version) or None
-        
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
+
-
-        htmldoc_args = { 'book': None, 'format': htmldoc_format, 'titlefile': titlefile, 'charset': codepage }
-
-        htmldoc_args.update(dict(self.env.config.options('wikitopdf-admin')))
-
-        args_string = ' '.join(['--%s %s' % (arg, value or '') for arg, value
-                                        in htmldoc_args.iteritems()])
-
-        cmd_string = 'htmldoc %s %s -f %s'%(args_string, ' '.join(files), pfilename)
-
-        self.log.info('WikiToPdf: Running %r', cmd_string)
-        os.system(cmd_string.encode('latin-1'))
-           
-        out = open(pfilename, 'rb').read()
-            
-        # Clean up
-
-
-
+
+
-              
-        # Send the output
-        req.send_response(200)
-        req.send_header('Content-Type', {'pdf':'application/pdf', 'ps':'application/postscript'}[format])
-
+#
-        req.send_header('Content-Length', len(out))
-        req.end_headers()
-        req.write(out)
-
+
+
-
-, text=None
+
-        """Slight modification of some code from Alec's PageToPdf plugin."""
-
-
-
-
+
+
+
-        base_dir = self.env.config.get('wikitopdf', 'base_dir')
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-        os.close(hfile)
-        return hfilename
-
+
+
-    def get_titlepage(self, template_path, title, subject, version, date):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

wikitopdf/web_ui.py

@@ -32 +32 @@
-        
-    def get_htdocs_dirs(self):
-        from pkg_resources import resource_filename
-       
+        
-        #return []
-
-    # IAdminPanelsProvider methods
@@ -45 +45 @@
-        return handler
-
-    def post_process_request(self, req, template, data, content_type):
-       
+        
-
-    def process_admin_request(self, req, cat, page, path_info):
-        allpages = list(WikiSystem(self.env).get_pages())
@@ -62 +62 @@
-        if req.method == 'POST':
-            rightpages = req.args.get('rightpages_all')
-            title = req.args.get('title').encode('latin-1') or self.env.project_name.encode('latin-1')
-       
+        
-            date = req.args.get('date').encode('latin-1');
-            version = req.args.get('version').encode('latin-1');
-       
-       
+        
+        
-            rightpages = rightpages.split(',')
-            format = req.args.get('format')
-
@@ -85 +85 @@
-        req.hdf['wikitopdf.formats'] = formats
-        req.hdf['wikitopdf.default_format'] = formats.iterkeys().next()
-
-       
+        
-
-        return 'admin_wikitopdf.cs', None
-

wikitopdf/wikitopdf.py

@@ -12 +12 @@
-import re
-
-EXCLUDE_RES = [
-       
-       
-       
+    
+    
+    
-]
+
+
+def wiki_to_pdf(text, env, req, base_dir, codepage):
+    
+    #Remove exclude expressions
+    for r in EXCLUDE_RES:
+        text = r.sub('', text)
+    
+    env.log.debug('WikiToPdf => Wiki intput for WikiToPdf: %r' % text)
+
+    page = wiki_to_html(text, env, req).encode(codepage, 'replace')
+    
+    page = page.replace('attachment', 'attachments')
+    page = page.replace('?format=raw','')
+    page = page.replace('<pre class="wiki">', '<table align="center" width="95%" border="1" bordercolor="#d7d7d7">'
+        + '<tr><td bgcolor="#f7f7f7"><pre class="wiki">')
+    page = page.replace('</pre>', '</pre></td></tr></table>')
+    page = page.replace('<table class="wiki">', '<table class="wiki" border="1" width="100%">')
+
+    imgpos = page.find('<img')
+
+    while imgpos != -1:
+        addrpos = page.find('src=',imgpos)
+        page = page[:addrpos+5] + base_dir + page[addrpos+5:]
+        imgpos = page.find('<img', addrpos)
+    
+    meta = ('<meta http-equiv="Content-Type" content="text/html; charset=%s"/>' % codepage).encode(codepage)
+
+    page = '<html><head>' + meta + '</head><body>' + page + '</body></html>'
+    
+    env.log.debug('WikiToPdf => HTML output for WikiToPdf in charset %s is: %r' % (codepage, page))
+    
+    return page
+
+def html_to_pdf(env, htmldoc_args, files):
+    os.environ["HTMLDOC_NOCGI"] = 'yes'
+    
+    args_string = ' '.join(['--%s %s' % (arg, value or '') for arg, value
+        in htmldoc_args.iteritems() if value != None])
+    
+    pfile, pfilename = mkstemp('wikitopdf')
+    os.close(pfile)
+    
+    cmd_string = 'htmldoc %s -f %s %s' % (args_string, pfilename, ' '.join(files))
+    env.log.debug('WikiToPdf => Htmldoc command line: %s' % cmd_string)
+    os.system(cmd_string)
+    
+    infile = open(pfilename, 'rb')
+    out = infile.read()
+    infile.close()
+    
+    os.unlink(pfilename)
+    
+    return out
+
+
-
-class WikiToPdfPage(Component):
-    """Convert Wiki pages to PDF using HTMLDOC (http://www.htmldoc.org/)."""
-    implements(IContentConverter)
-
+
+
-    # IContentConverter methods
-    def get_supported_conversions(self):
-
+
-
-    def convert_content(self, req, input_type, text, output_type):
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        os.close(hfile)
-
-
-
+
+
+
+
+
-
-        os.environ["HTMLDOC_NOCGI"] = 'yes'
-        htmldoc_args = { 'webpage': None, 'format': 'pdf14', 'charset': codepage }
-
-        htmldoc_args.update(dict(self.env.config.options('wikitopdf-page')))
-
-        args_string = ' '.join(['--%s %s' % (arg, value or '') for arg, value
-                                in htmldoc_args.iteritems()])
-
-        self.env.log.debug('WikiToPdf => Htmldoc code out: %s' % args_string)
-
-        os.system('htmldoc %s %s -f %s' % (args_string, hfilename, pfilename))
-
-        out = open(pfilename, 'rb').read()
-        os.unlink(pfilename)
-        os.unlink(hfilename)
-        return (out, 'application/pdf')