From 2518867d5071aca874ae7b11b9e6600177eab855 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Mon, 15 Oct 2018 12:58:14 +0200 Subject: [PATCH] Allow to also list connecting site with siteList API command --- src/Ui/UiWebsocket.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py index 17d22152..6c1b0f1b 100644 --- a/src/Ui/UiWebsocket.py +++ b/src/Ui/UiWebsocket.py @@ -275,7 +275,7 @@ class UiWebsocket(object): # Format site info def formatSiteInfo(self, site, create_user=True): - content = site.content_manager.contents.get("content.json") + content = site.content_manager.contents.get("content.json", {}) if content: # Remove unnecessary data transfer content = content.copy() content["files"] = len(content.get("files", {})) @@ -844,12 +844,12 @@ class UiWebsocket(object): self.response(to, "ok") # List all site info - def actionSiteList(self, to): + def actionSiteList(self, to, connecting_sites=False): ret = [] SiteManager.site_manager.load() # Reload sites for site in self.server.sites.values(): - if not site.content_manager.contents.get("content.json"): - continue # Broken site + if not site.content_manager.contents.get("content.json") and not connecting_sites: + continue # Incomplete site ret.append(self.formatSiteInfo(site, create_user=False)) # Dont generate the auth_address on listing self.response(to, ret)