improve compress without external plugin

libretube-theme/templates/article.html

@@ -263,8 +263,6 @@
     <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/modules/plyr/plyr.min.js"
             integrity="sha512-OuNuHhTUuTAbvDItUy1JPT/L9bBLBK71KDEgEiCUyzyZtVCKMALXfkyi5lQV30FoadAZoSlLoHxXeXQUGxoduw=="
             crossorigin="anonymous"></script>
-    <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/play.js"
+    <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/play.js"></script>
-            integrity="sha512-OTfMWEmqrlXA9I5xteZxMa4a1DXs+ocTB5E+9S3TF0asQFqsDltZ8q3AxoMPXLJSW5Bk6ysA/16bIwME7w8CnA=="
-            crossorigin="anonymous"></script>
     <!-- /Plyr -->
 {% endblock %}

libretube-theme/templates/base.html

@@ -11,10 +11,10 @@
             {% block extra_head %}
             {% endblock %}
             <!-- Bootstrap 4.3.1 -->
-            <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/bootstrap/bootstrap.min.css" rel="stylesheet"
+            <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/bootstrap/bootstrap.css" rel="stylesheet"
                   integrity="sha384-63+VK53+oFYHzIqG3ljBEZ1Pr9+l0uKU+6UK4YsgNZtVkXQQtsvr0TRcBxncV0gG"/>
             <!-- Main style -->
-            <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/styles.min.css" rel="stylesheet"/>
+            <link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/styles.css" rel="stylesheet"/>
             <!-- favicon -->
             <link rel="icon" type="image/png" sizes="192x192" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/favicon/favicon-192x192.png"/>
             <link rel="icon" type="image/png" sizes="96x96" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/favicon/favicon-96x96.png"/>

plugins/compressor/README.md

@@ -1,17 +1,10 @@
 ## Descripción
 
 Es un complemento para Pelican que minifica los archivos CSS y
-JavaScript usando css-html-js-minify. Preserva los archivos JavaScript
+JavaScript. Reemplaza los archivos JS y CSS por los archivos
-originales y añade a los archivos JavaScript minificados la cadena
+minificados al momento de la compilación del sitio web.
-`.min` antes de la extensión `.js`.
 
 ## Instalación
 
