Modification in pyros.py to adapt windows install

Alexis Koralewski
1 parent a61943b5
Showing 1 changed file with 14 additions and 8 deletions Show diff stats
pyros.py
@@ -248,6 +248,7 @@ def execProcess(command, from_venv=False, is_async=False):
     log.debug("Executing command" + " [" + command + "]" + from_venv_str)
     if from_venv:
         command = VENV_PYTHON+' ' + command
+    print(f"EXECUTING {command}")
     process = subprocess.Popen(command, shell=True)
     if is_async:
         # current_processes.append(process)
@@ -629,7 +630,7 @@ def install_or_update(UPDATE: bool = False, with_packages: bool = True, with_dat
  
     # Guitastro
     GUITASTRO_PATH = os.path.join(os.getcwd(), "./vendor/guitastro")
-    if not WITH_DOCKER:
+    if with_packages and not WITH_DOCKER :
         #GUITASTRO_PATH = os.path.join(os.getcwd(), "../vendor/guitastro")
         change_dir("..")
     print(os.getcwd())
@@ -674,7 +675,8 @@ def install_or_update(UPDATE: bool = False, with_packages: bool = True, with_dat
     # 4) Update Sphinx API doc
     num += 1
     printFullTerm(Colors.BLUE, f"{num}) UPDATING API DOC (with Sphinx)")
-    _update_api_doc() or die()
+    if not IS_WINDOWS:
+        _update_api_doc() or die()
  
     # 5) Install/Update database structure (make migrations + migrate)
     if with_database:
@@ -1415,10 +1417,9 @@ def install_database(venv):
     # 1) Create databases pyros and pyros_test (but not test_pyros because will be automatically created by django)
     # TODO: Pour mysql < 5.5, comment éviter un "drop database" inutile (si la BD n'existe pas encore) qui va provoquer un plantage mysql ?
     IF_EXISTS = '' if sql_version < 5.5 else 'IF EXISTS'
-    sql_query = \
-        f"DROP DATABASE {IF_EXISTS} {SQL_DATABASE}; CREATE DATABASE {SQL_DATABASE}; " +\
-        f"DROP DATABASE {IF_EXISTS} {SQL_DATABASE_SIMU}; CREATE DATABASE {SQL_DATABASE_SIMU}; " +\
-        f"DROP DATABASE {IF_EXISTS} {SQL_DATABASE_TEST}; CREATE DATABASE {SQL_DATABASE_TEST}; "
+    sql_query = f"DROP DATABASE {IF_EXISTS} {SQL_DATABASE}; CREATE DATABASE {SQL_DATABASE};"
+    sql_query += f"DROP DATABASE {IF_EXISTS} {SQL_DATABASE_SIMU}; CREATE DATABASE {SQL_DATABASE_SIMU};"
+    sql_query += f"DROP DATABASE {IF_EXISTS} {SQL_DATABASE_TEST}; CREATE DATABASE {SQL_DATABASE_TEST};"
  
     # 2) Create user pyros and give it all rights on 3 databases
     # Ne marche pas si l'utilisateur existe déjà => erreur
@@ -1511,7 +1512,11 @@ def install_database(venv):
         # --- The user pyros must be created in the database
         print(Colors.LOG_BLUE + "-----------------------------Please enter your MYSQL root password-----------------------------" + Colors.END)
         # process = subprocess.Popen("echo \"" + sql_query + "\" |"+ mysql_call_root, shell=True)
-        sql_cmd = 'echo "' + sql_query + '" | ' + mysql_call_root
+        if IS_WINDOWS:
+            mysql_call_root = f"mysql -h {mysql_host} -u '{mysql_login}' -p{mysql_root_password}"
+            sql_cmd = 'echo ' + sql_query + ' | ' + mysql_call_root    
+        else:
+            sql_cmd = 'echo "' + sql_query + '" | ' + mysql_call_root
         print("Executing sql cmd: ", sql_cmd)
         process = subprocess.Popen(sql_cmd, shell=True)
         process.wait()
@@ -1541,7 +1546,8 @@ def install_database(venv):
     # TODO: from venv !!!
     try:
         # os.system(GLOBAL_PYTHON+" pyros.py init_database")
-        res = os.system(GLOBAL_PYTHON+" pyros.py initdb")
+        res = execProcessFromVenv("pyros.py initdb")
+        #res = os.system(GLOBAL_PYTHON+" pyros.py initdb")
         return res
         '''
         process = subprocess.Popen(GLOBAL_PYTHON + " pyros.py init_database"  , shell=True)