diff --git a/.gitignore b/.gitignore index b7ed096..0430fa7 100644 --- a/.gitignore +++ b/.gitignore @@ -149,4 +149,7 @@ ENV/ # Rope project settings .ropeproject -# End of https://www.gitignore.io/api/pycharm,python \ No newline at end of file +# End of https://www.gitignore.io/api/pycharm,python + +# Ignore output directory generated from program +output/ diff --git a/README.md b/README.md index 09d2ec9..6d8e7eb 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ See https://www.dokuwiki.org/wiki:syntax Just use the main python class. It uses `argparse` - only provide one argument: the directory you want to parse: -```python main.py --dir='some_dokuwiki_root_dir'``` +```python src/main.py --dir='some_dokuwiki_root_dir'``` ##### Including it into your python project: @@ -123,4 +123,4 @@ That way it's auto-loaded and wired in the main conversion. * embedding php - kill it with fire? * macro's - kill it with fire? -* what to do with footnotes? \ No newline at end of file +* what to do with footnotes? diff --git a/src/__init__.py b/src/__init__.py index bda6776..6821910 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,2 +1,2 @@ # this initializes the submodule __init__ -from src.markdown import * +from markdown import * diff --git a/src/dokuwiki_to_hugo.py b/src/dokuwiki_to_hugo.py index c6ccd5a..15567e6 100644 --- a/src/dokuwiki_to_hugo.py +++ b/src/dokuwiki_to_hugo.py @@ -1,8 +1,8 @@ import os import shutil -from src.hugo_file_config import HugoFileConfig -from src.markdown_converter import MarkdownConverter +from hugo_file_config import HugoFileConfig +from markdown_converter import MarkdownConverter class DokuWikiToHugo: diff --git a/src/main.py b/src/main.py index 0c6c6ba..80cb576 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,6 @@ import argparse -from src.dokuwiki_to_hugo import DokuWikiToHugo +from dokuwiki_to_hugo import DokuWikiToHugo def main(directory, root):