-Para que funcione es necesario instalar python y pip. Después instala
+Añade `compressor` a `pelicanconf.py`: `PLUGINS =
-css-html-js-minify con la siguiente instrucción:
-```
-pip install css-html-js-minify
-```
-
-Finalmente, añade `compressor` a `pelicanconf.py`: `PLUGINS =
 ['compressor']`.

plugins/compressor/compressor.py

@@ -1,44 +1,39 @@
 # -*- coding: utf-8 -*-
+"""
+css-js-minify wrapper for Pelican
+"""
+
+import glob
+import os
+import sys
+
+from .minify import (
+    process_single_css_file,
+    process_single_js_file,
+)
 
 from pelican import signals
-from subprocess import call
-import logging
-import os
 
-logger = logging.getLogger(__name__)
+CSS_DIR = '/theme/css'
-
+JS_DIR = '/theme/js'
-# Display command output on DEBUG and TRACE
-SHOW_OUTPUT = logger.getEffectiveLevel() <= logging.DEBUG
-PATH_CSS = 'output/theme/css/'
-PATH_JS = 'output/theme/js/'
-
-"""
-Minify CSS and JS files in output path
-with css-html-js-minify.
-"""
-
-
-def minify(pelican):
-    """
-      Minify CSS and JavaScript
-      :param pelican: The Pelican instance
-    """
-    for dirpathcss, _, filenames in os.walk(PATH_CSS):
-        for name in filenames:
-            if os.path.splitext(name)[1] in '.css':
-                filepath = os.path.join(dirpathcss, name)
-                logger.info('minifiy %s with css-html-js-minify', filepath)
-                call('css-html-js-minify {}'.format(filepath),
-                     shell=True)
-
-    for dirpathjs, _, filenames in os.walk(PATH_JS):
-        for name in filenames:
-            if os.path.splitext(name)[1] in '.js':
-                filepath = os.path.join(dirpathjs, name)
-                logger.info('minifiy %s with css-html-js-minify', filepath)
-                call("css-html-js-minify {}".format(filepath),
-                     shell=True)
 
+def main(pelican):
+    """ Compiler """
+    for file in glob.iglob(pelican.output_path + CSS_DIR + '/**/*.css', recursive=True):
+        process_single_css_file(file, overwrite=True)
+    for file in glob.iglob(pelican.output_path + JS_DIR + '/**/*.js', recursive=True):
+        process_single_js_file(file, overwrite=True)
 
 def register():
-    signals.finalized.connect(minify)
+    """ Register """
+    signals.finalized.connect(main)
+
+SUPPORT_JS = """
+-----------------------------------------------------------------
+COMPRESSOR:
+-----------------------------------------------------------------
+Future JavaScript support is orphan and not supported!
+If you want to make ES6,ES7 work feel free to send pull requests.
+-----------------------------------------------------------------
+"""
+print(SUPPORT_JS)

plugins/compressor/css_minifer.py

@@ -0,0 +1,316 @@
+# -*- coding: utf-8 -*-
+
+"""CSS Minifier functions for CSS-HTML-JS-Minify."""
+
+import re
+import itertools
+
+from .variables import EXTENDED_NAMED_COLORS, CSS_PROPS_TEXT
+
+
+__all__ = ('css_minify', 'condense_semicolons')
+
+
+def _compile_props(props_text, grouped=False):
+    """Take a list of props and prepare them."""
+    props, prefixes = [], "-webkit-,-khtml-,-epub-,-moz-,-ms-,-o-,".split(",")
+    for propline in props_text.strip().lower().splitlines():
+        props += [pre + pro for pro in propline.split(" ") for pre in prefixes]
+    props = filter(lambda line: not line.startswith('#'), props)
+    if not grouped:
+        props = list(filter(None, props))
+        return props, [0]*len(props)
+    final_props, groups, g_id = [], [], 0
+    for prop in props:
+        if prop.strip():
+            final_props.append(prop)
+            groups.append(g_id)
+        else:
+            g_id += 1
+    return final_props, groups
+
+
+def _prioritify(line_of_css, css_props_text_as_list):
+    """Return args priority, priority is integer and smaller means higher."""
+    sorted_css_properties, groups_by_alphabetic_order = css_props_text_as_list
+    priority_integer, group_integer = 9999, 0
+    for css_property in sorted_css_properties:
+        if css_property.lower() == line_of_css.split(":")[0].lower().strip():
+            priority_integer = sorted_css_properties.index(css_property)
+            group_integer = groups_by_alphabetic_order[priority_integer]
+            break
+    return priority_integer, group_integer
+
+
+def _props_grouper(props, pgs):
+    """Return groups for properties."""
+    if not props:
+        return props
+    # props = sorted([
+        # _ if _.strip().endswith(";")
+        # and not _.strip().endswith("*/") and not _.strip().endswith("/*")
+        # else _.rstrip() + ";\n" for _ in props])
+    props_pg = zip(map(lambda prop: _prioritify(prop, pgs), props), props)
+    props_pg = sorted(props_pg, key=lambda item: item[0][1])
+    props_by_groups = map(
+        lambda item: list(item[1]),
+        itertools.groupby(props_pg, key=lambda item: item[0][1]))
+    props_by_groups = map(lambda item: sorted(
+        item, key=lambda item: item[0][0]), props_by_groups)
+    props = []
+    for group in props_by_groups:
+        group = map(lambda item: item[1], group)
+        props += group
+        props += ['\n']
+    props.pop()
+    return props
+
+
+def sort_properties(css_unsorted_string):
+    """CSS Property Sorter Function.
+
+    This function will read buffer argument, split it to a list by lines,
+    sort it by defined rule, and return sorted buffer if it's CSS property.
+    This function depends on '_prioritify' function.
+    """
+    css_pgs = _compile_props(CSS_PROPS_TEXT, grouped=False)  # Do Not Group.
+    pattern = re.compile(r'(.*?{\r?\n?)(.*?)(}.*?)|(.*)',
+                         re.DOTALL + re.MULTILINE)
+    matched_patterns = pattern.findall(css_unsorted_string)
+    sorted_patterns, sorted_buffer = [], css_unsorted_string
+    re_prop = re.compile(r'((?:.*?)(?:;)(?:.*?\n)|(?:.*))',
+                         re.DOTALL + re.MULTILINE)
+    if len(matched_patterns) != 0:
+        for matched_groups in matched_patterns:
+            sorted_patterns += matched_groups[0].splitlines(True)
+            props = map(lambda line: line.lstrip('\n'),
+                        re_prop.findall(matched_groups[1]))
+            props = list(filter(lambda line: line.strip('\n '), props))
+            props = _props_grouper(props, css_pgs)
+            sorted_patterns += props
+            sorted_patterns += matched_groups[2].splitlines(True)
+            sorted_patterns += matched_groups[3].splitlines(True)
+        sorted_buffer = ''.join(sorted_patterns)
+    return sorted_buffer
+
+
+def remove_comments(css):
+    """Remove all CSS comment blocks."""
+    iemac, preserve = False, False
+    comment_start = css.find("/*")
+    while comment_start >= 0:  # Preserve comments that look like `/*!...*/`.
+        # Slicing is used to make sure we dont get an IndexError.
+        preserve = css[comment_start + 2:comment_start + 3] == "!"
+        comment_end = css.find("*/", comment_start + 2)
+        if comment_end < 0:
+            if not preserve:
+                css = css[:comment_start]
+                break
+        elif comment_end >= (comment_start + 2):
+            if css[comment_end - 1] == "\\":
+                # This is an IE Mac-specific comment; leave this one and the
+                # following one alone.
+                comment_start = comment_end + 2
+                iemac = True
+            elif iemac:
+                comment_start = comment_end + 2
+                iemac = False
+            elif not preserve:
+                css = css[:comment_start] + css[comment_end + 2:]
+            else:
+                comment_start = comment_end + 2
+        comment_start = css.find("/*", comment_start)
+    return css
+
+
+def remove_unnecessary_whitespace(css):
+    """Remove unnecessary whitespace characters."""
+
+    def pseudoclasscolon(css):
+        """Prevent 'p :link' from becoming 'p:link'.
+
+        Translates 'p :link' into 'p ___PSEUDOCLASSCOLON___link'.
+        This is translated back again later.
+        """
+        regex = re.compile(r"(^|\})(([^\{\:])+\:)+([^\{]*\{)")
+        match = regex.search(css)
+        while match:
+            css = ''.join([
+                css[:match.start()],
+                match.group().replace(":", "___PSEUDOCLASSCOLON___"),
+                css[match.end():]])
+            match = regex.search(css)
+        return css
+
+    css = pseudoclasscolon(css)
+    # Remove spaces from before things.
+    css = re.sub(r"\s+([!{};:>\(\)\],])", r"\1", css)
+    # If there is a `@charset`, then only allow one, and move to beginning.
+    css = re.sub(r"^(.*)(@charset \"[^\"]*\";)", r"\2\1", css)
+    css = re.sub(r"^(\s*@charset [^;]+;\s*)+", r"\1", css)
+    # Put the space back in for a few cases, such as `@media screen` and
+    # `(-webkit-min-device-pixel-ratio:0)`.
+    css = re.sub(r"\band\(", "and (", css)
+    # Put the colons back.
+    css = css.replace('___PSEUDOCLASSCOLON___', ':')
+    # Remove spaces from after things.
+    css = re.sub(r"([!{}:;>\(\[,])\s+", r"\1", css)
+    return css
+
+
+def remove_unnecessary_semicolons(css):
+    """Remove unnecessary semicolons."""
+    return re.sub(r";+\}", "}", css)
+
+
+def remove_empty_rules(css):
+    """Remove empty rules."""
+    return re.sub(r"[^\}\{]+\{\}", "", css)
+
+
+def normalize_rgb_colors_to_hex(css):
+    """Convert `rgb(51,102,153)` to `#336699`."""
+    regex = re.compile(r"rgb\s*\(\s*([0-9,\s]+)\s*\)")
+    match = regex.search(css)
+    while match:
+        colors = map(lambda s: s.strip(), match.group(1).split(","))
+        hexcolor = '#%.2x%.2x%.2x' % tuple(map(int, colors))
+        css = css.replace(match.group(), hexcolor)
+        match = regex.search(css)
+    return css
+
+
+def condense_zero_units(css):
+    """Replace `0(px, em, %, etc)` with `0`."""
+    return re.sub(r"([\s:])(0)(px|em|%|in|q|ch|cm|mm|pc|pt|ex|rem|s|ms|"
+                  r"deg|grad|rad|turn|vw|vh|vmin|vmax|fr)", r"\1\2", css)
+
+
+def condense_multidimensional_zeros(css):
+    """Replace `:0 0 0 0;`, `:0 0 0;` etc. with `:0;`."""
+    return css.replace(":0 0 0 0;", ":0;").replace(
+        ":0 0 0;", ":0;").replace(":0 0;", ":0;").replace(
+            "background-position:0;", "background-position:0 0;").replace(
+                "transform-origin:0;", "transform-origin:0 0;")
+
+
+def condense_floating_points(css):
+    """Replace `0.6` with `.6` where possible."""
+    return re.sub(r"(:|\s)0+\.(\d+)", r"\1.\2", css)
+
+
+def condense_hex_colors(css):
+    """Shorten colors from #AABBCC to #ABC where possible."""
+    regex = re.compile(
+        r"""([^\"'=\s])(\s*)#([0-9a-f])([0-9a-f])([0-9a-f])"""
+        r"""([0-9a-f])([0-9a-f])([0-9a-f])""", re.I | re.S)
+    match = regex.search(css)
+    while match:
+        first = match.group(3) + match.group(5) + match.group(7)
+        second = match.group(4) + match.group(6) + match.group(8)
+        if first.lower() == second.lower():
+            css = css.replace(
+                match.group(), match.group(1) + match.group(2) + '#' + first)
+            match = regex.search(css, match.end() - 3)
+        else:
+            match = regex.search(css, match.end())
+    return css
+
+
+def condense_whitespace(css):
+    """Condense multiple adjacent whitespace characters into one."""
+    return re.sub(r"\s+", " ", css)
+
+
+def condense_semicolons(css):
+    """Condense multiple adjacent semicolon characters into one."""
+    return re.sub(r";;+", ";", css)
+
+
+def wrap_css_lines(css, line_length=80):
+    """Wrap the lines of the given CSS to an approximate length."""
+    lines, line_start = [], 0
+    for i, char in enumerate(css):
+        # Its safe to break after } characters.
+        if char == '}' and (i - line_start >= line_length):
+            lines.append(css[line_start:i + 1])
+            line_start = i + 1
+    if line_start < len(css):
+        lines.append(css[line_start:])
+    return '\n'.join(lines)
+
+
+def condense_font_weight(css):
+    """Condense multiple font weights into shorter integer equals."""
+    return css.replace('font-weight:normal;', 'font-weight:400;').replace(
+        'font-weight:bold;', 'font-weight:700;')
+
+
+def condense_std_named_colors(css):
+    """Condense named color values to shorter replacement using HEX."""
+    for color_name, color_hexa in iter(tuple({
+        ':aqua;': ':#0ff;', ':blue;': ':#00f;',
+            ':fuchsia;': ':#f0f;', ':yellow;': ':#ff0;'}.items())):
+        css = css.replace(color_name, color_hexa)
+    return css
+
+
+def condense_xtra_named_colors(css):
+    """Condense named color values to shorter replacement using HEX."""
+    for k, v in iter(tuple(EXTENDED_NAMED_COLORS.items())):
+        same_color_but_rgb = 'rgb({0},{1},{2})'.format(v[0], v[1], v[2])
+        if len(k) > len(same_color_but_rgb):
+            css = css.replace(k, same_color_but_rgb)
+    return css
+
+
+def remove_url_quotes(css):
+    """Fix for url() does not need quotes."""
+    return re.sub(r'url\((["\'])([^)]*)\1\)', r'url(\2)', css)
+
+
+def condense_border_none(css):
+    """Condense border:none; to border:0;."""
+    return css.replace("border:none;", "border:0;")
+
+
+def add_encoding(css):
+    """Add @charset 'UTF-8'; if missing."""
+    return '@charset "utf-8";' + css if "@charset" not in css.lower() else css
+
+
+def restore_needed_space(css):
+    """Fix CSS for some specific cases where a white space is needed."""
+    return css.replace("!important", " !important").replace(  # !important
+        "@media(", "@media (").replace(  # media queries # jpeg > jpg
+            "data:image/jpeg;base64,", "data:image/jpg;base64,").rstrip("\n;")
+
+
+def unquote_selectors(css):
+    """Fix CSS for some specific selectors where Quotes is not needed."""
+    return re.compile('([a-zA-Z]+)="([a-zA-Z0-9-_\.]+)"]').sub(r'\1=\2]', css)
+
+
+def css_minify(css, wrap=False, comments=False, sort=False, noprefix=False):
+    """Minify CSS main function."""
+    css = remove_comments(css) if not comments else css
+    css = sort_properties(css) if sort else css
+    css = unquote_selectors(css)
+    css = condense_whitespace(css)
+    css = remove_url_quotes(css)
+    css = condense_xtra_named_colors(css)
+    css = condense_font_weight(css)
+    css = remove_unnecessary_whitespace(css)
+    css = condense_std_named_colors(css)
+    css = remove_unnecessary_semicolons(css)
+    css = condense_zero_units(css)
+    css = condense_multidimensional_zeros(css)
+    css = condense_floating_points(css)
+    css = normalize_rgb_colors_to_hex(css)
+    css = condense_hex_colors(css)
+    css = condense_border_none(css)
+    css = wrap_css_lines(css, 80) if wrap else css
+    css = condense_semicolons(css)
+    css = add_encoding(css) if not noprefix else css
+    css = restore_needed_space(css)
+    return css.strip()

