]> git.armaanb.net Git - lightcards.git/commitdiff
Add table and lenient config option
authorArmaan Bhojwani <me@armaanb.net>
Sun, 14 Feb 2021 03:19:24 +0000 (22:19 -0500)
committerArmaan Bhojwani <me@armaanb.net>
Sun, 14 Feb 2021 03:19:24 +0000 (22:19 -0500)
config.py
lightcards/parse.py
lightcards/runner.py

index ee974b041c0d46a11200fa4d8882322f533aa873..b61e4fdc6e2b862c380eab004b087f99a20c831f 100644 (file)
--- a/config.py
+++ b/config.py
@@ -10,6 +10,8 @@ alphabetize = False
 shuffle = False
 reverse = False
 cache = True
+table = False  # set to integer or range
+lenient = False
 
 default_view = 1
 
index 5d9b4024fd15f7d8491a6271fd163464279f5bc2..082b7dce1dedf0fca6879bf91818915f39fb086f 100644 (file)
@@ -1,7 +1,6 @@
 # Parse markdown table into tuple of lists
 # Armaan Bhojwani 2021
 
-import sys
 from bs4 import BeautifulSoup
 import markdown
 
@@ -24,7 +23,7 @@ def md2html(file):
     return outp
 
 
-def parse_html(html, args):
+def parse_html(html, args, conf):
     """Use BeautifulSoup to parse the HTML"""
 
     def clean_text(inp):
@@ -33,12 +32,19 @@ def parse_html(html, args):
     soup = BeautifulSoup(html, "html.parser")
     outp, ths = [], []
 
-    for i, table in enumerate(soup.find_all("table")):
+    if args.table:
+        table_num = args.table
+    elif conf["table"]:
+        table_num = conf["table"]
+    else:
+        table_num = False
+
+    for i, table in enumerate(soup.find_all("table"), start=1):
         ths = table.find_all("th")
         if len(ths) != 2:
-            if not args.lenient:
+            if conf["lenient"] or not args.lenient:
                 raise Exception("lightcards: Headings malformed")
-        elif args.table == i:
+        elif (table_num and i == table_num) or not table_num:
             try:
                 for x in table.find_all("tr"):
                     y = x.find_all("td")
index b40328da14d1d6a40baec51f1a97ac04e8502e82..0bd560072b3b2720afd77d795db3f2bd9bf8ac33 100644 (file)
@@ -124,7 +124,7 @@ def main(args=sys.argv):
         sys.tracebacklimit = 0
 
     global headers, stack
-    (headers, stack) = parse.parse_html(parse.md2html(args.inp), args)
+    (headers, stack) = parse.parse_html(parse.md2html(args.inp), args, conf)
 
     show(args, stack, headers, conf)