latex configure

franaudo · franaudo · commit 7752f73e161c · 2021-10-26T15:42:46.000+02:00
diff --git a/src/codebots/bots/latexbot.py b/src/codebots/bots/latexbot.py
@@ -22,7 +22,7 @@ class LatexBot(BaseBot):
     def __init__(self, config_file=None, sender=None) -> None:
         self.__name__ = "latexbot"
 
-    def install_dependencies(self, **kwargs):
+    def install_dependencies(self, git, pandoc, miktex):
         """Installs the dependencies needed, namely:
             - git
             - pandoc 2.15
@@ -35,11 +35,11 @@ def install_dependencies(self, **kwargs):
         Kwargs
         ------
         git : bool, optional
-            install git if not already present, by default True
+            install git if not already present
         pandoc : bool, optional
-            install pandoc if not already present, by default True
-        latex : bool, optional
-            install latex (miktex distribution) if not already present, by default False
+            install pandoc if not already present
+        miktex : bool, optional
+            install latex (miktex distribution) if not already present
 
         Raises
         ------
@@ -63,21 +63,20 @@ def install_dependencies(self, **kwargs):
                     {'url': 'https://github.com/git-for-windows/git/releases/download/v2.33.1.windows.1/Git-2.33.1-64-bit.exe',
                      'function': 'install_exe',
                      'file_name': 'git.exe'},
-                    'latex':
+                    'miktex':
                     {'url': 'https://miktex.org/download/ctan/systems/win32/miktex/setup/windows-x64/basic-miktex-21.8-x64.exe',
                      'function': 'install_exe',
                      'file_name': 'miktex.exe'}
                 }
             for tool, parameter in settings.items():
                 file_path = Path().joinpath(temp_dir.name, parameter['file_name'])
-                if not os_tools.is_tool(tool) and kwargs[tool]:
+                if not os_tools.is_tool(tool) and locals()[tool]:
                     print(f'downloading {tool}')
                     download_file(url=parameter['url'],
                                   file_path=file_path)
                     print(f'installing {tool}')
                     installation_function = getattr(os_tools, parameter['function'])
                     installation_function(file_path=file_path)
-                    # install_msi(file_path=file_path)
 
                 else:
                     print(f'{tool} skipped or already installed')
diff --git a/src/codebots/cli/cli.py b/src/codebots/cli/cli.py
@@ -364,17 +364,20 @@ def latexbot():
 
 
 @latexbot.command()
-def configure():
+@click.option('--git', default=True, help='if True, install git')
+@click.option('--pandoc', default=True, help='if True, install pandoc')
+@click.option('--miktex', default=False, help='if True, install miktex')
+def configure(git, pandoc, miktex):
     """Download dependencies and set everything up.\n
     """
     bot = LatexBot()
-    out = bot.install_dependencies(git=True, pandoc=True, latex=False)
+    out = bot.install_dependencies(git, pandoc, miktex)
     click.echo(out)
 
 
 @latexbot.command()
-@click.option('--input', default='None', help='path to the folder containing the .tex files')
-@click.option('--output', default='None', help='path to the folder where the .docx files will be saved')
+@click.option('--input', default=None, help='path to the folder containing the .tex files')
+@click.option('--output', default=None, help='path to the folder where the .docx files will be saved')
 def convert_tex_to_docx(input, output):
     """Convert the .tex files in a folder to .docx.\n
 
@@ -384,9 +387,9 @@ def convert_tex_to_docx(input, output):
         path to the folder containing the .tex files.\n
     """
     bot = LatexBot()
-    if input == 'None':
+    if not input:
         input = os.getcwd()
-    if output == 'None':
+    if not output:  # TODO: change!
         output = None
     out = bot.convert_tex_to_docx(input, output)
     click.echo(out)
diff --git a/src/codebots/utilities/os_tools.py b/src/codebots/utilities/os_tools.py
@@ -1,6 +1,7 @@
 import subprocess
 
 
+### ------------------------ CROSS PLATFORM ---------------------------------###
 def is_tool(name):
     """Check whether `name` is on PATH and marked as executable."""
 
@@ -10,6 +11,7 @@ def is_tool(name):
     return which(name) is not None
 
 
+### ---------------------------- WINDOWS ------------------------------------###
 def install_msi(file_path):
     """Perform a silent install of a msi package (Windows only)
 
@@ -49,6 +51,7 @@ def install_exe(file_path):
     return out
 
 
+### ------------------------------ DEBUG ------------------------------------###
 if __name__ == "__main__":
     # print(is_tool("latexmk"))
     install_exe('c:/temp/miktex.exe')
