Skip to content

[TM ONLY] Jukebox updates when admins change songs in the config #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FalloutFalcon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TM ONLY] Jukebox updates when admins change songs in the config #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/components/jukebox.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
return load_songs_from_config()

/// Loads the config sounds once, and returns a copy of them.
/datum/jukebox/proc/load_songs_from_config()
/datum/jukebox/proc/load_songs_from_config(force = FALSE)
var/static/list/config_songs
if(isnull(config_songs))
if(isnull(config_songs) || force)
config_songs = list()
var/list/tracks = flist(CONFIG_JUKEBOX_SOUNDS)
for(var/track_file in tracks)
Expand Down
12 changes: 12 additions & 0 deletions code/modules/admin/verbs/jukebox_moderation.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ ADMIN_VERB(upload_jukebox_music, R_SERVER, "Jukebox Upload Music", "Upload a val

message_admins("[key_name_admin(user)] uploaded [clean_name] to the jukebox!")
to_chat(user, span_notice("Successfully uploaded [clean_name]!"))
refresh_jukebox_songs()

ADMIN_VERB(browse_jukebox_music, R_SERVER, "Jukebox Browse Music", "Browse music files for moderation.", ADMIN_CATEGORY_SERVER)
var/list/files = flist(CONFIG_JUKEBOX_SOUNDS)
Expand All @@ -51,7 +52,18 @@ ADMIN_VERB(browse_jukebox_music, R_SERVER, "Jukebox Browse Music", "Browse music
message_admins(msg)
log_admin(msg)
SSblackbox.record_feedback("associative", "jukebox_deletion", 1, list("round_id" = "[GLOB.round_id]", "deletor" = "[key_name_admin(user)]", "deleted" = "[choice]"))
refresh_jukebox_songs()
if ("Download")
user << ftp(file(path))
else
return

/// Recache the songs from config then force replace all the songs.
/proc/refresh_jukebox_songs()
var/refreshed = FALSE
for(var/obj/machinery/jukebox/jukebox in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/jukebox))
if(!refreshed)
jukebox.music_player.load_songs_from_config(TRUE)
refreshed = TRUE

jukebox.music_player.songs = jukebox.music_player.init_songs()
Loading