Merge pull request #7937 from Ccomp5950/cached_json

Cached json (Improvements for camera monitor and PDA - Manifest)

code/modules/nano/JSON Writer.dm

@@ -1,7 +1,7 @@
 
 json_writer
 	proc
-		WriteObject(list/L)
+		WriteObject(list/L, cached_data = null)
 			. = "{"
 			var/i = 1
 			for(var/k in L)
@@ -9,7 +9,9 @@ json_writer
 				. += {"\"[k]\":[write(val)]"}
 				if(i++ < L.len)
 					. += ","
-			.+= "}"
+			if(cached_data)
+				. = copytext(., 1, lentext(.)) + ",\"cached\":[cached_data]}"
+			. += "}"
 
 		write(val)
 			if(isnum(val))

code/modules/nano/_JSON.dm

@@ -7,6 +7,6 @@ proc
 		var/static/json_reader/_jsonr = new()
 		return _jsonr.ReadObject(_jsonr.ScanJson(json))
 
-	list2json(list/L)
+	list2json(list/L, var/cached_data = null)
 		var/static/json_writer/_jsonw = new()
-		return _jsonw.WriteObject(L)
+		return _jsonw.WriteObject(L, cached_data)

code/modules/nano/nanoui.dm

@@ -57,6 +57,8 @@ nanoui is used to open and update nano browser uis
 	// the current status/visibility of the ui
 	var/status = STATUS_INTERACTIVE
 
+	var/cached_data = null
+
 	// Only allow users with a certain user.stat to get updates. Defaults to 0 (concious)
 	var/allowed_user_stat = 0 // -1 = ignore, 0 = alive, 1 = unconcious or alive, 2 = dead concious or alive
 
@@ -366,7 +368,7 @@ nanoui is used to open and update nano browser uis
 		template_data_json = list2json(templates)
 
 	var/list/send_data = get_send_data(initial_data)
-	var/initial_data_json = list2json(send_data)
+	var/initial_data_json = list2json(send_data, cached_data)
 
 	var/url_parameters_json = list2json(list("src" = "\ref[src]"))
 
@@ -442,6 +444,19 @@ nanoui is used to open and update nano browser uis
 
 	winset(user, window_id, "on-close=\"nanoclose [params]\"")
 
+/**
+ * Appends already processed json txt to the list2json proc when setting initial-data and data pushes
+ * Used for data that is fucking huge like manifests and camera lists that doesn't change often.
+ * And we only want to process them when they change.
+ * Fuck javascript
+ *
+ * @return nothing
+ */
+/datum/nanoui/proc/load_cached_data(var/data)
+	cached_data = data
+	return
+
+
  /**
   * Push data to an already open UI window
   *
@@ -455,7 +470,7 @@ nanoui is used to open and update nano browser uis
 	var/list/send_data = get_send_data(data)
 
 	//user << list2json(data) // used for debugging
-	user << output(list2params(list(list2json(send_data))),"[window_id].browser:receiveUpdateData")
+	user << output(list2params(list(list2json(send_data,cached_data))),"[window_id].browser:receiveUpdateData")
 
  /**
   * This Topic() proc is called whenever a user clicks on a link within a Nano UI