oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix importBundle

Browse source 
Avoid using SiteManager as initializing it out of order breaks things
This commit is contained in:
caryoscelus 2023-07-24 08:21:31 +00:00
parent 9444e097a6
commit 2b51e23650
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.py
View file

@ -37,8 +37,14 @@ load_config()
def importBundle(bundle): def importBundle(bundle):
from zipfile import ZipFile from zipfile import ZipFile
from Crypt.CryptBitcoin import isValidAddress from Crypt.CryptBitcoin import isValidAddress
from Site import SiteManager import json
SiteManager.site_manager.load()
sites_json_path = f"{config.data_dir}/sites.json"
try:
with open(sites_json_path) as f:
sites = json.load(f)
except Exception as err:
sites = {}
with ZipFile(bundle) as zf: with ZipFile(bundle) as zf:
all_files = zf.namelist() all_files = zf.namelist()
@ -59,10 +65,11 @@ def importBundle(bundle):
info.filename = tgt info.filename = tgt
zf.extract(info) zf.extract(info)
logging.info(f'add site {d}') logging.info(f'add site {d}')
SiteManager.site_manager.add(d, noload=True) sites[d] = {}
else: else:
logging.info(f'Warning: unknown file in a bundle: {prefix+d}') logging.info(f'Warning: unknown file in a bundle: {prefix+d}')
SiteManager.site_manager.save() with open(sites_json_path, 'w') as f:
json.dump(sites, f)
def init_dirs(): def init_dirs():
data_dir = config.data_dir data_dir = config.data_dir