Update app.py

Author: mechkeyswest

app.py

@@ -40,12 +40,10 @@ def load_db():
             if "mod_library" not in data: data["mod_library"] = []
             if "server_configs" not in data: data["server_configs"] = []
             if "projects" not in data: data["projects"] = []
-            
             for m in data.get("mods", []):
                 if "read" not in m: m["read"] = True
             for p in data.get("projects", []):
                 if "read" not in p: p["read"] = True
-                
             return data
     except json.JSONDecodeError: return {} 
 
@@ -82,6 +80,48 @@ def fetch_mod_details(mod_input):
     except Exception as e:
         return mod_id, None, None, str(e)
 
+# --- SMART JSON INSERTER (FIXES BRACKET ISSUES) ---
+def inject_mod(current_text, mod_obj):
+    """
+    Intelligently inserts a mod object into a JSON list string.
+    Handles trailing whitespace and malformed JSON better.
+    """
+    # 1. Clean input
+    s = current_text.strip()
+    
+    # 2. Try Strict Parse (Best Case)
+    try:
+        data = json.loads(s)
+        if isinstance(data, list):
+            data.append(mod_obj)
+            return json.dumps(data, indent=4)
+    except:
+        pass # Fallback to string manipulation if JSON is currently invalid (common while editing)
+
+    # 3. String Manipulation Fallback
+    snippet = json.dumps(mod_obj, indent=4)
+    
+    if s.endswith("]"):
+        # We found the end of the list.
+        # Check if list is effectively empty "[]"
+        if len(s) < 3:
+            return f"[\n{snippet}\n]"
+        
+        # Peel off the last ']'
+        # rstrip() removes whitespace/newlines before the bracket to prevent weird gaps
+        content = s[:-1].rstrip()
+        
+        # Add comma, new object, and close bracket
+        return f"{content},\n{snippet}\n]"
+    
+    elif not s:
+        # Empty editor -> Start new list
+        return f"[\n{snippet}\n]"
+    
+    else:
+        # No closing bracket found? Just append (Safe fallback)
+        return s + ",\n" + snippet
+
 # --- LOCAL SESSION STATE ---
 if "logged_in" not in st.session_state: st.session_state.logged_in = False
 if "current_user" not in st.session_state: st.session_state.current_user = None
@@ -90,7 +130,6 @@ def fetch_mod_details(mod_input):
 if "selected_project_id" not in st.session_state: st.session_state.selected_project_id = None
 if "editor_content" not in st.session_state: st.session_state.editor_content = "[\n\n]"
 if "fetched_mod" not in st.session_state: st.session_state.fetched_mod = None
-# KEY FIX: Refresh counter to force text area update
 if "editor_key" not in st.session_state: st.session_state.editor_key = 0 
 
 # --- CALLBACK TO SYNC EDITOR ---
@@ -205,18 +244,14 @@ def get_mod_status():
 
 st.sidebar.button("📢 Announcements", on_click=navigate_to, args=("view_announcements",))
 
-# MOVED: Mod Studio to Top (Super Admin Only)
 if user_role == "SUPER_ADMIN":
     st.sidebar.button("📝 Mod Studio", on_click=navigate_to, args=("json_editor",))
 
-# --- ADMIN SECTION ---
 if user_role in ["admin", "SUPER_ADMIN"]:
     st.sidebar.subheader("Server Admin")
     st.sidebar.button(f"{get_mod_status()} Report Broken Mod", on_click=navigate_to, args=("report_broken_mod", None))
-    # NEW JOB BUTTON (ADMIN ONLY)
     st.sidebar.button("🚀 Submit New Job", on_click=navigate_to, args=("create_project",))
 
-# --- CLP SECTION ---
 if user_role in ["CLPLEAD", "SUPER_ADMIN", "CLP"]:
     st.sidebar.subheader("CLP Management")
     if user_role in ["CLPLEAD", "SUPER_ADMIN"]:
@@ -259,70 +294,48 @@ def get_mod_status():
             st.caption(f"{a['date']} by {a['author']}")
             st.markdown(a['content'], unsafe_allow_html=True)
 
-# --- CREATE PROJECT PAGE (Saves to PROJECTS) ---
 elif st.session_state.page == "create_project":
     st.title("🚀 Submit New Job / Project")
     st.caption("This will create a task in the 'New Work' tab.")
