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

New updater that supports updating bundle files

Browse source
This commit is contained in:
shortcutme 2019-05-30 04:29:47 +02:00
parent 6c4440c2d1
commit d1e404f093
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 88 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
update.py
View file

@ -3,8 +3,10 @@ import sys
import json
import re
def update():
from Config import config
config.parse()
if getattr(sys, 'source_update_dir', False):
if not os.path.isdir(sys.source_update_dir):
@ -13,19 +15,23 @@ def update():
else:
source_path = os.getcwd().rstrip("/")
runtime_path = os.path.dirname(sys.executable)
updatesite_path = config.data_dir + "/" + config.updatesite
sites_json = json.load(open(config.data_dir + "/sites.json"))
updatesite_bad_files = sites_json.get(config.updatesite, {}).get("cache", {}).get("bad_files", {})
print(
"Update site path: %s, bad_files: %s, source path: %s, dist type: %s" %
(updatesite_path, len(updatesite_bad_files), source_path, config.dist_type)
"Update site path: %s, bad_files: %s, source path: %s, runtime path: %s, dist type: %s" %
(updatesite_path, len(updatesite_bad_files), source_path, runtime_path, config.dist_type)
)
inner_paths = json.load(open(updatesite_path + "/content.json"))["files"].keys()
updatesite_content_json = json.load(open(updatesite_path + "/content.json"))
inner_paths = list(updatesite_content_json.get("files", {}).keys())
inner_paths += list(updatesite_content_json.get("files_optional", {}).keys())
# Keep file only in ZeroNet directory
inner_paths = [inner_path for inner_path in inner_paths if inner_path.startswith("core/")]
inner_paths = [inner_path for inner_path in inner_paths if re.match("^(core|bundle)", inner_path)]
# Checking plugins
plugins_enabled = []
@ -38,12 +44,20 @@ def update():
plugins_enabled.append(dir)
print("Plugins enabled:", plugins_enabled, "disabled:", plugins_disabled)
update_paths = {}
for inner_path in inner_paths:
if ".." in inner_path:
continue
inner_path = inner_path.replace("\\", "/").strip("/") # Make sure we have unix path
print(".", end=" ")
dest_path = source_path + "/" + re.sub("^(core|platform/[^/]+/)/", "", inner_path)
if inner_path.startswith("core"):
dest_path = source_path + "/" + re.sub("^core/", "", inner_path)
elif inner_path.startswith(config.dist_type):
dest_path = runtime_path + "/" + re.sub("^bundle[^/]+/", "", inner_path)
else:
continue
if not dest_path:
continue
@ -58,32 +72,40 @@ def update():
print("P", end=" ")
dest_dir = os.path.dirname(dest_path)
print(updatesite_path + "/" + inner_path, "->", dest_path)
if dest_dir and not os.path.isdir(dest_dir):
os.makedirs(dest_dir)
if dest_dir != dest_path.strip("/"):
data = open(updatesite_path + "/" + inner_path, "rb").read()
update_paths[updatesite_path + "/" + inner_path] = dest_path
num_ok = 0
num_rename = 0
num_error = 0
for path_from, path_to in update_paths.items():
print("-", path_from, "->", path_to)
data = open(path_from, "rb").read()
try:
open(dest_path, 'wb').write(data)
open(path_to, 'wb').write(data)
num_ok += 1
except Exception as err:
print(dest_path, err)
try:
print("Error writing: %s. Renaming old file to avoid lock on Windows..." % err)
path_to_tmp = path_to + "-old"
if os.path.isfile(path_to_tmp):
os.unlink(path_to_tmp)
os.rename(path_to, path_to_tmp)
num_rename += 1
open(path_to, 'wb').write(data)
print("Write done after rename!")
num_ok += 1
except Exception as err:
print("Write error after rename: %s" % err)
num_error += 1
print("* Updated files: %s, renamed: %s, error: %s" % (num_ok, num_rename, num_error))
print("Done.")
return False
if __name__ == "__main__":
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src")) # Imports relative to src
from gevent import monkey
monkey.patch_all()
from Config import config
config.parse(silent=True)
try:
update()
except Exception as err:
print("Update error: %s" % err)

54
zeronet.py
View file

@ -15,25 +15,8 @@ def main():
main = None
try:
app_dir = os.path.dirname(os.path.abspath(__file__))
os.chdir(app_dir) # Change working dir to zeronet.py dir
sys.path.insert(0, os.path.join(app_dir, "src/lib")) # External liblary directory
sys.path.insert(0, os.path.join(app_dir, "src")) # Imports relative to src
import main
main.start()
if main.update_after_shutdown: # Updater
import gc
import update
# Close lock file
main.lock.close()
# Update
try:
update.update()
except Exception as err:
print("Update error: %s" % err)
except Exception as err: # Prevent closing
import traceback
try:
@ -46,10 +29,23 @@ def main():
traceback.print_exc(file=open(config.log_dir + "/error.log", "a"))
if main and (main.update_after_shutdown or main.restart_after_shutdown): # Updater
import atexit
if main.update_after_shutdown:
import update
if sys.platform.startswith("win"):
update.update(restart_win=True)
else:
update.update()
restart()
else:
print("Restarting...")
restart()
def restart():
if "main" in sys.modules:
import atexit
# Close log files
logger = main.logging.getLogger()
logger = sys.modules["main"].logging.getLogger()
for handler in logger.handlers[:]:
handler.flush()
@ -59,7 +55,8 @@ def main():
atexit._run_exitfuncs()
import time
time.sleep(1) # Wait files to close
args = sys.argv[:]
args = [arg for arg in sys.argv[:] if arg not in ("--open_browser", "default_browser")]
sys.executable = sys.executable.replace(".pkg", "") # Frozen mac fix
@ -77,5 +74,20 @@ def main():
print("Bye.")
if __name__ == '__main__':
def start():
app_dir = os.path.dirname(os.path.abspath(__file__))
os.chdir(app_dir) # Change working dir to zeronet.py dir
sys.path.insert(0, os.path.join(app_dir, "src/lib")) # External liblary directory
sys.path.insert(0, os.path.join(app_dir, "src")) # Imports relative to src
if "--update" in sys.argv:
sys.argv.remove("--update")
print("Updating...")
import update
update.update()
else:
main()
if __name__ == '__main__':
start()