plugins/compressor/js_minifer.py

@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+
+"""JavaScript Minifier functions for CSS-JS-Minify."""
+
+import re
+from io import StringIO  # pure-Python StringIO supports unicode.
+from .css_minifer import condense_semicolons
+
+__all__ = ('js_minify', )
+
+
+def remove_commented_lines(js):
+    """Force remove commented out lines from Javascript."""
+    result = ""
+    for line in js.splitlines():
+        line = re.sub(r"/\*.*\*/", "", line) # (/*COMMENT */)
+        line = re.sub(r"//.*", "", line) # (//COMMENT)
+        result += '\n'+line
+    return result
+
+
+def simple_replacer_js(js):
+    """Force strip simple replacements from Javascript."""
+    return condense_semicolons(js.replace("debugger;", ";").replace(
+        ";}", "}").replace("; ", ";").replace(" ;", ";").rstrip("\n;"))
+
+
+def js_minify_keep_comments(js):
+    """Return a minified version of the Javascript string."""
+    ins, outs = StringIO(js), StringIO()
+    JavascriptMinify(ins, outs).minify()
+    return force_single_line_js(outs.getvalue())
+
+
+def force_single_line_js(js):
+    """Force Javascript to a single line, even if need to add semicolon."""
+    return ";".join(js.splitlines()) if len(js.splitlines()) > 1 else js
+
+
+class JavascriptMinify(object):
+
+    """Minify an input stream of Javascript, writing to an output stream."""
+
+    def __init__(self, instream=None, outstream=None):
+        """Init class."""
+        self.ins, self.outs = instream, outstream
+
+    def minify(self, instream=None, outstream=None):
+        """Minify Javascript using StringIO."""
+        if instream and outstream:
+            self.ins, self.outs = instream, outstream
+        write, read = self.outs.write, self.ins.read
+        space_strings = ("abcdefghijklmnopqrstuvwxyz"
+                         "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$\\")
+        starters, enders = '{[(+-', '}])+-"\''
+        newlinestart_strings = starters + space_strings
+        newlineend_strings = enders + space_strings
+        do_newline, do_space = False, False
+        doing_single_comment, doing_multi_comment = False, False
+        previous_before_comment, in_quote = '', ''
+        in_re, quote_buf = False, []
+        previous = read(1)
+        next1 = read(1)
+        if previous == '/':
+            if next1 == '/':
+                doing_single_comment = True
+            elif next1 == '*':
+                doing_multi_comment = True
+            else:
+                write(previous)
+        elif not previous:
+            return
+        elif previous >= '!':
+            if previous in "'\"":
+                in_quote = previous
+            write(previous)
+            previous_non_space = previous
+        else:
+            previous_non_space = ' '
+        if not next1:
+            return
+        while True:
+            next2 = read(1)
+            if not next2:
+                last = next1.strip()
+                conditional_1 = (doing_single_comment or doing_multi_comment)
+                if not conditional_1 and last not in ('', '/'):
+                    write(last)
+                break
+            if doing_multi_comment:
+                if next1 == '*' and next2 == '/':
+                    doing_multi_comment = False
+                    next2 = read(1)
+            elif doing_single_comment:
+                if next1 in '\r\n':
+                    doing_single_comment = False
+                    while next2 in '\r\n':
+                        next2 = read(1)
+                        if not next2:
+                            break
+                    if previous_before_comment in ')}]':
+                        do_newline = True
+                    elif previous_before_comment in space_strings:
+                        write('\n')
+            elif in_quote:
+                quote_buf.append(next1)
+
+                if next1 == in_quote:
+                    numslashes = 0
+                    for c in reversed(quote_buf[:-1]):
+                        if c != '\\':
+                            break
+                        else:
+                            numslashes += 1
+                    if numslashes % 2 == 0:
+                        in_quote = ''
+                        write(''.join(quote_buf))
+            elif next1 in '\r\n':
+                conditional_2 = previous_non_space in newlineend_strings
+                if conditional_2 or previous_non_space > '~':
+                    while 1:
+                        if next2 < '!':
+                            next2 = read(1)
+                            if not next2:
+                                break
+                        else:
+                            conditional_3 = next2 in newlinestart_strings
+                            if conditional_3 or next2 > '~' or next2 == '/':
+                                do_newline = True
+                            break
+            elif next1 < '!' and not in_re:
+                conditional_4 = next2 in space_strings or next2 > '~'
+                conditional_5 = previous_non_space in space_strings
+                conditional_6 = previous_non_space > '~'
+                if (conditional_5 or conditional_6) and (conditional_4):
+                    do_space = True
+            elif next1 == '/':
+                if in_re:
+                    if previous != '\\':
+                        in_re = False
+                    write('/')
+                elif next2 == '/':
+                    doing_single_comment = True
+                    previous_before_comment = previous_non_space
+                elif next2 == '*':
+                    doing_multi_comment = True
+                else:
+                    in_re = previous_non_space in '(,=:[?!&|'
+                    write('/')
+            else:
+                if do_space:
+                    do_space = False
+                    write(' ')
+                if do_newline:
+                    write('\n')
+                    do_newline = False
+                write(next1)
+                if not in_re and next1 in "'\"":
+                    in_quote = next1
+                    quote_buf = []
+            previous = next1
+            next1 = next2
+            if previous >= '!':
+                previous_non_space = previous
+
+
+def js_minify(js):
+    """Minify a JavaScript string."""
+    js = remove_commented_lines(js)
+    js = js_minify_keep_comments(js)
+    return js.strip()

