Merge branch 'bukzor-optimize-htmlv2-weight'

Author: davidmalcolm

libcpychecker/refcounts.py

@@ -4386,7 +4386,7 @@ def check_refcounts(fun, dump_traces=False, show_traces=False,
         filename_v2 = ('%s.%s-refcount-errors.v2.html'
                        % (gcc.get_dump_base_name(), fun.decl.name))
 
-        from libcpychecker.html.make_html import HtmlPage
+        from libcpychecker_html.make_html import HtmlPage
         data = rep.to_json(fun)
         srcfile = open(fun.start.file)
         htmlfile = open(filename_v2, 'w')

libcpychecker/html/__init__.py renamed to libcpychecker_html/__init__.py

@@ -1,6 +1,13 @@
 #!/usr/bin/env python
-"""Make our data into HTML!"""
+"""Make our data into HTML!
+These reports should be usable as email attachments, offline.
+This means we need to embed *all* our assets.
+
+We make an exception for zepto; it's (relatively) big, and the behaviors
+it adds are non-essential to reading the report.
+"""
 from __future__ import print_function
+from __future__ import unicode_literals
 
 #   Copyright 2012 Buck Golemon <buck@yelp.com>
 #
@@ -17,6 +24,8 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see
 #   <http://www.gnu.org/licenses/>.
+from os.path import realpath, dirname, join
+HERE = dirname(realpath(__file__))
 
 from . import capi
 
@@ -31,6 +40,16 @@
 from copy import deepcopy
 from itertools import islice
 
+
+def open(filename, mode='r'):
+    """All files are treated as UTF-8, unless explicitly binary."""
+    from io import open
+    if 'b' in mode:
+        return open(filename, mode)
+    else:
+        return open(filename, mode, encoding='UTF-8')
+
+
 class HtmlPage(object):
     """Represent one html page."""
     def __init__(self, codefile, data):
@@ -54,14 +73,24 @@ def head(self):
             E.TITLE('%s -- GCC Python Plugin' % self.data['filename']),
         )
         head.extend(
-            E.LINK(rel='stylesheet', href=css + '.css', type='text/css')
-            for css in ('extlib/reset-20110126', 'pygments_c', 'style')
+            E.STYLE(
+                file_contents(css + '.css'),
+                media='screen',
+                type='text/css'
+            )
+            for css in ('extlib/reset-20110126.min', 'pygments_c', 'style')
         )
+        head.append(E.SCRIPT(
+            src='http://cdnjs.cloudflare.com/ajax/libs/zepto/1.1.3/zepto.js',
+            type='text/javascript',
+        ))
         head.extend(
-            E.SCRIPT(src=js + '.js')
+            E.SCRIPT(
+                file_contents(js + '.js'),
+                type='text/javascript',
+            )
             for js in (
                 'extlib/prefixfree-1.0.4.min',
-                'extlib/jquery-1.7.1.min',
                 'script'
             )
         )
@@ -136,38 +165,26 @@ def header(self):
                 E.DIV(
                     E.ATTR(id='bug-toggle'),
                     E.IMG(
-                        src='images/bug.png',
+                        src=data_uri('image/png', 'images/bug.png'),
                     ),
                     E.H3('Bug'),
                     ' [count]',
                 ),
                 E.DIV(
                     E.ATTR(id='prev'),
                     E.IMG(
-                        src='images/arrow-180.png',
+                        src=data_uri('image/png', 'images/arrow-180.png'),
                     ),
                 ),
                 E.DIV(
                     E.ATTR(id='next'),
                     E.IMG(
-                        src='images/arrow.png',
+                        src=data_uri('image/png', 'images/arrow.png'),
                     ),
                 ),
             ),
     )
 
-    @staticmethod
-    def footer():
-        """make the footer"""
-        return E.E.footer(
-            E.ATTR(id='footer'),
-            E.P(' &nbsp;|&nbsp; '.join((
-                'Hackathon 7.0',
-                'Buck G, Alex M, Jason M',
-                'Yelp HQ 2012',
-            )))
-        )
-
     def states(self):
         """Return an ordered-list of states, for each report."""
         for report in self.data['reports']:
@@ -247,9 +264,20 @@ def body(self):
         return E.BODY(
             self.header(),
             reports,
-            self.footer(),
         )
 
+def data_uri(mimetype, filename):
+    """represent a file as a data uri"""
+    data = open(join(HERE, filename), 'rb').read()
+    data = data.encode('base64').replace('\n', '')
+    return 'data:%s;base64,%s' % (mimetype, data)
+
+def file_contents(filename):
+    """Add a leading newline to make the first line show up in the right spot.
+    """
+    return '\n' + open(join(HERE, filename)).read()
+
+
 class CodeHtmlFormatter(HtmlFormatter):
     """Format our HTML!"""
 

