Clean-up and tags

evernotezimport/main.py

@@ -13,7 +13,16 @@ from logzero import logger
 
 
 def clean_title(title):
-    return title.replace("'", "").replace('"', "").replace("/", "").replace(" ", "_")
+    return (
+        title.replace("'", "")
+        .replace('"', "")
+        .replace("?", "")
+        .replace("’", "")
+        .replace("/", "")
+        .replace(",", "")
+        .replace(".", "")
+        .replace(" ", "_")
+    )
 
 
 def clean_content(content):
@@ -47,7 +56,7 @@ def main():
         created = dateutil.parser.parse(note.find("created").text)
         tags = []
         for tag in note.findall("tag"):
-            tags.append(tag.find("tag").text)
+            tags.append(tag.text)
         logger.info("Found %s (%s)", title, created)
         notes.append((title, created, tags, content))
 
@@ -79,7 +88,10 @@ def main():
     for title, created, tags, content in notes:
         logger.info("Creating %s...", title)
         zim_note = zim_template.render(
-            title=title, created=created_format(created), content=clean_content(content)
+            title=title,
+            created=created_format(created),
+            content=clean_content(content),
+            tags=", ".join(tags),
         )
         with open("%s/%s.txt" % (args.zim, clean_title(title)), "w") as note_file:
             note_file.write(zim_note)