refs #62: Small refactor, only one entry point now.

Author: Jason Ward

pydocx/__init__.py

@@ -1,3 +1,4 @@
+import sys
 from .parsers import Docx2Html, Docx2Markdown
 
 
@@ -9,3 +10,25 @@ def docx2markdown(path):
     return Docx2Markdown(path).parsed
 
 VERSION = '0.3.11'
+
+
+def main():
+    try:
+        parser_to_use = sys.argv[1]
+        path_to_docx = sys.argv[2]
+        path_to_html = sys.argv[3]
+    except IndexError:
+        print 'Must specify which parser as well as the file to convert and the name of the resulting file.'  # noqa
+        sys.exit()
+    if parser_to_use == '--html':
+        html = Docx2Html(path_to_docx).parsed
+    elif parser_to_use == '--markdown':
+        html = Docx2Markdown(path_to_docx).parsed
+    else:
+        print 'Only valid parsers are --html and --markdown'
+        sys.exit()
+    with open(path_to_html, 'w') as f:
+        f.write(html)
+
+if __name__ == '__main__':
+    main()

pydocx/parsers/Docx2Html.py

@@ -1,5 +1,4 @@
 import base64
-import sys
 import xml.sax.saxutils
 
 from pydocx.DocxParser import DocxParser
@@ -204,18 +203,3 @@ def indent(self, text, just='', firstLine='', left='', right=''):
 
     def break_tag(self):
         return '<br />'
-
-
-def main():
-    try:
-        path_to_docx = sys.argv[1]
-        path_to_html = sys.argv[2]
-    except IndexError:
-        print 'Must specific the file to convert and the name of the resulting file.'  # noqa
-        sys.exit()
-    html = Docx2Html(path_to_docx).parsed
-    with open(path_to_html, 'w') as f:
-        f.write(html)
-
-if __name__ == '__main__':
-    main()

pydocx/parsers/Docx2Markdown.py

@@ -1,5 +1,3 @@
-import sys
-
 from pydocx.DocxParser import DocxParser
 
 
@@ -26,18 +24,3 @@ def italics(self, text):
 
     def underline(self, text):
         return '***' + text + '***'
-
-
-def main():
-    try:
-        path_to_docx = sys.argv[1]
-        path_to_html = sys.argv[2]
-    except IndexError:
-        print 'Must specific the file to convert and the name of the resulting file.'  # noqa
-        sys.exit()
-    html = Docx2Markdown(path_to_docx).parsed
-    with open(path_to_html, 'w') as f:
-        f.write(html)
-
-if __name__ == '__main__':
-    main()

setup.py

@@ -56,8 +56,7 @@ def get_description():
     long_description=get_description(),
     entry_points={
         'console_scripts': [
-            'pydocx.docx2html = pydocx.parsers.Docx2Html:main',
-            'pydocx.docx2markdown = pydocx.parsers.Docx2Markdown:main',
+            'pydocx = pydocx.__init__:main',
         ],
     },
 )