-    
     with st.container(border=True):
         p_name = st.text_input("Project Title")
         p_assign = st.text_input("Lead Developer/Assignee")
         p_sev = st.slider("Severity / Priority", 1, 10, 5)
         st.write("Project Brief:")
         p_desc = st_quill(key="proj_desc_page", html=True)
-        
         if st.button("Create Project", type="primary"):
-            # SAVE TO 'projects' ONLY
             DB['projects'].append({
-                "id": len(DB['projects']),
-                "name": p_name,
-                "assigned": p_assign,
-                "severity": p_sev,
-                "description": p_desc,
-                "complete": False,
-                "discussion": [],
-                "read": False
+                "id": len(DB['projects']), "name": p_name, "assigned": p_assign, "severity": p_sev,
+                "description": p_desc, "complete": False, "discussion": [], "read": False
             })
             save_db(DB)
             st.success("Project Created! Saved to New Work.")
             st.session_state.page = "view_projects"
             st.rerun()
 
-# --- REPORT BROKEN MOD PAGE (Saves to MODS) ---
 elif st.session_state.page == "report_broken_mod":
     st.title("Report Broken Mod")
     st.caption("This will create a ticket in the 'Broken Mods' tab.")
-    
     name = st.text_input("Mod Name")
     json_code = st.text_area("JSON Code", height=100)
     sev = st.slider("Severity", 1, 10)
     assign = st.text_input("Assign To")
     st.write("Description:")
     desc = st_quill(key="mod_desc", html=True)
     if st.button("Submit Report"):
-        # SAVE TO 'mods' ONLY
         DB['mods'].append({
-            "id": len(DB['mods']), 
-            "name": name, 
-            "json_data": json_code, 
-            "severity": sev, 
-            "assignment": assign, 
-            "description": desc, 
-            "complete": False, 
-            "discussion": [],
-            "read": False
+            "id": len(DB['mods']), "name": name, "json_data": json_code, "severity": sev,
+            "assignment": assign, "description": desc, "complete": False, "discussion": [], "read": False
         })
         save_db(DB)
         st.success("Submitted! Saved to Broken Mods.")
         st.session_state.page = "view_broken_mods"
         st.rerun()
 
-# --- VIEW BROKEN MODS (Reads from MODS) ---
 elif st.session_state.page == "view_broken_mods":
     if user_role not in ["admin", "SUPER_ADMIN"]: st.error("Access Denied.")
     else:
         st.title("Active Broken Mods")
-        # READ FROM 'mods' ONLY
         active = [m for m in DB['mods'] if not m['complete']]
         if not active: st.success("No active issues.")
         for m in active:
@@ -333,17 +346,12 @@ def get_mod_status():
                     st.subheader(f"{prefix}{m['name']}")
                     st.caption(f"Severity: {m['severity']} | Assigned: {m['assignment']}")
                 with c2: 
-                    if st.button("Details", key=f"d_{m['id']}", on_click=navigate_to, args=("mod_detail", m['id'], None)):
-                        pass
+                    if st.button("Details", key=f"d_{m['id']}", on_click=navigate_to, args=("mod_detail", m['id'], None)): pass
 
-# --- VIEW PROJECTS (Reads from PROJECTS) ---
 elif st.session_state.page == "view_projects":
     st.title("New Work / Active Projects")
-    # READ FROM 'projects' ONLY
     active_projs = [p for p in DB['projects'] if not p['complete']]
-    
-    if not active_projs:
-        st.info("No active projects.")
+    if not active_projs: st.info("No active projects.")
     else:
         for p in active_projs:
             with st.container(border=True):
@@ -354,10 +362,8 @@ def get_mod_status():
                     sev = p.get('severity', 1)
                     st.caption(f"Lead: {p['assigned']} | Severity: {sev}/10")
                 with c2:
-                    if st.button("Open", key=f"p_{p['id']}", on_click=navigate_to, args=("project_detail", None, p['id'])):
-                        pass
+                    if st.button("Open", key=f"p_{p['id']}", on_click=navigate_to, args=("project_detail", None, p['id'])): pass
 
-# --- VIEW FIXED MODS ---
 elif st.session_state.page == "view_fixed_mods":
     if user_role not in ["admin", "SUPER_ADMIN"]: st.error("Access Denied.")
     else:
