Support separators between body rows

Author: DenverCoder1

table2ascii/styles.py

@@ -1,20 +1,59 @@
 from .table_style import TableStyle
 
+thin = TableStyle.from_string("┌─┬─┐││ ├─┼─┤├─┼─┤└┴─┘")
+thin_rounded = TableStyle.from_string("╭─┬─╮││ ├─┼─┤├─┼─┤╰┴─╯")
+thin_compact = TableStyle.from_string("┌─┬─┐││ ├─┼─┤     └┴─┘")
+thin_compact_rounded = TableStyle.from_string("╭─┬─╮││ ├─┼─┤     ╰┴─╯")
+thin_thick = TableStyle.from_string("┌─┬─┐││ ┝━┿━┥├─┼─┤└┴─┘")
+thin_thick_rounded = TableStyle.from_string("╭─┬─╮││ ┝━┿━┥├─┼─┤╰┴─╯")
+thin_double = TableStyle.from_string("┌─┬─┐││ ╞═╪═╡├─┼─┤└┴─┘")
+thin_double_rounded = TableStyle.from_string("╭─┬─╮││ ╞═╪═╡├─┼─┤╰┴─╯")
+thick_compact = TableStyle.from_string("┏━┳━┓┃┃ ┣━╋━┫     ┗┻━┛")
+double = TableStyle.from_string("╔═╦═╗║║ ╠═╬═╣╠═╬═╣╚╩═╝")
+double_compact = TableStyle.from_string("╔═╦═╗║║ ╠═╬═╣     ╚╩═╝")
+double_thin = TableStyle.from_string("╔═╦═╗║║ ╟─╫─╢╠═╬═╣╚╩═╝")
+minimalist = TableStyle.from_string(" ───     ━━━  ───  ── ")
+ascii_compact = TableStyle.from_string("+-+-+|| +-+-+     ++-+")
+ascii_double = TableStyle.from_string("+-+-+|| +=+=++-+-+++-+")
+ascii_minimalist = TableStyle.from_string(" ---     ===  ---  -- ")
+markdown = TableStyle.from_string("     ||||-|||         ")
 
-a = TableStyle.from_string("┌─┬─┐││     ├─┼─┤└┴─┘")
-b = TableStyle.from_string("┌─┬─┐││┝━┿━┥├─┼─┤└┴─┘")
-c = TableStyle.from_string("┌─┬─┐││╞═╪═╡├─┼─┤└┴─┘")
-d = TableStyle.from_string("╭─┬─╮││     ├─┼─┤╰┴─╯")
-e = TableStyle.from_string("╭─┬─╮││┝━┿━┥├─┼─┤╰┴─╯")
-f = TableStyle.from_string("╭─┬─╮││╞═╪═╡├─┼─┤╰┴─╯")
-g = TableStyle.from_string("┏━┳━┓┃┃     ┣━╋━┫┗┻━┛")
-h = TableStyle.from_string("┌─┬─┐││┠─╂─┨├─┼─┤└┴─┘")
-i = TableStyle.from_string("╔═╦═╗║║     ╠═╬═╣╚╩═╝")
-j = TableStyle.from_string("╔═╦═╗║║╟─╫─╢╠═╬═╣╚╩═╝")
-k = TableStyle.from_string(" ───    ━━━  ───  ── ")
-l = TableStyle.from_string("+-+-+||     +-+-+++-+")
-m = TableStyle.from_string("+-+-+||+=+=++-+-+++-+")
-n = TableStyle.from_string("+=+=+HH     +=+=+++=+")
-o = TableStyle.from_string("+=+=+HH+-+-++=+=+++=+")
-p = TableStyle.from_string(" ---    ===  ---  -- ")
-q = TableStyle.from_string("     |||-|-|         ")
+# prints all themes with previews
+if __name__ == "__main__":
+    from .table_to_ascii import table2ascii
+
+    styles = {
+        "thin": thin,
+        "thin_rounded": thin_rounded,
+        "thin_compact": thin_compact,
+        "thin_compact_rounded": thin_compact_rounded,
+        "thin_thick": thin_thick,
+        "thin_thick_rounded": thin_thick_rounded,
+        "thin_double": thin_double,
+        "thin_double_rounded": thin_double_rounded,
+        "thick_compact": thick_compact,
+        "double": double,
+        "double_compact": double_compact,
+        "double_thin": double_thin,
+        "minimalist": minimalist,
+        "ascii_compact": ascii_compact,
+        "ascii_double": ascii_double,
+        "ascii_minimalist": ascii_minimalist,
+        "markdown": markdown,
+    }
+    for style in list(styles.keys()):
+        full = table2ascii(
+            header=["#", "G", "H", "R", "S"],
+            body=[["1", "30", "40", "35", "30"], ["2", "30", "40", "35", "30"]],
+            footer=["SUM", "130", "140", "135", "130"],
+            first_col_heading=True,
+            last_col_heading=False,
+            style=styles[style],
+        )
+        body_only = table2ascii(
+            body=[["1", "30", "40", "35", "30"], ["2", "30", "40", "35", "30"]],
+            first_col_heading=True,
+            last_col_heading=False,
+            style=styles[style],
+        )
+        print(f"### `{style}`\n\n```\n{full}\n{body_only}```\n")

