cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 10:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Caches data for paintings we have saved [MDB IGNORE] (#24766)

Browse Source 
* Caches data for paintings we have saved (#79495)

## About The Pull Request
We got some reports about a server lagging, the cause was determined to
be TGUI. Potato figured out it was the painting manager, and I was able
to recreate the lag by just quickly scrolling through the 1200+
paintings on Manuel via a curator console. Please don't do this btw.

## Why It's Good For The Game
Allow people to scrub through the painting gallery without lagging the
server.

## Changelog
🆑 Tattle
fix: you should now be able to scrub through the library without lagging
the server
/🆑

---------

Co-authored-by: tattle <article.disaster@ gmail.com>
Co-authored-by: san7890 <the@ san7890.com>

* Caches data for paintings we have saved

---------

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: tattle <article.disaster@ gmail.com>
Co-authored-by: san7890 <the@ san7890.com>
This commit is contained in:
SkyratBot
2023-11-04 00:36:16 +01:00
committed by GitHub
parent 69cd75f31a
commit df1a3670d8
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
code/controllers/subsystem/persistent_paintings.dm
View File

@@ -113,6 +113,11 @@ SUBSYSTEM_DEF(persistent_paintings)
/// A list of /datum/paintings saved or ready to be saved this round.
var/list/paintings = list()
/// A list of paintings' data for paintings that are currently stored in the library.
var/list/cached_painting_data = list()
/// A list of paintings' data for paintings that are currently stored in the library, with admin metadata
var/list/admin_painting_data = list()
///The list of available frame reskins (they are purely cosmetic) and the associated patronage amount required for them.
var/list/frame_types_by_patronage_tier = list(
"simple" = 0,
@@ -127,8 +132,8 @@ SUBSYSTEM_DEF(persistent_paintings)
"gold" = PATRONAGE_EXCELLENT_FRAME,
"diamond" = PATRONAGE_AMAZING_FRAME,
"rainbow" = PATRONAGE_SUPERB_FRAME,
"supermatter" = PATRONAGE_LEGENDARY_FRAME
)
"supermatter" = PATRONAGE_LEGENDARY_FRAME,
)
/datum/controller/subsystem/persistent_paintings/Initialize()
var/json_file = file("data/paintings.json")
@@ -142,8 +147,27 @@ SUBSYSTEM_DEF(persistent_paintings)
for(var/obj/structure/sign/painting/painting_frame as anything in painting_frames)
painting_frame.load_persistent()
cache_paintings()
return SS_INIT_SUCCESS
/datum/controller/subsystem/persistent_paintings/proc/cache_paintings()
cached_painting_data = list()
admin_painting_data = list()
for(var/datum/painting/painting as anything in paintings)
cached_painting_data += list(list(
"title" = painting.title,
"creator" = painting.creator_name,
"md5" = painting.md5,
"ref" = REF(painting),
"ratio" = painting.width/painting.height,
))
var/list/pdata = painting.to_json()
pdata["ref"] = REF(painting)
admin_painting_data += pdata
/**
* Generates painting data ready to be consumed by ui.
* Args:
@@ -152,7 +176,6 @@ SUBSYSTEM_DEF(persistent_paintings)
* * search_text : text to search for if the PAINTINGS_FILTER_SEARCH_TITLE or PAINTINGS_FILTER_SEARCH_CREATOR filters are enabled.
*/
/datum/controller/subsystem/persistent_paintings/proc/painting_ui_data(filter=NONE, admin=FALSE, search_text)
. = list()
var/searching = filter & (PAINTINGS_FILTER_SEARCH_TITLE|PAINTINGS_FILTER_SEARCH_CREATOR) && search_text
for(var/datum/painting/painting as anything in paintings)
if(filter & PAINTINGS_FILTER_AI_PORTRAIT && ((painting.width != 24 && painting.width != 23) || (painting.height != 24 && painting.height != 23)))
@@ -165,18 +188,7 @@ SUBSYSTEM_DEF(persistent_paintings)
haystack_text = painting.creator_name
if(!findtext(haystack_text, search_text))
continue
if(admin)
var/list/pdata = painting.to_json()
pdata["ref"] = REF(painting)
. += list(pdata)
else
. += list(list(
"title" = painting.title,
"creator" = painting.creator_name,
"md5" = painting.md5,
"ref" = REF(painting),
"ratio" = painting.width/painting.height,
))
return admin ? admin_painting_data : cached_painting_data
/// Returns paintings with given tag.
/datum/controller/subsystem/persistent_paintings/proc/get_paintings_with_tag(tag_name)
@@ -309,6 +321,7 @@ SUBSYSTEM_DEF(persistent_paintings)
var/payload = json_encode(all_data)
fdel(json_file)
WRITE_FILE(json_file, payload)
cache_paintings()
#undef PAINTINGS_DATA_FORMAT_VERSION
#undef PATRONAGE_OK_FRAME