Add menu keybindings to config

[lightcards.git] / lightcards / parse.py

diff --git a/lightcards/parse.py b/lightcards/parse.py
index 0b4ecc1b2bdd172ad5cad07ca40e0205af07296d..3a1306bfae98840ba312fc58deff160d667ceeb8 100644 (file)
--- a/lightcards/parse.py
+++ b/lightcards/parse.py
@@ -13,8 +13,9 @@ def md2html(file):
     try:
         return markdown.markdown(open(file, "r").read(), extensions=["tables"])
     except FileNotFoundError:
-        print(f'lightcards: "{file}": No such file or directory')
-        exit(1)
+        raise Exception(
+            f'lightcards: "{file}": No such file or directory'
+        ) from None
 
 
 def parse_html(html):
@@ -23,14 +24,21 @@ def parse_html(html):
     def clean_text(inp):
         return inp.get_text().rstrip()
 
-    soup = BeautifulSoup(html, "html.parser")
+    soup = BeautifulSoup(html, "html.parser").find("table")
     outp = []
 
-    for x in soup.find_all("tr"):
-        outp.append(Card([clean_text(y) for y in x.find_all("td")[:2]]))
+    try:
+        for x in soup.find_all("tr"):
+            outp.append(Card(tuple([clean_text(y) for y in x.find_all("td")])))
+    except AttributeError:
+        raise Exception("lightcards: No table found") from None
+
+    ths = soup.find_all("th")
+    if len(ths) != 2:
+        raise Exception("lightcards: Headings malformed")
 
     # Return a tuple of nested lists
-    return ([clean_text(x) for x in soup.find_all("th")][:2], outp[1:])
+    return ([clean_text(x) for x in ths], outp[1:])
 
 
 def main(file):