Skip to content

Commit 47eb247

Browse files
fix(Config): refactor project/data_folder_path
1 parent 5b6e953 commit 47eb247

2 files changed

Lines changed: 8 additions & 14 deletions

File tree

src/opengeodeweb_viewer/app.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,11 @@ def run_server(Server: type[ServerProtocol] = _Server) -> None:
207207
args = parser.parse_args()
208208

209209
if not "host" in args:
210-
args.host = os.environ["DEFAULT_HOST"]
210+
args.host = os.environ["HOST"]
211211
if not "port" in args or args.port == 8080:
212-
args.port = os.environ.get("DEFAULT_PORT")
213-
if "data_folder_path" in args and args.data_folder_path:
214-
os.environ["DATA_FOLDER_PATH"] = args.data_folder_path
212+
args.port = os.environ.get("PORT")
213+
if "project_folder_path" in args and args.project_folder_path:
214+
os.environ["PROJECT_FOLDER_PATH"] = args.project_folder_path
215215

216216
db_full_path = os.path.join(os.environ["DATA_FOLDER_PATH"], "project.db")
217217
connection.init_database(db_full_path, create_tables=False)

src/opengeodeweb_viewer/config.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,17 @@
44

55

66
def default_config() -> None:
7-
os.environ["DEFAULT_HOST"] = "localhost"
8-
os.environ["DEFAULT_PORT"] = "1234"
7+
os.environ["HOST"] = "localhost"
8+
os.environ["PORT"] = "1234"
9+
os.environ["DATA_FOLDER_PATH"] = os.path.join(os.environ["PROJECT_FOLDER_PATH"], "data")
910

1011

1112
def prod_config() -> None:
1213
default_config()
13-
os.environ["DATA_FOLDER_PATH"] = "/data/"
14-
14+
os.environ["PROJECT_FOLDER_PATH"] = "/project/"
1515

1616
def dev_config() -> None:
1717
default_config()
18-
if platform == "linux":
19-
os.environ["DATA_FOLDER_PATH"] = "/temp/OpenGeodeWeb_Data/"
20-
elif platform == "win32":
21-
os.environ["DATA_FOLDER_PATH"] = os.path.join(
22-
"C:/Users", os.getlogin(), "OpenGeodeWeb_Data"
23-
)
2418
data_folder_path = os.environ.get("DATA_FOLDER_PATH")
2519
if data_folder_path and not os.path.exists(data_folder_path):
2620
os.mkdir(data_folder_path)

0 commit comments

Comments
 (0)