plugins/compressor/minify.py

@@ -0,0 +1,260 @@
+# -*- coding: utf-8 -*-
+
+"""CSS-JS-Minify.
+
+Minifier for the Web.
+"""
+
+import os
+import sys
+import gzip
+# import logging as log
+
+from argparse import ArgumentParser
+from datetime import datetime
+from functools import partial
+from hashlib import sha1
+from multiprocessing import Pool, cpu_count
+from subprocess import getoutput
+from time import sleep
+
+from .css_minifer import css_minify
+from .js_minifer import js_minify
+
+
+__all__ = ('process_multiple_files', 'prefixer_extensioner',
+           'process_single_css_file', 'process_single_js_file',
+           'make_arguments_parser', 'main')
+
+color = {
+    'cyan' : '\033[1;36m',
+    'end' : '\033[0m',
+    'green' : '\033[1;32m'
+}
+
+def process_multiple_files(file_path, watch=False, wrap=False, timestamp=False,
+                           comments=False, sort=False, overwrite=False,
+                           zipy=False, prefix='', add_hash=False):
+    """Process multiple CSS, JS files with multiprocessing."""
+    print("Process %s is Compressing %s" % (os.getpid(), file_path))
+    if watch:
+        previous = int(os.stat(file_path).st_mtime)
+        print("Process %s is Watching %s" % (os.getpid(), file_path))
+        while True:
+            actual = int(os.stat(file_path).st_mtime)
+            if previous == actual:
+                sleep(60)
+            else:
+                previous = actual
+                print("Modification detected on %s" % file_path)
+                if file_path.endswith(".css"):
+                    process_single_css_file(
+                        file_path, wrap=wrap, timestamp=timestamp,
+                        comments=comments, sort=sort, overwrite=overwrite,
+                        zipy=zipy, prefix=prefix, add_hash=add_hash)
+                elif file_path.endswith(".js"):
+                    process_single_js_file(
+                        file_path, timestamp=timestamp,
+                        overwrite=overwrite, zipy=zipy)
+    else:
+        if file_path.endswith(".css"):
+            process_single_css_file(
+                file_path, wrap=wrap, timestamp=timestamp,
+                comments=comments, sort=sort, overwrite=overwrite, zipy=zipy,
+                prefix=prefix, add_hash=add_hash)
+        elif file_path.endswith(".js"):
+            process_single_js_file(
+                file_path, timestamp=timestamp,
+                overwrite=overwrite, zipy=zipy)
+
+
+def prefixer_extensioner(file_path, old, new,
+                         file_content=None, prefix='', add_hash=False):
+    """Take a file path and safely preppend a prefix and change extension.
+
+    This is needed because filepath.replace('.foo', '.bar') sometimes may
+    replace '/folder.foo/file.foo' into '/folder.bar/file.bar' wrong!.
+    >>> prefixer_extensioner('/tmp/test.js', '.js', '.min.js')
+    '/tmp/test.min.js'
+    """
+    print("Prepending '%s' Prefix to %s" % (new.upper(), file_path))
+
+    extension = os.path.splitext(file_path)[1].lower().replace(old, new)
+    filenames = os.path.splitext(os.path.basename(file_path))[0]
+    filenames = prefix + filenames if prefix else filenames
+    if add_hash and file_content:  # http://stackoverflow.com/a/25568916
+        filenames += "-" + sha1(file_content.encode("utf-8")).hexdigest()[:11]
+        print("Appending SHA1 HEX-Digest Hash to '%s'" % file_path)
+    dir_names = os.path.dirname(file_path)
+    file_path = os.path.join(dir_names, filenames + extension)
+    return file_path
+
+
+def process_single_css_file(css_file_path, wrap=False, timestamp=False,
+                            comments=False, sort=False, overwrite=False,
+                            zipy=False, prefix='', add_hash=False,
+                            output_path=None):
+    """Process a single CSS file."""
+    print("Processing %sCSS%s file: %s" % (color['cyan'], color['end'], css_file_path))
+    with open(css_file_path, encoding="utf-8") as css_file:
+        original_css = css_file.read()
+
+    print("INPUT: Reading CSS file %s" % css_file_path)
+
+    minified_css = css_minify(original_css, wrap=wrap,
+                              comments=comments, sort=sort)
+    if timestamp:
+        taim = "/* {0} */ ".format(datetime.now().isoformat()[:-7].lower())
+        minified_css = taim + minified_css
+    if output_path is None:
+        min_css_file_path = prefixer_extensioner(
+            css_file_path, ".css", ".css" if overwrite else ".min.css",
+            original_css, prefix=prefix, add_hash=add_hash)
+        if zipy:
+            gz_file_path = prefixer_extensioner(
+                css_file_path, ".css",
+                ".css.gz" if overwrite else ".min.css.gz", original_css,
+                prefix=prefix, add_hash=add_hash)
+            print("OUTPUT: Writing ZIP CSS %s" % gz_file_path)
+    else:
+        min_css_file_path = gz_file_path = output_path
+    if not zipy or output_path is None:
+        # if specific output path is requested,write write only one output file
+        with open(min_css_file_path, "w", encoding="utf-8") as output_file:
+            output_file.write(minified_css)
+    if zipy:
+        with gzip.open(gz_file_path, "wt", encoding="utf-8") as output_gz:
+            output_gz.write(minified_css)
+
+    print("OUTPUT: Writing CSS Minified %s" % min_css_file_path)
+
+    return min_css_file_path
+
+
+def process_single_js_file(js_file_path, timestamp=False, overwrite=False,
+                           zipy=False, output_path=None):
+    """Process a single JS file."""
+    print("Processing %sJS%s file: %s" % (color['green'], color['end'], js_file_path))
+    with open(js_file_path, encoding="utf-8") as js_file:
+        original_js = js_file.read()
+    print("INPUT: Reading JS file %s" % js_file_path)
+    minified_js = js_minify(original_js)
+    if timestamp:
+        taim = "/* {} */ ".format(datetime.now().isoformat()[:-7].lower())
+        minified_js = taim + minified_js
+    if output_path is None:
+        min_js_file_path = prefixer_extensioner(
+            js_file_path, ".js", ".js" if overwrite else ".min.js",
+            original_js)
+        if zipy:
+            gz_file_path = prefixer_extensioner(
+                js_file_path, ".js", ".js.gz" if overwrite else ".min.js.gz",
+                original_js)
+            print("OUTPUT: Writing ZIP JS %s" % gz_file_path)
+    else:
+        min_js_file_path = gz_file_path = output_path
+    if not zipy or output_path is None:
+        # if specific output path is requested,write write only one output file
+        with open(min_js_file_path, "w", encoding="utf-8") as output_file:
+            output_file.write(minified_js)
+    if zipy:
+        with gzip.open(gz_file_path, "wt", encoding="utf-8") as output_gz:
+            output_gz.write(minified_js)
+    print("OUTPUT: Writing JS Minified %s" % min_js_file_path)
+    return min_js_file_path
+
+
+def make_arguments_parser():
+    """Build and return a command line agument parser."""
+    parser = ArgumentParser(description=__doc__, epilog="""CSS-JS-Minify:
+    Takes a file or folder full path string and process all CSS/JS found.
+    If argument is not file/folder will fail. Check Updates works on Python3.
+    Std-In to Std-Out is deprecated since it may fail with unicode characters.
+    SHA1 HEX-Digest 11 Chars Hash on Filenames is used for Server Cache.
+    CSS Properties are Alpha-Sorted, to help spot cloned ones, Selectors not.
+    Watch works for whole folders, with minimum of ~60 Secs between runs.""")
+    # parser.add_argument('--version', action='version', version=css_js_minify.__version__)
+    parser.add_argument('fullpath', metavar='fullpath', type=str,
+                        help='Full path to local file or folder.')
+    parser.add_argument('--wrap', action='store_true',
+                        help="Wrap output to ~80 chars per line, CSS only.")
+    parser.add_argument('--prefix', type=str,
+                        help="Prefix string to prepend on output filenames.")
+    parser.add_argument('--timestamp', action='store_true',
+                        help="Add a Time Stamp on all CSS/JS output files.")
+    parser.add_argument('--quiet', action='store_true', help="Quiet, Silent.")
+    parser.add_argument('--hash', action='store_true',
+                        help="Add SHA1 HEX-Digest 11chars Hash to Filenames.")
+    parser.add_argument('--zipy', action='store_true',
+                        help="GZIP Minified files as '*.gz', CSS/JS only.")
+    parser.add_argument('--sort', action='store_true',
+                        help="Alphabetically Sort CSS Properties, CSS only.")
+    parser.add_argument('--comments', action='store_true',
+                        help="Keep comments, CSS only (Not Recommended)")
+    parser.add_argument('--overwrite', action='store_true',
+                        help="Force overwrite all in-place (Not Recommended)")
+    parser.add_argument('--after', type=str,
+                        help="Command to execute after run (Experimental).")
+    parser.add_argument('--before', type=str,
+                        help="Command to execute before run (Experimental).")
+    parser.add_argument('--watch', action='store_true', help="Watch changes.")
+    parser.add_argument('--multiple', action='store_true',
+                        help="Allow Multiple instances (Not Recommended).")
+    return parser.parse_args()
+
+
+def walk2list(folder: str, target: tuple, omit: tuple = (),
+              showhidden: bool = False, topdown: bool = True,
+              onerror: object = None, followlinks: bool = False) -> tuple:
+    """Perform full walk, gather full path of all files."""
+    oswalk = os.walk(folder, topdown=topdown,
+                     onerror=onerror, followlinks=followlinks)
+
+    return [os.path.abspath(os.path.join(r, f))
+            for r, d, fs in oswalk
+            for f in fs if not f.startswith(() if showhidden else ".") and
+            not f.endswith(omit) and f.endswith(target)]
+
+
+def main():
+    """Main Loop."""
+    args = make_arguments_parser()
+    if os.path.isfile(args.fullpath) and args.fullpath.endswith(".css"):
+        print("Target is a CSS File.")  # Work based on if argument is
+        list_of_files = str(args.fullpath)  # file or folder, folder is slower.
+        process_single_css_file(
+            args.fullpath, wrap=args.wrap, timestamp=args.timestamp,
+            comments=args.comments, sort=args.sort, overwrite=args.overwrite,
+            zipy=args.zipy, prefix=args.prefix, add_hash=args.hash)
+    elif os.path.isfile(args.fullpath) and args.fullpath.endswith(".js"):
+        print("Target is a JS File.")
+        list_of_files = str(args.fullpath)
+        process_single_js_file(
+            args.fullpath, timestamp=args.timestamp,
+            overwrite=args.overwrite, zipy=args.zipy)
+    elif os.path.isdir(args.fullpath):
+        print("Target is a Folder with CSS, JS files !.")
+        print("Processing a whole Folder may take some time...")
+        list_of_files = walk2list(
+            args.fullpath,
+            (".css", ".js" if args.overwrite else None),
+            (".min.css", ".min.js" if args.overwrite else None))
+        print("Total Maximum CPUs used: ~%s Cores." % cpu_count())
+        pool = Pool(cpu_count())  # Multiprocessing Async
+        pool.map_async(partial(
+            process_multiple_files, watch=args.watch,
+            wrap=args.wrap, timestamp=args.timestamp,
+            comments=args.comments, sort=args.sort,
+            overwrite=args.overwrite, zipy=args.zipy,
+            prefix=args.prefix, add_hash=args.hash),
+                       list_of_files)
+        pool.close()
+        pool.join()
+    else:
+        print("File or folder not found,or cant be read,or I/O Error.")
+        sys.exit(1)
+    if args.after and getoutput:
+        print(getoutput(str(args.after)))
+    print("\n %s \n Files Processed: %s" % ("-" * 80, list_of_files))
+    print("Number of Files Processed: %s" %
+          (len(list_of_files) if isinstance(list_of_files, tuple) else 1))

