Clean up bar implementation

[lightcards.git] / lightcards / parse.py

diff --git a/lightcards/parse.py b/lightcards/parse.py
index 65cad627d4cd25e38dce77973fb9b25ae958a6dd..007b6408321b550257c45192177256296c952d9f 100755 (executable)
--- a/lightcards/parse.py
+++ b/lightcards/parse.py
@@ -11,8 +11,12 @@ from .deck import Card
 
 def md2html(file):
     """Use the markdown module to convert input to HTML"""
-    with open(file, "r", encoding="utf-8") as input_file:
-        return markdown.markdown(input_file.read(), extensions=['tables'])
+    try:
+        with open(file, "r", encoding="utf-8") as input_file:
+            return markdown.markdown(input_file.read(), extensions=['tables'])
+    except FileNotFoundError:
+        print(f"lightcards: \"{file}\": No such file or directory")
+        exit(1)
 
 
 def parse_html(html):
@@ -20,21 +24,14 @@ 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
-
     soup = BeautifulSoup(html, 'html.parser')
     outp = []
 
     for x in soup.find_all("tr"):
-        outp.append(Card([clean_text(y) for y in x.find_all("td")]))
+        outp.append(Card([clean_text(y) for y in x.find_all("td")[:2]]))
 
     # Return a tuple of nested lists
-    return ([clean_text(x) for x in soup.find_all("th")],
-            clean_list(outp))
+    return ([clean_text(x) for x in soup.find_all("th")][:2], outp[1:])
 
 
 def main(file):