Updaded parsing methodology

Author: 4d11

bootstrapCsskrt.py

@@ -92,7 +92,3 @@ def add_form_classes(self, tag_dict: dict):
                     # Add input wrapper
                     control_div = self.soup.new_tag('div', **{'class': 'control'})
                     elem.wrap(control_div)
-                elif type(elem) == Tag:  # ignore  NavigableStrings like /n
-                    spotted_label = None
-                    if (tag_dict.get(elem.name)):
-                        self.add_class_to_element(elem, tag_dict[elem.name])

bulmaCsskrt.py

@@ -12,6 +12,12 @@ def __init__(self, fileName):
             'button': 'button',
             'checkbox': 'checkbox',
             'radio': 'radio',
+            'h1': 'title is-1',
+            'h2': 'title is-2',
+            'h3': 'title is-3',
+            'h4': 'title is-4',
+            'h5': 'title is-5',
+            'h6': 'title is-6'
         }
         super().__init__(fileName, tag_styles)
 
@@ -85,9 +91,4 @@ def add_form_classes(self, tag_dict: dict):
 
                     # Add input wrapper
                     control_div = self.soup.new_tag('div', **{'class': 'control'})
-                    elem.wrap(control_div)
-
-                elif type(elem) == Tag:  # ignore  NavigableStrings like /n
-                    spotted_label = None
-                    if (tag_dict.get(elem.name)):
-                        self.add_class_to_element(elem, tag_dict[elem.name])
+                    elem.wrap(control_div)

csskrt.py

@@ -1,4 +1,4 @@
-from bs4 import BeautifulSoup, Tag, NavigableString
+from bs4 import BeautifulSoup, Tag, NavigableString, Doctype
 import os
 from abc import ABC, abstractmethod
 from typing import List, Dict, NoReturn
@@ -105,9 +105,9 @@ def add_form_classes(self, tag_dict: dict) -> NoReturn:
                         if 'checkbox' in tag_dict:
                             self.add_class_to_element(elem, tag_dict['checkbox'])
 
-                elif type(elem) == Tag:  # ignore  NavigableStrings like /n
-                    if tag_dict.get(elem.name):
-                        self.add_class_to_element(elem, tag_dict[elem.name])
+                # elif type(elem) == Tag:  # ignore  NavigableStrings like /n
+                #     if tag_dict.get(elem.name):
+                #         self.add_class_to_element(elem, tag_dict[elem.name])
 
     def add_table_classes(self, table_tag_dict: dict) -> NoReturn:
         """
@@ -148,6 +148,20 @@ def add_list_classes(self, list_tags: dict) -> NoReturn:
                     # recursive=False to prevent double modifying for nested lists
                     self.add_class_to_element(li, list_tags['li'])
 
+
+    def add_general_classes(self):
+        """
+        Adds styles to single elements
+        :return:
+        """
+        supported_classes = (
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'button', 'a', 'nav'
+        )
+        for tag in self.tag_styles:
+            if tag in supported_classes:
+                for elem in self.soup.find_all(tag):
+                    self.add_class_to_element(elem, self.tag_styles[tag])
+
     def output(self) -> NoReturn:
         """
         Outputs a new file.
@@ -161,22 +175,33 @@ def output(self) -> NoReturn:
         with open(new_file_name, 'w') as out_file:
             out_file.write(self.soup.prettify())
 
+
     def freshify(self) -> NoReturn:
         """
         Main function that applies all the necessary styles
+
         :return:
         """
         starter_tags = self.get_starter_tags()
         wrapper_tag = self.get_wrapper_tag()
         table_styles = self.get_table_styles()
         list_styles = self.get_list_styles()
 
+        # Modify the head
         self.initialize_framework(self.soup.head, starter_tags)
+
+        # Add the "wrapper" tag
         if wrapper_tag:
             self.add_wrapper_tag(wrapper_tag)
+
+        #  Elements that have children eg. tables, lists, forms have their own
+        #  dedicated function to support complex operations if necessary.
         self.add_form_classes(self.tag_styles)
         self.add_list_classes(list_styles)
         self.add_table_classes(table_styles)
-        self.output()
 
-# print(btn.get('class', []))
+        # Add styles for the rest of the elements
+        self.add_general_classes()
+
+        # Output the modified html file
+        self.output()

main.py

@@ -17,7 +17,7 @@ def freshify(filename, framework):
         raise Exception("Invalid framework")
 
     csskrter.freshify()
-    print("Done !")
+    print("Done!")
 
 
 if __name__ == '__main__':