plugins/compressor/variables.py

@@ -0,0 +1,211 @@
+# -*- coding: utf-8 -*-
+
+"""Variables for CSS processing for CSS-JS-Minify."""
+
+__all__ = ('EXTENDED_NAMED_COLORS', 'CSS_PROPS_TEXT')
+
+# 'Color Name String': (R, G, B)
+EXTENDED_NAMED_COLORS = {
+    'azure': (240, 255, 255),
+    'beige': (245, 245, 220),
+    'bisque': (255, 228, 196),
+    'blanchedalmond': (255, 235, 205),
+    'brown': (165, 42, 42),
+    'burlywood': (222, 184, 135),
+    'chartreuse': (127, 255, 0),
+    'chocolate': (210, 105, 30),
+    'coral': (255, 127, 80),
+    'cornsilk': (255, 248, 220),
+    'crimson': (220, 20, 60),
+    'cyan': (0, 255, 255),
+    'darkcyan': (0, 139, 139),
+    'darkgoldenrod': (184, 134, 11),
+    'darkgray': (169, 169, 169),
+    'darkgreen': (0, 100, 0),
+    'darkgrey': (169, 169, 169),
+    'darkkhaki': (189, 183, 107),
+    'darkmagenta': (139, 0, 139),
+    'darkolivegreen': (85, 107, 47),
+    'darkorange': (255, 140, 0),
+    'darkorchid': (153, 50, 204),
+    'darkred': (139, 0, 0),
+    'darksalmon': (233, 150, 122),
+    'darkseagreen': (143, 188, 143),
+    'darkslategray': (47, 79, 79),
+    'darkslategrey': (47, 79, 79),
+    'darkturquoise': (0, 206, 209),
+    'darkviolet': (148, 0, 211),
+    'deeppink': (255, 20, 147),
+    'dimgray': (105, 105, 105),
+    'dimgrey': (105, 105, 105),
+    'firebrick': (178, 34, 34),
+    'forestgreen': (34, 139, 34),
+    'gainsboro': (220, 220, 220),
+    'gold': (255, 215, 0),
+    'goldenrod': (218, 165, 32),
+    'gray': (128, 128, 128),
+    'green': (0, 128, 0),
+    'grey': (128, 128, 128),
+    'honeydew': (240, 255, 240),
+    'hotpink': (255, 105, 180),
+    'indianred': (205, 92, 92),
+    'indigo': (75, 0, 130),
+    'ivory': (255, 255, 240),
+    'khaki': (240, 230, 140),
+    'lavender': (230, 230, 250),
+    'lavenderblush': (255, 240, 245),
+    'lawngreen': (124, 252, 0),
+    'lemonchiffon': (255, 250, 205),
+    'lightcoral': (240, 128, 128),
+    'lightcyan': (224, 255, 255),
+    'lightgray': (211, 211, 211),
+    'lightgreen': (144, 238, 144),
+    'lightgrey': (211, 211, 211),
+    'lightpink': (255, 182, 193),
+    'lightsalmon': (255, 160, 122),
+    'lightseagreen': (32, 178, 170),
+    'lightslategray': (119, 136, 153),
+    'lightslategrey': (119, 136, 153),
+    'lime': (0, 255, 0),
+    'limegreen': (50, 205, 50),
+    'linen': (250, 240, 230),
+    'magenta': (255, 0, 255),
+    'maroon': (128, 0, 0),
+    'mediumorchid': (186, 85, 211),
+    'mediumpurple': (147, 112, 219),
+    'mediumseagreen': (60, 179, 113),
+    'mediumspringgreen': (0, 250, 154),
+    'mediumturquoise': (72, 209, 204),
+    'mediumvioletred': (199, 21, 133),
+    'mintcream': (245, 255, 250),
+    'mistyrose': (255, 228, 225),
+    'moccasin': (255, 228, 181),
+    'navy': (0, 0, 128),
+    'oldlace': (253, 245, 230),
+    'olive': (128, 128, 0),
+    'olivedrab': (107, 142, 35),
+    'orange': (255, 165, 0),
+    'orangered': (255, 69, 0),
+    'orchid': (218, 112, 214),
+    'palegoldenrod': (238, 232, 170),
+    'palegreen': (152, 251, 152),
+    'paleturquoise': (175, 238, 238),
+    'palevioletred': (219, 112, 147),
+    'papayawhip': (255, 239, 213),
+    'peachpuff': (255, 218, 185),
+    'peru': (205, 133, 63),
+    'pink': (255, 192, 203),
+    'plum': (221, 160, 221),
+    'purple': (128, 0, 128),
+    'rosybrown': (188, 143, 143),
+    'saddlebrown': (139, 69, 19),
+    'salmon': (250, 128, 114),
+    'sandybrown': (244, 164, 96),
+    'seagreen': (46, 139, 87),
+    'seashell': (255, 245, 238),
+    'sienna': (160, 82, 45),
+    'silver': (192, 192, 192),
+    'slategray': (112, 128, 144),
+    'slategrey': (112, 128, 144),
+    'snow': (255, 250, 250),
+    'springgreen': (0, 255, 127),
+    'teal': (0, 128, 128),
+    'thistle': (216, 191, 216),
+    'tomato': (255, 99, 71),
+    'turquoise': (64, 224, 208),
+    'violet': (238, 130, 238),
+    'wheat': (245, 222, 179)
+}
+
+
+# Do Not compact this string, new lines are used to Group up stuff.
+CSS_PROPS_TEXT = '''
+
+alignment-adjust alignment-baseline animation animation-delay
+animation-direction animation-duration animation-iteration-count
+animation-name animation-play-state animation-timing-function appearance
+azimuth
+
+backface-visibility background background-blend-mode background-attachment
+background-clip background-color background-image background-origin
+background-position background-position-block background-position-inline
+background-position-x background-position-y background-repeat background-size
+baseline-shift bikeshedding bookmark-label bookmark-level bookmark-state
+bookmark-target border border-bottom border-bottom-color
+border-bottom-left-radius border-bottom-parts border-bottom-right-radius
+border-bottom-style border-bottom-width border-clip border-clip-top
+border-clip-right border-clip-bottom border-clip-left border-collapse
+border-color border-corner-shape border-image border-image-outset
+border-image-repeat border-image-slice border-image-source border-image-width
+border-left border-left-color border-left-style border-left-parts
+border-left-width border-limit border-parts border-radius border-right
+border-right-color border-right-style border-right-width border-right-parts
+border-spacing border-style border-top border-top-color border-top-left-radius
+border-top-parts border-top-right-radius border-top-style border-top-width
+border-width bottom box-decoration-break box-shadow box-sizing
+
+caption-side clear clip color column-count column-fill column-gap column-rule
+column-rule-color column-rule-style column-rule-width column-span column-width
+columns content counter-increment counter-reset corners corner-shape
+cue cue-after cue-before cursor
+
+direction display drop-initial-after-adjust drop-initial-after-align
+drop-initial-before-adjust drop-initial-before-align drop-initial-size
+drop-initial-value
+
+elevation empty-cells
+
+flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap fit
+fit-position float font font-family font-size font-size-adjust font-stretch
+font-style font-variant font-weight
+
+grid-columns grid-rows
+
+justify-content
+
+hanging-punctuation height hyphenate-character hyphenate-resource hyphens
+
+icon image-orientation image-resolution inline-box-align
+
+left letter-spacing line-height line-stacking line-stacking-ruby
+line-stacking-shift line-stacking-strategy linear-gradient list-style
+list-style-image list-style-position list-style-type
+
+margin margin-bottom margin-left margin-right margin-top marquee-direction
+marquee-loop marquee-speed marquee-style max-height max-width min-height
+min-width
+
+nav-index
+
+opacity orphans outline outline-color outline-offset outline-style
+outline-width overflow overflow-style overflow-x overflow-y
+
+padding padding-bottom padding-left padding-right padding-top page
+page-break-after page-break-before page-break-inside pause pause-after
+pause-before perspective perspective-origin pitch pitch-range play-during
+position presentation-level
+
+quotes
+
+resize rest rest-after rest-before richness right rotation rotation-point
+ruby-align ruby-overhang ruby-position ruby-span
+
+size speak speak-header speak-numeral speak-punctuation speech-rate src
+stress string-set
+
+table-layout target target-name target-new target-position text-align
+text-align-last text-decoration text-emphasis text-indent text-justify
+text-outline text-shadow text-transform text-wrap top transform
+transform-origin transition transition-delay transition-duration
+transition-property transition-timing-function
+
+unicode-bidi unicode-range
+
+vertical-align visibility voice-balance voice-duration voice-family
+voice-pitch voice-range voice-rate voice-stress voice-volume volume
+
+white-space widows width word-break word-spacing word-wrap
+
+z-index
+
+'''

requirements.txt

@@ -1,7 +1,6 @@
 Babel==2.7.0
 beautifulsoup4==4.8.1
 blinker==1.4
-css-html-js-minify==2.5.5
 docutils==0.15.2
 feedgenerator==1.9
 html5validator==0.3.1