table2ascii/table_style.py

@@ -43,16 +43,16 @@ class TableStyle:
     top_right_corner: str  # E
     left_and_right_edge: str  # F
     heading_col_sep: str  # G
-    middle_edge: str  # H
+    col_sep: str  # H
     heading_row_left_tee: str  # I
     heading_row_sep: str  # J
-    heading_col_row_cross: str  # K
+    heading_col_heading_row_cross: str  # K
     heading_row_cross: str  # L
     heading_row_right_tee: str  # M
     row_left_tee: str  # N
-    normalrow_sep: str  # O
-    col_row_cross: str  # P
-    row_cross: str  # Q
+    row_sep: str  # O
+    heading_col_row_cross: str  # P
+    col_row_cross: str  # Q
     row_right_tee: str  # R
     bottom_left_corner: str  # S
     heading_col_bottom_tee: str  # T

table2ascii/table_to_ascii.py

@@ -159,7 +159,7 @@ def __heading_row_to_ascii(self, row: List) -> str:
         return self.__row_to_ascii(
             left_edge=self.__style.left_and_right_edge,
             heading_col_sep=self.__style.heading_col_sep,
-            column_seperator=self.__style.middle_edge,
+            column_seperator=self.__style.col_sep,
             right_edge=self.__style.left_and_right_edge,
             filler=row,
         )
@@ -168,18 +168,28 @@ def __heading_sep_to_ascii(self) -> str:
         """Assembles the seperator below the header or above footer of the ascii table"""
         return self.__row_to_ascii(
             left_edge=self.__style.heading_row_left_tee,
-            heading_col_sep=self.__style.heading_col_row_cross,
+            heading_col_sep=self.__style.heading_col_heading_row_cross,
             column_seperator=self.__style.heading_row_cross,
             right_edge=self.__style.heading_row_right_tee,
             filler=self.__style.heading_row_sep,
         )
 
     def __body_to_ascii(self) -> str:
-        return "".join(
+        separation_row = self.__row_to_ascii(
+            left_edge=self.__style.row_left_tee,
+            heading_col_sep=self.__style.heading_col_row_cross,
+            column_seperator=self.__style.col_row_cross,
+            right_edge=self.__style.row_right_tee,
+            filler=self.__style.row_sep,
+        )
+        # don't use separation row if it's only space
+        if separation_row.strip() == "":
+            separation_row = ""
+        return separation_row.join(
             self.__row_to_ascii(
                 left_edge=self.__style.left_and_right_edge,
                 heading_col_sep=self.__style.heading_col_sep,
-                column_seperator=self.__style.middle_edge,
+                column_seperator=self.__style.col_sep,
                 right_edge=self.__style.left_and_right_edge,
                 filler=row,
             )