libcpychecker_html/extlib/jquery-1.7.1.min.js

@@ -89,10 +89,10 @@ $(function() {
                     // state commentary, highlight the dot and the comment and
                     // the row itself
                     var $group = $row.add(flow[0].$state).add($new_cell);
-                    $new_cell.add(flow[0].$state).hover(
-                        function() { $group.addClass('selected'); },
-                        function() { $group.removeClass('selected'); }
-                    );
+                    $new_cell.add(flow[0].$state).on({
+                        mouseenter: function() { $group.addClass('selected'); },
+                        mouseleave: function() { $group.removeClass('selected'); }
+                    });
 
                     flow.shift();
                 }
@@ -117,10 +117,10 @@ $(function() {
             // with that line
             if ($selectables.length) {
                 $selectables = $selectables.add($row);
-                $row.find('td:last-child').hover(
-                    function() { $selectables.addClass('selected') },
-                    function() { $selectables.removeClass('selected') }
-                );
+                $row.find('td:last-child').on({
+                    mouseenter: function() { $selectables.addClass('selected') },
+                    mouseleave: function() { $selectables.removeClass('selected') }
+                });
             }
         });
     });

libcpychecker_html/extlib/reset-20110126.css

@@ -56,14 +56,7 @@ img {
 #reports {
     box-flex: 1;
     overflow-y: auto;
-}
-#footer {
-    background: hsl(0, 0%, 30%);
-    box-shadow: inset 0 3px 3px -3px black;
-    color: white;
-    padding: 0.83em;
-    text-shadow: 0px 1px 0px black;
-    background-color: #09f;
+    overflow-x: hidden;
 }
 
 
@@ -72,7 +65,7 @@ img {
     display: box;
     box-orient: horizontal;
     width: 100%;
-    padding: 1em;
+    padding: 0.5em;
     box-sizing: border-box;
     color: white;
 }
@@ -190,6 +183,8 @@ img {
     line-height: 1.33;
     min-width: 40em;
     box-flex: 3;
+    overflow-x: auto;
+    border-right: 1px solid hsl(0, 0%, 70%);
 }
 .source > header {
     display: box;
@@ -285,9 +280,10 @@ img {
     text-align: right;
     user-select: none;
     color: hsl(0, 0%, 60%);
+    vertical-align: middle;
 }
 .source .code {
-    white-space: pre-wrap;
+    white-space: pre;
 }
 
 
@@ -394,7 +390,15 @@ td.selected .flow-dot {
     min-width: 200px;
 }
 
+.note {
+    font-weight: bolder;
+}
 .note:first-of-type::before {
-    content: url('images/exclamation.png');
+    /* content: url('images/exclamation.png');
+     * to regenerate:
+     *      from libcpychecker_html.make_html import data_uri
+     *      data_uri('image/png', 'images/exclamation.png')
+     */
+    content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAjBJREFUeNqkk0trE1EUx8/cO49OfGTSRNJMYsA0aVonoYh13YW71uJCKFQhKqibfgFLwYULsR/AhY+VG1d+C124kJiFIGipmoIZNUXtZDKTycz1njGpaRNU8MJv7txzzv/c5xEYY/A/TRQEAW5c5KwM+aKcR73/a5zvg84HT371wv07Apwuj0x+PZW/vArA4NO7x/f4+OGoIHLKAAiC/fBdHadSbCGZPTeTzC7OUElbQNvBOISMMnIqeqFSYs57mTkfZD1/qYS2f0rAZ5pVDmXnY/FSbn3jM6xvfAEtfjKnRDLz6BtK4PPPADi+ms6vGK71lti2DUintUVSJ84b6OvF7GlI4PNMPVgAZ49oxpyqRnXf+wGWZYX4ngWRiKYfPpqfw5hBjej7eweqCkSo6JOLhmd/hI7vQLVaBdM0YXt1FgK2CeJ40fCbmxUWsGc8vh3egtcFQPhyLsQnzpQJcbVmuw5mawtqtRo0Gg3wJQeY7ALIrqZEM2WM7esIPkROAgR5OZEpTTV3X4IXNEGiLnw1b4fItBNCBQuiqeQUA7qMGtSSLt8C38aVRLo47QVvVJFYoFAnJJG8FdIfI6rSVWMTx6ZRg1rS7UKeSspSMj2Wk+AbjPGZ+vTboA1JZbQcEcUl1Iq2zdZyxURBpruUMTzR38Vl79wM+9bO0/3vlwLVs+OF16/MNdFug/vi+Xadm+vDL/3uHyuR16Er4E3gKvEaOTLa/1LBuEQPF8hxfgowAINnMqTBUH7hAAAAAElFTkSuQmCC');
     padding: 5px;
 }