From e83bee6b08d7adbe7f50c3d34238ecb6c13ee671 Mon Sep 17 00:00:00 2001 From: justuser Date: Mon, 19 Aug 2024 14:17:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D0=B5=D0=B5=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D0=B5=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=81=D0=BE=D0=BC=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=B0=20-?= =?UTF-8?q?=20base=5Furl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.py | 8 ++++---- interface.py | 6 +++--- srv_interface.py | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/db.py b/db.py index 8636066..f13a56e 100644 --- a/db.py +++ b/db.py @@ -2,19 +2,19 @@ import os import json if not os.path.exists('config.json'): - db = {"os": None,"our_port": 0000, "ports": [], "domain": "http://0.0.0.0:8000"} + db = {'os': None,'our_port': 0000, 'ports': [], 'base_url': 'http://0.0.0.0:8000'} js = json.dumps(db, indent=2) - with open("config.json", "w") as outfile: + with open('config.json', 'w') as outfile: outfile.write(js) print('Created new config.json') def read(file = 'config.json'): - with open(file, "r", encoding="utf-8") as openfile: + with open(file, 'r', encoding='utf-8') as openfile: db = json.load(openfile) return db def write(db, file = 'config.json'): js = json.dumps(db, indent=2, ensure_ascii=False) - with open(file, "w", encoding="utf-8") as outfile: + with open(file, 'w', encoding='utf-8') as outfile: outfile.write(js) diff --git a/interface.py b/interface.py index de74d1a..c9219ad 100644 --- a/interface.py +++ b/interface.py @@ -67,11 +67,11 @@ def update_servers(n): Input('interval-component', 'n_intervals'), Input('search', 'value')) def update_sites(n, s_val): - # Домен по умолчанию - domain = read()['domain'] + # Префикс + base_url = read()['base_url'] # Если есть элемент в поиске if s_val: - return html.Div([ dcc.Link(children=i, href=f'{domain}/{s_val}', + return html.Div([ dcc.Link(children=i, href=f'{base_url}/{s_val}', target='_blank') ], className='sites_elem') res = [] diff --git a/srv_interface.py b/srv_interface.py index 42e8550..810e7c1 100644 --- a/srv_interface.py +++ b/srv_interface.py @@ -52,11 +52,11 @@ def update_servers(n): Input('interval-component', 'n_intervals'), Input('search', 'value')) def update_sites(n, s_val): - # Домен по умолчанию - domain = read()['domain'] + # Префикс + base_url = read()['base_url'] # Если есть элемент в поиске if s_val: - return html.Div([ dcc.Link(children=i, href=f'{domain}/{s_val}', + return html.Div([ dcc.Link(children=i, href=f'{base_url}/{s_val}', target='_blank') ], className='sites_elem') res = []