add case feature

Author: G-Sivley

gui.py

@@ -49,7 +49,8 @@
     [sg.HorizontalSeparator()],
     [sg.T("")],
     [
-        [sg.Button(" Start ", key="--START--")]
+        sg.Button(" Start ", key="--START--"),
+        sg.CBox(" Ignore case ", key="--case--")
     ],
 ]
 font = "Arial, 12"
@@ -73,8 +74,9 @@
         ws2 = values.get("--ws2--", None)
         cols1 = values.get("--cols1--", None)
         cols2 = values.get("--cols2--", None)
+        case = values.get("--case--", None)
         try:
-            main.main(wb1, wb2, ws1, ws2, cols1, cols2)
+            main.main(wb1, wb2, ws1, ws2, cols1, cols2, case)
         except Exception as e:
             print("Something went wrong:", str(e))
 window.close()

main.py

@@ -4,27 +4,35 @@
 from openpyxl import load_workbook
 from openpyxl.cell import Cell
 
-def compare_cells(c1: Cell, c2: Cell):
+case = False
+
+def compare_cells(c1: Cell, c2: Cell, case: bool):
     #TODO: ignore whitespace and add case-insensitive comparison
-    if c1.value != c2.value:
-        print(f"[w1'{c1.coordinate}' != w2'{c2.coordinate}'] {c1.value} != {c2.value}")
+    if case:
+        if c1.value.lower() != c2.value.lower():
+            print(f"[w1'{c1.coordinate}' != w2'{c2.coordinate}'] {c1.value} != {c2.value}")
+            print("WOWOWO")
+    
+    else:
+        if c1.value != c2.value:
+            print(f"[w1'{c1.coordinate}' != w2'{c2.coordinate}'] {c1.value} != {c2.value}")
 
-def compare_columns(ws1: Worksheet, ws2: Worksheet, col1: str, col2: str):
+def compare_columns(ws1: Worksheet, ws2: Worksheet, col1: str, col2: str, case: bool):
     for cell_1, cell_2 in zip(ws1[col1], ws2[col2]):
-        compare_cells(cell_1, cell_2)
+        compare_cells(cell_1, cell_2, case)
     if len(ws1[col1]) > len(ws2[col2]):
         print(f"[ws1'{col1}' has more rows than ws2'{col2}', skipping extra rows]\n")
     if len(ws1[col1]) < len(ws2[col2]):
         print(f"[ws2'{col2}' has more rows than ws1'{col1}', skipping extra rows]\n")
 
-def compare_entire_worksheets(ws1: Worksheet, ws2: Worksheet):
+def compare_entire_worksheets(ws1: Worksheet, ws2: Worksheet, case: bool):
     ws1_rows, ws2_rows = ws1.max_row, ws2.max_row
     ws1_cols, ws2_cols = ws1.max_column, ws2.max_column
     rows = min(ws1_rows, ws2_rows)
     cols = min(ws1_cols, ws2_cols)
     for i in range(1, rows+1):
         for j in range(1, cols+1):
-            compare_cells(ws1.cell(i, j), ws2.cell(i, j))
+            compare_cells(ws1.cell(i, j), ws2.cell(i, j), case)
     if ws1_rows > ws2_rows:
         print(f"[ws1'{ws1.title}' has more rows than ws2'{ws2.title}', skipping extra rows]")
     if ws1_rows < ws2_rows:
@@ -41,6 +49,7 @@ def compare_workbooks(
     s2: str = None,
     cols1: str = None,
     cols2: str = None,
+    case: bool = False,
 ):
     ws1: Worksheet = w1[s1] if s1 else w1.active
     ws2: Worksheet = w2[s2] if s2 else w2.active
@@ -51,11 +60,11 @@ def compare_workbooks(
         return
     else:
         for c1, c2 in zip([x.strip() for x in cols1.split(",")], [x.strip() for x in cols2.split(",")]):
-            compare_columns(ws1, ws2, c1, c2)
+            compare_columns(ws1, ws2, c1, c2, case)
 
-def main(w1, w2, s1=None, s2=None, cols1=None, cols2=None):
+def main(w1, w2, s1=None, s2=None, cols1=None, cols2=None, case=False):
     ws1: Workbook = load_workbook(w1)
     ws2: Workbook = load_workbook(w2)
     print("Starting comparison...\n")
-    compare_workbooks(ws1, ws2, s1=s1, s2=s2, cols1=cols1, cols2=cols2)
+    compare_workbooks(ws1, ws2, s1=s1, s2=s2, cols1=cols1, cols2=cols2, case=case)
     print("\nComparison finished!")