@@ -370,15 +376,12 @@ def get_mod_status():
                 with c1: st.subheader(f"✅ {m['name']}")
                 with c2: st.button("Archive View", key=f"a_{m['id']}", on_click=navigate_to, args=("mod_detail", m['id'], None))
 
-# --- MOD DETAIL ---
 elif st.session_state.page == "mod_detail":
     m = next((x for x in DB['mods'] if x['id'] == st.session_state.selected_mod_id), None)
-    
     if m and not m.get('read', True) and user_role in ["admin", "SUPER_ADMIN"]:
         m['read'] = True
         save_db(DB)
         st.rerun()
-
     if m:
         st.title(f"Issue: {m['name']}")
         c1, c2 = st.columns([2,1])
@@ -404,25 +407,20 @@ def get_mod_status():
         with c2:
             st.subheader("Discussion")
             chat = st.container(height=400, border=True)
-            for msg in m.get('discussion', []):
-                chat.markdown(f"**{msg['user']}**: {msg['text']}")
-            
+            for msg in m.get('discussion', []): chat.markdown(f"**{msg['user']}**: {msg['text']}")
             with st.form("chat"):
                 txt = st.text_input("Message")
                 if st.form_submit_button("Send") and txt:
                     m.setdefault('discussion', []).append({"user": USER_NAME, "text": txt, "time": str(datetime.now())})
                     save_db(DB)
                     st.rerun()
 
-# --- PROJECT DETAIL ---
 elif st.session_state.page == "project_detail":
     p = next((x for x in DB['projects'] if x['id'] == st.session_state.selected_project_id), None)
-    
     if p and not p.get('read', True) and user_role in ["admin", "SUPER_ADMIN"]:
         p['read'] = True
         save_db(DB)
         st.rerun()
-
     if p:
         st.title(f"Project: {p['name']}")
         c1, c2 = st.columns([2,1])
@@ -438,15 +436,11 @@ def get_mod_status():
                     st.success("Completed!")
                     st.session_state.page = "view_projects"
                     st.rerun()
-            else:
-                st.success("Project Completed.")
+            else: st.success("Project Completed.")
         with c2:
             st.subheader("Discussion")
-            # Unified Chat Style (No Dividers)
             chat = st.container(height=400, border=True)
-            for msg in p.get('discussion', []):
-                chat.markdown(f"**{msg['user']}**: {msg['text']}")
-            
+            for msg in p.get('discussion', []): chat.markdown(f"**{msg['user']}**: {msg['text']}")
             with st.form("p_chat"):
                 txt = st.text_input("Message")
                 if st.form_submit_button("Send") and txt:
@@ -554,7 +548,7 @@ def get_mod_status():
                         found = next((c for c in DB['server_configs'] if c['name'] == selected_conf), None)
                         if found:
                             st.session_state.editor_content = found['content']
-                            st.session_state.editor_key += 1 # INCREMENT KEY
+                            st.session_state.editor_key += 1
                             st.success(f"Loaded '{selected_conf}'!")
                             st.rerun()
                 with c_save:
@@ -576,48 +570,41 @@ def get_mod_status():
             st.subheader("Active JSON Editor")
             st.caption("Press 'Ctrl+A' then 'Ctrl+C' inside the box to copy everything.")
 
-            # --- FIX: DYNAMIC KEY TO FORCE UPDATE ---
             json_text = st.text_area(
                 "JSON Output", 
                 value=st.session_state.editor_content, 
                 height=600, 
-                key=f"json_area_{st.session_state.editor_key}", # DYNAMIC KEY
+                key=f"json_area_{st.session_state.editor_key}", 
                 on_change=sync_editor
             )
 
         with col_tools:
+            # FIX: Place Tabs OUTSIDE the scrollable container
             tab_search, tab_saved, tab_import = st.tabs(["🌐 Search", "💾 Library", "📥 Import"])
 
             with tab_search:
                 st.info("💡 **Tip:** Type a name to find the link, then Paste the URL to fetch data.")
                 search_term = st.text_input("1. Search Term", placeholder="e.g. RHS Status Quo")
                 if search_term:
                     st.link_button(f"🌐 Open Search: '{search_term}'", f"https://reforger.armaplatform.com/workshop?search={search_term}")
-                
                 st.divider()
                 st.write("**2. Paste Workshop URL**")
                 fetch_url = st.text_input("Paste URL here to auto-fetch", placeholder="https://reforger.armaplatform.com/workshop/...")
