cleanup compress.py

data/css_compress/compress.py

@@ -2,27 +2,30 @@
 
 import sys
 import os
-from subprocess import call
 import re
 import subprocess
 
-def findnext(str, start, chr):
-    depth = 0
-    for i in range(start, len(str)):
-        if (str[i] == chr): return i;
 
-def findclose(str, start):
+def findnext(strdata, start, searchchr):
     depth = 0
-    for i in range(start, len(str)):
+    for i in range(start, len(strdata)):
-        if (str[i] == '{'): depth = depth+1;
+        if strdata[i] == searchchr: return i;
-        if (str[i] == '}'): depth = depth-1;
-        if (depth == 0): return i;
 
-def countnl(str, start, end):
+
+def findclose(strdata, start):
+    depth = 0
+    for i in range(start, len(strdata)):
+        if strdata[i] == '{': depth = depth + 1;
+        if strdata[i] == '}': depth = depth - 1;
+        if depth == 0: return i;
+
+
+def countnl(strdata, start, end):
     cnt = 0
     for i in range(start, end + 1):
-        if (str[i] == '\n'): cnt = cnt+1;
+        if strdata[i] == '\n': cnt = cnt + 1;
-    return cnt;
+    return cnt
+
 
 def comment_remover(text):
     def replacer(match):
@@ -31,30 +34,32 @@ def comment_remover(text):
             return " "  # note: a space and not an empty string
         else:
             return s
+
     pattern = re.compile(
         r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"',
         re.DOTALL | re.MULTILINE
     )
     return re.sub(pattern, replacer, text)
 
+
 fsource = str.replace(sys.argv[1], '\\', '/')  # scss
 finput = str.replace(sys.argv[2], '\\', '/')  # css
 foutput = str.replace(sys.argv[3], '\\', '/')  # min.css
-ftemp1 = '__temp_compresss_py_1.tmp.css';
+ftemp1 = '__temp_compresss_py_1.tmp.css'
-ftemp2 = '__temp_compresss_py_2.tmp.css';
+ftemp2 = '__temp_compresss_py_2.tmp.css'
 
-print('======== INPUT ========');
+print('======== INPUT ========')
-print();
+print()
-print(fsource);
+print(fsource)
-print(finput);
+print(finput)
-print(foutput);
+print(foutput)
-print();
+print()
-print();
+print()
 
-print('======== DELETE OLD DATA ========');
+print('======== DELETE OLD DATA ========')
 if os.path.isfile(finput):
     try:
-		os.remove(finput);
+        os.remove(finput)
         print(finput + ' deleted')
     except:
         print(sys.exc_info()[0])
@@ -62,18 +67,18 @@ else:
     print(finput + ' does not exist')
 if os.path.isfile(foutput):
     try:
-		os.remove(foutput);
+        os.remove(foutput)
         print(foutput + ' deleted')
     except:
         print(sys.exc_info()[0])
 else:
     print(foutput + ' does not exist')
-print();
+print()
-print();
+print()
 
-
+print('======== CALL SCSS ========')
-print('======== CALL SCSS ========');
+out = subprocess.run(['ruby', 'scss', '--style=expanded', '--no-cache', '--update', fsource + ':' + finput],
-out = subprocess.run(['ruby', 'scss', '--style=expanded', '--no-cache', '--update', fsource + ':' + finput], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 print('> scss.bat --style=expanded --no-cache --update ' + fsource + ':' + finput)
 print('STDOUT:')
 print(out.stdout.decode('utf-8'))
@@ -83,13 +88,13 @@ print(out.stderr.decode('utf-8'))
 print('')
 print('')
 
-print('======== CLEANUP COMMENTS ========');
+print('======== CLEANUP COMMENTS ========')
 with open(finput, 'r') as tf:
     data1 = tf.read()
     print(str(len(data1)) + ' characters read from ' + os.path.basename(finput))
 
 data1 = comment_remover(data1)
-print('Comments in css removed');
+print('Comments in css removed')
 
 with open(ftemp1, "w") as tf:
     tf.write(data1)
@@ -98,19 +103,19 @@ with open(ftemp1, "w") as tf:
 print('')
 print('')
 
-
+print('======== CALL YUI ========')
-print('======== CALL YUI ========');
+out = subprocess.run(['java', '-jar', 'yuicompressor.jar', '--verbose', ftemp1, '-o', ftemp2], stdout=subprocess.PIPE,
-out = subprocess.run(['java', '-jar', 'yuicompressor.jar', '--verbose', ftemp1, '-o', ftemp2], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                     stderr=subprocess.PIPE)
 print('> java -jar yuicompressor.jar --verbose "' + finput + '" -o "' + ftemp2 + '"')
-print('STDOUT:');
+print('STDOUT:')
 print(out.stdout.decode('utf-8'))
-print('STDERR:');
+print('STDERR:')
 print(out.stderr.decode('utf-8'))
 
 print('')
 print('')
 
-print('======== READ ========');
+print('======== READ ========')
 with open(ftemp2, 'r') as tf:
     data = tf.read()
     print(str(len(data)) + ' characters read from ' + ftemp2)
@@ -118,11 +123,11 @@ with open(ftemp2, 'r') as tf:
 print('')
 print('')
 
-print('======== REM ========');
+print('======== REM ========')
 try:
-    os.remove(ftemp1);
+    os.remove(ftemp1)
     print(ftemp1 + ' deleted')
-    os.remove(ftemp2);
+    os.remove(ftemp2)
     print(ftemp2 + ' deleted')
 except:
     print(sys.exc_info()[0])
@@ -130,29 +135,28 @@ except:
 print('')
 print('')
 
-print('======== REGEX ========');
+print('======== REGEX ========')
-data = re.sub(r'(\}*\})', '\g<1>\n', data);
+data = re.sub(r'(\}*\})', '\g<1>\n', data)
 
 print('css data modified (1)')
 
 print('')
 print('')
 
-print('======== MEDIA ========');
+print('======== MEDIA ========')
 ins = []
 for i in range(len(data)):
     if data[i:].startswith('@media'):
 
-
         copen = findnext(data, i, '{')
         cclose = findclose(data, copen)
 
-        if (countnl(data, copen, cclose) == 0): continue;
+        if countnl(data, copen, cclose) == 0: continue;
 
         ins.append((copen + 1, '\n\t'))
-        for i in range(copen+1, cclose):
+        for i2 in range(copen + 1, cclose):
-            if data[i] == '\n':
+            if data[i2] == '\n':
-                tp =(i+1, '\t')
+                tp = (i2 + 1, '\t')
                 ins.append(tp)
         ins.append((cclose, '\n'))
         print('media query at idx:' + str(i) + ' formatted')
@@ -163,7 +167,7 @@ for (l, c) in reversed(ins):
 print('')
 print('')
 
-print('======== WRITE ========');
+print('======== WRITE ========')
 with open(foutput, "w") as tf:
     tf.write(data)
     print(str(len(data)) + ' characters written to ' + foutput)
@@ -171,12 +175,12 @@ with open(foutput, "w") as tf:
 print('')
 print('')
 
-print('======== REMOVE MAP ========');
+print('======== REMOVE MAP ========')
 if os.path.isfile(finput + '.map'):
     try:
-		os.remove(finput + '.map');
+        os.remove(finput + '.map')
         print(finput + '.map' + ' deleted')
-	except e:
+    except Exception as e:
         print(e)
 else:
     print(finput + '.map' + ' does not exist')
@@ -184,5 +188,4 @@ else:
 print('')
 print('')
 
-
 print('Finished.')