diff options
-rw-r--r-- | cli/cli.py | 19 | ||||
-rwxr-xr-x | pyblog | 20 |
2 files changed, 21 insertions, 18 deletions
@@ -1,5 +1,8 @@ #/bin/python3 +import os +import subprocess + from generators import generators @@ -13,3 +16,19 @@ def regenerate(args): """Wrapper for generate_blog(fresh=True).""" # pylint: disable=unused-argument exit(generators.generate_blog(fresh=True)) + + +def edit_post_with_editor(path): + """Launch text editor to edit post at a given path. + + Text editor is $VISUAL, then if empty, $EDITOR, then if still empty, + vi. + + """ + if "VISUAL" in os.environ: + editor = os.environ["VISUAL"] + elif "EDITOR" in os.environ: + editor = os.environ["EDITOR"] + else: + editor = "vi" + subprocess.call([editor, path]) @@ -53,22 +53,6 @@ from generators import generators from cli import cli -def edit_post_with_editor(path): - """Launch text editor to edit post at a given path. - - Text editor is $VISUAL, then if empty, $EDITOR, then if still empty, - vi. - - """ - if "VISUAL" in os.environ: - editor = os.environ["VISUAL"] - elif "EDITOR" in os.environ: - editor = os.environ["EDITOR"] - else: - editor = "vi" - subprocess.call([editor, path]) - - def new_post(title): """Create a new post with metadata pre-filled. @@ -103,7 +87,7 @@ def new_post(title): newpost.write("---\n\n") sys.stderr.write("New post created in:\n") print(fullpath) - edit_post_with_editor(fullpath) + cli.edit_post_with_editor(fullpath) return 0 @@ -598,7 +582,7 @@ def edit_existing_post(args): selection = selector.select() if selection: print(selection) - edit_post_with_editor(selection) + cli.edit_post_with_editor(selection) else: return 1 |