From 80ffaddb6d5f029829a645ff2fa11084b372bbee Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Sun, 4 Feb 2024 16:09:25 +0300
Subject: [PATCH] v7.1.2.0

Refactor imports and remove redundant paths

This commit updates the sys.path.append and import statements in multiple files for better readability and maintainability. Unused or unnecessary paths were removed, and module imports were restructured for a more logical organization.
---
 api/api.py       | 10 ++--------
 api/api_funct.py | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/api/api.py b/api/api.py
index 0111ed68..653716d2 100644
--- a/api/api.py
+++ b/api/api.py
@@ -2,17 +2,11 @@
 # -*- coding: utf-8 -*-
 import json
 import os
-import sys
 from bottle import route, run, hook, response, request, error
 
 import api_funct
-
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-os.chdir(os.path.dirname(os.path.abspath(__file__)))
-sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app/'))
-
-import modules.db.sql as sql
-import modules.roxywi.common as roxywi_common
+import app.modules.db.sql as sql
+import app.modules.roxywi.common as roxywi_common
 
 _error_auth = '403 Auth before'
 _allow_origin = '*'
diff --git a/api/api_funct.py b/api/api_funct.py
index 3795f538..4b91b15e 100644
--- a/api/api_funct.py
+++ b/api/api_funct.py
@@ -1,24 +1,23 @@
 import os
 import sys
 import json
-import random
 
 from bottle import request
-sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/app/'))
+sys.path.append(os.path.join(sys.path[0], '/var/www/haproxy-wi/'))
 
-import modules.db.sql as sql
-import modules.server.ssh as ssh_mod
-import modules.server.server as server_mod
-import modules.config.section as section_mod
-import modules.config.config as config_mod
-import modules.config.runtime as runtime_mod
-import modules.roxy_wi_tools as roxy_wi_tools
-import modules.roxywi.logs as roxywi_logs
-import modules.roxywi.user as roxywi_user
-import modules.roxywi.common as roxywi_common
-import modules.service.common as service_common
-import modules.service.installation as service_mod
-import modules.service.ha_cluster as ha_cluster
+import app.modules.db.sql as sql
+import app.modules.server.ssh as ssh_mod
+import app.modules.server.server as server_mod
+import app.modules.config.section as section_mod
+import app.modules.config.config as config_mod
+import app.modules.config.runtime as runtime_mod
+import app.modules.roxy_wi_tools as roxy_wi_tools
+import app.modules.roxywi.logs as roxywi_logs
+import app.modules.roxywi.user as roxywi_user
+import app.modules.roxywi.common as roxywi_common
+import app.modules.service.common as service_common
+import app.modules.service.installation as service_mod
+import app.modules.service.ha_cluster as ha_cluster
 
 get_config_var = roxy_wi_tools.GetConfigVar()