From bd0e1ad0caf954a072c37b5fa3f21c4abc7b99bd Mon Sep 17 00:00:00 2001
From: Mark Qvist <bc7291552be7a58f361522990465165c>
Date: Tue, 12 May 2026 21:05:15 +0200
Subject: [PATCH] Better workdoc page handling

---
 RNS/Utilities/rngit/pages.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/RNS/Utilities/rngit/pages.py b/RNS/Utilities/rngit/pages.py
index c270ebd1..fabf4f7b 100644
--- a/RNS/Utilities/rngit/pages.py
+++ b/RNS/Utilities/rngit/pages.py
@@ -1406,7 +1406,7 @@ class NomadNetworkNode():
         group_name = data.get("var_g", "") if data else ""
         repo_name  = data.get("var_r", "") if data else ""
         doc_id     = data.get("var_id", "") if data else ""
-        scope      = data.get("var_scope", "active") if data else "active"
+        scope      = data.get("var_scope", "all") if data else "all"
         if scope not in ["active", "completed", "all"]: scope = "active"
 
         if not group_name or not repo_name or not doc_id:
@@ -1424,7 +1424,19 @@ class NomadNetworkNode():
             return self.render_template(content, st=st)
 
         work_path = f"{repo['path']}.work"
-        doc_dir = os.path.join(work_path, scope, str(doc_id))
+        active_dir = os.path.join(work_path, "active", str(doc_id))
+        completed_dir = os.path.join(work_path, "completed", str(doc_id))
+        if   scope == "active":    doc_dir = active_dir
+        elif scope == "completed": doc_dir = completed_dir
+        elif scope == "all":
+            if os.path.isdir(active_dir):
+                doc_dir = active_dir
+                scope = "active"
+
+            else:
+                doc_dir = completed_dir
+                scope = "completed"
+
         root_path = os.path.join(doc_dir, "root")
 
         if not os.path.isfile(root_path):
@@ -1511,7 +1523,7 @@ class NomadNetworkNode():
         st = time.time()
         RNS.log(f"Artifact file request from {remote_identity}", RNS.LOG_DEBUG)
 
-        if not data: data = {}
+        if not data or not type(data) == dict: data = {}
         group_name = data.get("var_g", "") if data else ""
         repo_name = data.get("var_r", "") if data else ""
         tag = data.get("var_t", "") if data else ""
@@ -1567,6 +1579,7 @@ class NomadNetworkNode():
         st = time.time()
         RNS.log(f"File download request from {remote_identity}", RNS.LOG_DEBUG)
 
+        if not data or not type(data) == dict: data = {}
         group_name = data.get("var_g", "")   if data else ""
         repo_name = data.get("var_r", "")    if data else ""
         ref = data.get("var_ref", "HEAD")    if data else "HEAD"