[KSS-checkins] r44149 - in kukit/kss.concatresource/trunk/kss/concatresource: . compression

[reebalazs at codespeak.net]

Author: reebalazs
Date: Mon Jun 11 18:04:58 2007
New Revision: 44149

Modified:
   kukit/kss.concatresource/trunk/kss/concatresource/compression/javascript.py
   kukit/kss.concatresource/trunk/kss/concatresource/directives.py
Log:
Merge in ree-stripout-comments branch (-r42580:44147)

Modified: kukit/kss.concatresource/trunk/kss/concatresource/compression/javascript.py
==============================================================================
--- kukit/kss.concatresource/trunk/kss/concatresource/compression/javascript.py	(original)
+++ kukit/kss.concatresource/trunk/kss/concatresource/compression/javascript.py	Mon Jun 11 18:04:58 2007
@@ -5,11 +5,42 @@
 from thirdparty.packer import JavascriptPacker
 # Packer needs to be created for each packing
 
+def stripout_comments(data):
+    'Strips out ;;; lines from the data.'
+    result = []
+    for line in data.splitlines(True):
+        if not line.lstrip().startswith(';;;'):
+            result.append(line)
+    return ''.join(result)
+
+def remove_markers(data):
+    'Removes the ;;; markers but leaves the lines.'
+    result = []
+    for line in data.splitlines(True):
+        if line.lstrip().startswith(';;;'):
+            line = line.lstrip()[3:]
+        result.append(line)
+    return ''.join(result)
+
 def compress(data, compress_level):
-    if compress_level == "safe":
+    if compress_level == "devel":
+        return remove_markers(data)
+    elif compress_level == "stripped":
+        return stripout_comments(data)
+    elif compress_level == "safe":
+        data = stripout_comments(data)
         jspacker_safe = JavascriptPacker('safe')
         return jspacker_safe.pack(data)
     elif compress_level == "full":
+        data = stripout_comments(data)
+        jspacker_full = JavascriptPacker('full')
+        return jspacker_full.pack(data)
+    elif compress_level == "safe-devel":
+        date = remove_markers(data)
+        jspacker_safe = JavascriptPacker('safe')
+        return jspacker_safe.pack(data)
+    elif compress_level == "full-devel":
+        date = remove_markers(data)
         jspacker_full = JavascriptPacker('full')
         return jspacker_full.pack(data)
     else:

Modified: kukit/kss.concatresource/trunk/kss/concatresource/directives.py
==============================================================================
--- kukit/kss.concatresource/trunk/kss/concatresource/directives.py	(original)
+++ kukit/kss.concatresource/trunk/kss/concatresource/directives.py	Mon Jun 11 18:04:58 2007
@@ -39,7 +39,7 @@
     compress_level = Choice(
         title=u"Compress level",
         description=u"Level of compression applied, by default 'safe'.",
-        values=(u'none', u'safe', u'full'),
+        values=(u'none', u'safe', u'full', u'stripped', u'devel', u'safe-devel', u'full-devel'),
         required=False,
         )