diff --git a/eorg/cmd.py b/eorg/cmd.py index 6ca48bb..4e47b54 100644 --- a/eorg/cmd.py +++ b/eorg/cmd.py @@ -1,16 +1,42 @@ +import sys from eorg.parser import parse +from eorg.generate import html + def tangle(v): print("tangle") print(v) +def recursive(path): + for root, dirs, filenames in os.walk(path): + for filename in filenames: + if filename.endswith(".org"): + yield root + os.sep + filename + +def tokenize(doc): + for item in doc: + print(item) + +def htmlize(doc): + for item in doc: + print(item) + +def handler(fp, kwargs): + if kwargs.t is True: + tokenize(doc) + if kwargs.w is True: + print(html(doc).read()) + if __name__ == "__main__": import argparse parser = argparse.ArgumentParser(description="Process some .org files") parser.add_argument("filename") + parser.add_argument('-r', action='store_true', help='recursive') + parser.add_argument('-w', action='store_true', help='html') + parser.add_argument('-t', action='store_true', help='html') parser.add_argument( "--tangle", dest="tangle", @@ -21,4 +47,13 @@ if __name__ == "__main__": ) args = parser.parse_args() - print(args) + print(args.filename) + print(args.r) + if args.r is True: + sys.exit() + + with open(args.filename, "r") as fp: + doc = parse(fp) + handler(parse(fp), args) + + diff --git a/eorg/generate.py b/eorg/generate.py index 538e847..eacfddc 100644 --- a/eorg/generate.py +++ b/eorg/generate.py @@ -15,7 +15,7 @@ builddoc ={ # "BREAK": "br", "TEXT": ("p", "flow-text"), "SRC_BEGIN": (src, None), - "EXAMPLE": ('vblockquote', None), + "EXAMPLE": ('blockquote', None), } @@ -34,6 +34,6 @@ def html(doc): response.write(tag(item.value)) continue else: - response.write('<%s%s>%s<%s/>\n' % (tag, cls, item.value, tag)) + response.write('<%s%s>%s\n' % (tag, cls, item.value, tag)) response.seek(0) return response