Fix sidebar showing wrong side of card

[lightcards.git] / lightcards / parse.py

diff --git a/lightcards/parse.py b/lightcards/parse.py
old mode 100755 (executable)
new mode 100644 (file)
index 12c1073..082b7dc
--- a/lightcards/parse.py
+++ b/lightcards/parse.py
@@ -1,38 +1,57 @@
-#!/usr/bin/env python
 # Parse markdown table into tuple of lists
 # Armaan Bhojwani 2021
 
-import sys
 from bs4 import BeautifulSoup
 import markdown
 
+from .deck import Card
 
-def md2html(file):
-    with open(file, "r", encoding="utf-8") as input_file:
-        return markdown.markdown(input_file.read(), extensions=['tables'])
-
-
-def parse_html(html):
-    def clean_text(inp):
-        return inp.get_text().rstrip()
 
-    def clean_list(inp):
-        for z in inp:
-            if not len(z) == 2:
-                inp.remove(z)
-        return inp
+def md2html(file):
+    """Use the markdown module to convert input to HTML"""
+    outp = ""
+    for i in file:
+        try:
+            outp += markdown.markdown(
+                open(i, "r").read(), extensions=["tables"]
+            )
+        except FileNotFoundError:
+            raise Exception(
+                f'lightcards: "{i}": No such file or directory'
+            ) from None
 
-    soup = BeautifulSoup(html, 'html.parser')
-    outp = []
+    return outp
 
-    for x in soup.find_all("tr"):
-        outp.append([clean_text(y) for y in x.find_all("td")])
 
-    return ([clean_text(x) for x in soup.find_all("th")],
-            clean_list(outp))
+def parse_html(html, args, conf):
+    """Use BeautifulSoup to parse the HTML"""
 
-def main(file):
-    return parse_html(md2html(file))
+    def clean_text(inp):
+        return inp.get_text().rstrip()
 
-if __name__ == "__main__":
-    print(main(sys.argv[1]))
+    soup = BeautifulSoup(html, "html.parser")
+    outp, ths = [], []
+
+    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 conf["lenient"] or not args.lenient:
+                raise Exception("lightcards: Headings malformed")
+        elif (table_num and i == table_num) or not table_num:
+            try:
+                for x in table.find_all("tr"):
+                    y = x.find_all("td")
+                    if y:
+                        outp.append(Card(tuple([clean_text(z) for z in y])))
+            except AttributeError:
+                raise Exception("lightcards: No table found") from None
+
+    # Return a tuple of nested lists
+    return ([clean_text(x) for x in ths], outp)