fixed media queries (they were never the problem). new fn() determines if entire rule is on one line. v3.0, baby.

Author: Jack Adam

README.md

@@ -8,7 +8,3 @@
 3. prints unused classes and IDs, corresponding files and line numbers
 4. re-writes .css files without unused classes and IDs
 5. defines previously undefined style rules in .css files
-
-TODO:
-
-0. fix handling of media queries :-/

cleaner.py

@@ -1,4 +1,4 @@
-from helper import solo, comma
+from helper import solo, comma, full
 
 def clean(u, fn, fc):
     # pre-populate arrays
@@ -25,20 +25,24 @@ def clean(u, fn, fc):
             # open new file to write
             with open(new, 'w') as newF:
                 soloFlag, multiFlag, newline, totalFlag, end = False, False, False, False, False
+                # for each line
                 for num, line in enumerate(f, 1):
                     # if haven't seen all problem lines
                     if nums[i]:
                         # if line has an unused rule
                         if num == nums[i][0]:
                             # remove line num about to be cleaned
                             del nums[i][0]
-                            x = solo(line)
-                            soloFlag = x
-                            multiFlag = not(x)
+                            # how many rules are on this line?
+                            soloFlag = solo(line)
+                            multiFlag = not(soloFlag)
+                            # is the entire rule defined on this line?
+                            y = full(line)
                         # if multiple rules
                         if multiFlag:
                             l = line.split()
                             ll = len(l)
+                            # loop thru words in rule header
                             for x in range(ll):
                                 # replace unused rules with ?
                                 if comma(l[x]) in rules[i]:
@@ -55,6 +59,7 @@ def clean(u, fn, fc):
                             else:
                                 soloFlag = True
                                 totalFlag = True
+                            # re-assemble line from list
                             line = ' '.join(l) + '\n'
                             multiFlag = False
                         # if one rule
@@ -71,12 +76,17 @@ def clean(u, fn, fc):
                             if not newline or line != '\n':
                                 newF.write(line)
                             newline = True if line == '\n' else False
-                    # hack: remove definition of last rule
-                    else:
+                    # remove definition of last rule, unless it was all on one line
+                    elif not nums[i] and not end and not y:
                         for c in line:
                             if end:
                                 newF.write(c)
+                            # keep reading until definition ends
                             if c == '}':
                                 end = True
+                    # no need to examine char at a time
+                    else:
+                        newF.write(line)
+
             print(f'Wrote {new}')
             newF.close()

helper.py

@@ -76,3 +76,8 @@ def lookup(d, f):
     for h, c in d.items():
         if h == f:
             return c
+
+def full(l):
+    if '{' in l and '}' in l:
+        return True
+    return False

main.py

@@ -7,7 +7,8 @@ def main():
     # parse the files
     c = parse_css()
     h = parse_html()
-    unused, undefined, results, fileNames, css, fileCount = {}, {}, '', [], [], 0
+    unused, undefined, fileNames, css = {}, {}, [], []
+    results, fileCount = '', 0
 
     # identify UNUSED classes
     for cla, num in c[0][0].items():
@@ -77,6 +78,7 @@ def main():
         print(o)
         results += i
     if final:
+        # may i clean?
         q = input('\nMay I remove these unused rules and output new .css files? (yes/no): ')
         if q.lower() in ('yes', 'y'):
             clean(final, fileNames, fileCount)
@@ -85,10 +87,12 @@ def main():
         print(o)
         results += i
     if undefined:
+        # may i define?
         qq = input('May I add definitions for undefined rules? (yes/no): ')
         if qq.lower() in ('yes', 'y'):
             define(undefined, h[1])
 
+    # no cleaning, but maybe a humble .txt file?
     if q.lower() in ('no', 'n') and qq.lower() in ('no', 'n'):
         qqq = input('Would you instead like a .txt file with your results? (yes/no): ')
         if qqq.lower() in ('yes', 'y'):

parser.py

@@ -6,7 +6,8 @@
 def parse_css():
     # obtain filename/path
     filepath = intro('css')
-    classes, ids, found, flag = {}, {}, '', False
+    classes, ids = {}, {}
+    found, flag, op, close = '', False, 0, 0
 
     # read each file
     for file in glob(filepath):