-                
                 if st.button("🚀 Fetch Details"):
                     if fetch_url:
                         mid, mname, mimg, mver = fetch_mod_details(fetch_url)
                         if mname:
-                            st.session_state.fetched_mod = {
-                                "modId": mid, "name": mname, "version": mver, "image_url": mimg
-                            }
+                            st.session_state.fetched_mod = {"modId": mid, "name": mname, "version": mver, "image_url": mimg}
                             st.success("Found!")
                         else: st.error("Could not find mod. Check URL.")
 
-                # Scrollable results for search
                 with st.container(height=500, border=True):
                     if st.session_state.fetched_mod:
                         mod = st.session_state.fetched_mod
                         if mod['image_url']: st.image(mod['image_url'])
                         st.subheader(mod['name'])
-                        
                         clean_mod = {"modId": mod['modId'], "name": mod['name'], "version": ""}
                         st.code(json.dumps(clean_mod, indent=4), language='json')
-                        
                         c1, c2 = st.columns(2)
                         with c1:
                             if st.button("💾 Save to Library"):
@@ -626,54 +613,36 @@ def get_mod_status():
                                 st.success("Saved!")
                         with c2:
                             if st.button("➕ Add to Editor"):
-                                snippet = json.dumps(clean_mod, indent=4)
-                                cur = st.session_state.editor_content.strip()
-                                if not cur: cur = "[]"
-                                if cur.endswith("]"): 
-                                    if len(cur) > 2: new_s = cur[:-1] + ",\n" + snippet + "\n]"
-                                    else: new_s = "[\n" + snippet + "\n]"
-                                else: new_s = cur + ",\n" + snippet
-                                st.session_state.editor_content = new_s
-                                st.session_state.editor_key += 1 # TRIGGER REFRESH
+                                new_text = inject_mod(st.session_state.editor_content, clean_mod)
+                                st.session_state.editor_content = new_text
+                                st.session_state.editor_key += 1
                                 st.rerun()
 
             with tab_saved:
                 lib_search = st.text_input("Filter Library", placeholder="Filter by name...")
-                
                 filtered = sorted(
                     [m for m in DB['mod_library'] if lib_search.lower() in m.get('name','').lower()],
                     key=lambda x: x.get('name', '').lower()
                 )
-                
                 with st.container(height=600, border=True):
                     if not filtered: st.info("No saved mods.")
                     for mod in filtered:
                         with st.container(border=True):
                             c_info, c_add, c_copy, c_del = st.columns([3, 1, 1, 1], vertical_alignment="center")
-                            
                             with c_info:
                                 st.write(f"**{mod['name']}**")
                                 mini_json = {"modId": mod['modId'], "name": mod['name'], "version": ""}
                                 json_str = json.dumps(mini_json, indent=4)
-
                             with c_add:
                                 if st.button("➕", key=f"ins_{mod['modId']}", help="Insert into Editor", use_container_width=True):
-                                    snippet = json_str
-                                    cur = st.session_state.editor_content.strip()
-                                    if not cur: cur = "[]"
-                                    if cur.endswith("]"): 
-                                        if len(cur) > 2: new_s = cur[:-1] + ",\n" + snippet + "\n]"
-                                        else: new_s = "[\n" + snippet + "\n]"
-                                    else: new_s = cur + ",\n" + snippet
-                                    st.session_state.editor_content = new_s
-                                    st.session_state.editor_key += 1 # TRIGGER REFRESH
+                                    new_text = inject_mod(st.session_state.editor_content, mini_json)
+                                    st.session_state.editor_content = new_text
+                                    st.session_state.editor_key += 1
                                     st.rerun()
-                            
                             with c_copy:
                                 with st.popover("📋", use_container_width=True):
                                     st.code(json_str, language='json')
                                     st.caption("Click the icon in the corner to copy.")
-
                             with c_del:
                                 if st.button("🗑️", key=f"rm_{mod['modId']}", help="Delete from Library", use_container_width=True):
                                     idx = DB['mod_library'].index(mod)
@@ -685,7 +654,6 @@ def get_mod_status():
                 st.subheader("Batch Importer")
                 st.caption("Paste a full JSON file or a list of mods. We will extract every mod block and save it to your library.")
                 import_text = st.text_area("Paste JSON Here", height=300)
-                
                 if st.button("Process & Import Mods", type="primary"):
                     try:
                         pattern = r'\{[^{}]*"modId"[^{}]*\}'