Updated how players and song list works

Made many changes with caching, how players works, added sound effects
and animations any many more things

MainWindow.gd

@@ -91,7 +91,7 @@ var music_list_scroll: ScrollContainer = $MusicListPanel/ScrollContainer
 var music_list: VBoxContainer = $MusicListPanel/ScrollContainer/MusicList
 
 @onready
-var players: VBoxContainer = $Players/VBoxContainer
+var player_container: VBoxContainer = $Players/VBoxContainer
 
 @onready
 var character_select: Control = $CharacterSelect
@@ -120,6 +120,9 @@ var winner_popup: PopupPanel = $WinnerPopupPanel
 @onready
 var winner_label: Label = $WinnerPopupPanel/WinnerLabel
 
+@onready
+var winner_picture: TextureRect = $WinnerPopupPanel/WinnerPicture
+
 @onready
 var auto_repeat_song_button: CheckButton = $RepeatSongCheckButton
 
@@ -127,27 +130,26 @@ var auto_repeat_song_button: CheckButton = $RepeatSongCheckButton
 var music_player_container: PanelContainer = $MusicPlayer
 
 var player := preload("res://Player.tscn")
+var song_list_object := preload("res://song_list_object.tscn")
 
 var songs: Array= []
 var games: Array = []
-var song_list: Array = []
-var next_label: Label
 var current_player: Node
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
 	var is_debug: bool = OS.has_feature("debug")
-
-	#var is_mac := OS.has_feature("macos")
+	var is_mac: bool = OS.has_feature("macos")
 	if is_debug:
 		print("is_debug")
 		##Settings.default_path = "http://localhost:8080"
 		##Settings.selected_server = 3
-	Settings.default_path = "http://localhost:8080"
-	Settings.selected_server = 3
-	#if is_mac:
-	#	print("is_mac")
-	next_button.pressed.connect(next_track)
+		Settings.default_path = "http://localhost:8080"
+		Settings.selected_server = 3
+		Settings.winning_score = 5
+	if is_mac:
+		print("is_mac")
+	next_button.pressed.connect(fetch_song.bind(false))
 	show_answer_button.pressed.connect(show_answer_pressed)
 	search_button.pressed.connect(show_search)
 	sync_button.pressed.connect(sync_games)
@@ -160,8 +162,8 @@ func _ready() -> void:
 	
 	character_select.connect("character_selected", _on_character_selected)
 	new_player_name_field.connect("enter_key_pressed", add_player)
-	music_player_container.connect("add_to_queue", _on_add_to_queue)
-	music_player_container.connect("show_answer", show_answer_pressed)
+	music_player_container.connect("play_next_song", fetch_song.bind(false))
+	music_player_container.connect("update_song_list", update_song_list)
 	
 	add_players_button.pressed.connect(add_players)
 	add_player_button.pressed.connect(add_player)
@@ -169,7 +171,8 @@ func _ready() -> void:
 	auto_repeat_song_button.pressed.connect(repeat_song)
 	
 	get_suggestion_list()
-	fetch_full_music_list_at_start()
+	fetch_song_list_at_start()
+	fetch_song(true)
 	
 func _input(event: InputEvent) -> void:
 	if event is InputEventKey and event.pressed:
@@ -199,21 +202,127 @@ func _input(event: InputEvent) -> void:
 func repeat_song() -> void:
 	Settings.auto_repeat_song = !Settings.auto_repeat_song
 
-func next_track() -> void:
-	next_button.disabled = true
-	music_player_container.pause()
-	music_player_container.fetch_next_song()
+func show_answer_pressed() -> void:
+	print("show_answer_pressed")
+	print("show_answer_pressed song_object: ", Settings.song_object_array[Settings.latest_played_song]._to_string())
+	Settings.song_object_array[Settings.latest_played_song].is_answered = true
+	update_song_list()
+
+func fetch_song_list_at_start() -> void:
+	print("fetch_song_list_at_start")
+	var fetch_song_list_at_start_done: Callable = func fetch_songs_at_start_done(data) -> void:
+		Settings.song_object_array = []
+		if data == null:
+			Settings.latest_played_song = Settings.song_object_array.size()
+			update_song_list()
+			return
+		if typeof(data) == TYPE_ARRAY:
+			for d in data:
+				var new_song_object: SongObject = SongObject.new()
+				new_song_object.song_number = d.SongNo
+				new_song_object.game_title = d.Game
+				new_song_object.song_title = d.Song
+				new_song_object.is_answered = true
+				new_song_object.has_played = true
+				Settings.song_object_array.append(new_song_object)
+		else:
+			print("Unexpected data")
+		Settings.latest_played_song = Settings.song_object_array.size()
+		update_song_list()
+	Settings.make_request2("/music/list", fetch_song_list_at_start_done, true)
+
+#not first "/music/addPlayed"
+#"/music/rand"
+#"/music/addQue"
+#"/music/info"
+func fetch_song(first_time: bool) -> void:
+	print("fetch_song")
+	if !first_time:
+		if Settings.song_object_array[Settings.latest_played_song].has_played && !Settings.song_object_array[Settings.latest_played_song].is_answered:
+			Settings.song_object_array[Settings.latest_played_song].is_answered = true
+		Settings.latest_played_song = Settings.song_object_array.size() - 1
+		music_player_container.play_song_object(Settings.latest_played_song)
+		if Settings.add_to_stats :
+			print("add to stats")
+			Settings.make_request3("/music/addPlayed")
+		
+		next_button.disabled = true
+	
+	var url: String = ""
+	if Settings.use_low_played_mode:
+		url = "/music/rand/low"
+	else:
+		url = "/music/rand"
+	var new_song_object: SongObject = SongObject.new()
+	var fetch_song_done: Callable = func fetch_song_done(body: PackedByteArray) -> void:
+		print("fetch_song_done")
+		var sound: AudioStream = AudioStreamMP3.new()
+		sound.data = body
+		new_song_object.song = sound
+		
+		var added_to_que_done: Callable = func added_to_que_done() -> void:
+			print("added_to_que_done")
+			var fetch_song_info_done: Callable = func fetch_song_info_done(data_received: Dictionary) -> void:
+				print("fetch_song_info_done")
+				new_song_object.song_number = data_received.SongNo
+				new_song_object.game_title = data_received.Game
+				new_song_object.song_title = data_received.Song
+			
+				print("new_song_object: ", new_song_object.to_string())
+				Settings.song_object_array.append(new_song_object)
+				next_button.disabled = false
+			Settings.make_request2("/music/info", fetch_song_info_done, true)
+
+		Settings.make_request2("/music/addQue", added_to_que_done, false)
+
+	Settings.make_request2(url, fetch_song_done, true)
+	
+func update_song_list() -> void:
+	print("update_song_list")
+	if Settings.currently_playing_song >= 0:
+		game_label.text = Settings.song_object_array[Settings.currently_playing_song].get_game_title()
+		song_label.text = Settings.song_object_array[Settings.currently_playing_song].get_song_title()
+	Settings.delete_children(music_list)
+	for s: SongObject in Settings.song_object_array:
+		if !s.has_played:
+			return
+		var new_song_list_object: SongListObject = song_list_object.instantiate()
+		new_song_list_object.song_object = s
+		new_song_list_object.gui_input.connect(song_object_clicked.bind(s.song_number))
+		music_list.add_child(new_song_list_object)
+
+func song_object_clicked(event: InputEvent, song_no: int) -> void:
+	if (event is InputEventMouseButton && event.pressed && event.button_index == MOUSE_BUTTON_LEFT):
+		print("Clicked Song Object: ", Settings.song_object_array[song_no].to_string())
+		if Settings.song_object_array[song_no].song == null:
+			print("has no song, need to download")
+			var song_downloaded: Callable = func song_downloaded(body: PackedByteArray) -> void:
+				var sound: AudioStream = AudioStreamMP3.new()
+				sound.data = body
+				Settings.song_object_array[song_no].song = sound
+				music_player_container.play_song_object(song_no)
+				
+			Settings.make_request2("/music?song=" + str(song_no), song_downloaded, true)
+		else:
+			print("song already downloaded")
+			music_player_container.play_song_object(song_no)
 
 func reset_playlist() -> void:
 	print("reset_playlist")
-	Settings.make_request2("/music/reset", fetch_full_music_list_at_start, false)
+	var playlist_reset_done: Callable = func playlist_reset_done() -> void:
+		Settings.currently_playing_song = -1
+		Settings.latest_played_song = 0
+		Settings.song_object_array.clear()
+		fetch_song_list_at_start()
+		fetch_song(true)
+		
+	Settings.make_request2("/music/reset", playlist_reset_done, false)
 
 func reset_points() -> void:
 	print("reset_points")
-	var players_to_reset: Array = players.get_children()
-	for player_to_reset: Node in players_to_reset:
-		if player_to_reset.has_method("reset_points"):
-			player_to_reset.reset_points()
+	for player_objects: PlayerObject in Settings.player_array:
+		player_objects.reset_points()
+	load_players()
 
 func show_about() -> void:
 	print("show_about")
@@ -232,13 +341,6 @@ func get_statistics() -> void:
 	statistic_popup.visible = true
 	statistic_label.text = "Total amount of games in the playlist: " + str(games.size())
 	
-func _on_add_to_queue() -> void:
-	print("_on_add_to_queue")
-	next_button.disabled = false
-	Settings.make_request2("/music/addQue", fetched, false)
-	game_label.text = "????????"
-	song_label.text = "??????"
-	
 func sync_games() -> void:
 	print("sync_games")
 	sync_button.disabled = true
@@ -249,14 +351,24 @@ func sync_games() -> void:
 		reset_playlist()
 		get_suggestion_list()
 		search_view.get_list_of_games()
+
+	var new_games_synced: Callable = func new_games_synced(synced) -> void:
+		sync_button.disabled = false
+		sync_popup.visible = true
+		print("games_synced")
+		print("synced: ", synced)
+		reset_playlist()
+		get_suggestion_list()
+		search_view.get_list_of_games()
+		
 	if Settings.quick_sync == true:
-		Settings.make_request2("/sync/quick", games_synced, false)	
+		Settings.make_request2("/sync/new", new_games_synced, true)	
 	else:
-		Settings.make_request2("/sync", games_synced, false)
+		Settings.make_request2("/sync/quick", games_synced, false)
 
 func get_suggestion_list() -> void:
 	print("get_suggestion_list")
-	var populate_list: Callable = func(array) -> void:
+	var populate_list: Callable = func populate_list(array) -> void:
 		if typeof(array) == TYPE_ARRAY:
 			games = []
 			games.append_array(array)
@@ -274,162 +386,73 @@ func get_suggestion_list() -> void:
 
 func add_players() -> void:
 	print("add_players")
+	Settings.edit_players = !Settings.edit_players
 	add_player_container.visible = !add_player_container.visible
 	new_player_name_field.grab_focus()
 
 func add_player() -> void:
 	print("add_player")
-	var new_player: Node = player.instantiate()
-	new_player.player_name = new_player_name_field.text
-	new_player.player_score = new_player_name_field.text + ": 0"
-	new_player.id = Settings.get_next_player_id()
+	var new_player_object: PlayerObject = PlayerObject.new(new_player_name_field.text, Settings.player_array.size())
 	new_player_name_field.text = ""
-	players.add_child(new_player)
-	new_player.connect("change_character_clicked", _on_player_change_character_clicked.bind(new_player))
-	new_player.connect("first_point_triggerd", music_player_container._on_point_triggered.bind("first"))
-	new_player.connect("match_point_triggerd", music_player_container._on_point_triggered.bind("match"))
-	new_player.connect("winner_triggerd", _on_player_won.bind(new_player.player_name))
-	new_player.connect("player_removed", _on_player_removed.bind(new_player))
+	Settings.player_array.append(new_player_object)
+	new_player_object.connect("first_point_triggerd", music_player_container._on_point_triggered.bind("first"))
+	new_player_object.connect("match_point_triggerd", music_player_container._on_point_triggered.bind("match"))
+	new_player_object.connect("winner_triggerd", _on_player_won.bind(new_player_object.id))
+	new_player_object.connect("point_given_sound", _on_make_point_given_sound)
+	new_player_object.connect("player_point_given", _on_point_given.bind(new_player_object.id))
+	new_player_object.connect("player_point_taken", _on_point_taken.bind(new_player_object.id))
+	load_players()
 
-func _on_player_won(player_name: String) -> void:
+func load_players() -> void:
+	print("load_players")
+	Settings.delete_player_children(player_container)
+	var counter: int = 0
+	for player_object: PlayerObject in Settings.player_array:
+		print(player_object.player_name)
+		
+		var new_player: Player = player.instantiate()
+		new_player.id = counter
+		
+		new_player.connect("change_character_clicked", _on_player_change_character_clicked.bind(new_player))
+		new_player.connect("player_removed", _on_player_removed.bind(counter))
+
+		player_container.add_child(new_player)
+		counter += 1
+
+func _on_point_given(player_given_point: int) -> void:
+	print("_on_point_given")
+	if Settings.currently_playing_song >= 0:
+		Settings.song_object_array[Settings.currently_playing_song].add_point(player_given_point)
+	update_song_list()
+
+func _on_make_point_given_sound() -> void:
+	music_player_container.play_sound_effect(preload("res://sounds/itemopen.wav"))
+
+func _on_point_taken(player_taken_point: int) -> void:
+	print("_on_point_taken")
+	music_player_container.play_sound_effect(preload("res://sounds/itemequip.wav"))
+	if Settings.currently_playing_song >= 0:
+		Settings.song_object_array[Settings.currently_playing_song].remove_point(player_taken_point)
+	update_song_list()
+
+func _on_player_won(winning_player_id: int) -> void:
 	print("_on_player_won")
 	winner_popup.visible = true
-	winner_label.text = player_name + " won!!"
+	winner_label.text = Settings.player_array[winning_player_id].player_name + " won!!"
+	winner_picture.custom_minimum_size = Vector2(80, 40)
+	winner_picture.ignore_texture_size = true
+	winner_picture.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT
+	winner_picture.texture = Settings.player_array[winning_player_id].character
 	music_player_container.play_sound(preload("res://sounds/winning.mp3"))
 
-func show_search() -> void:
-	print("show_search")
-	if search_view.visible == false:
-		search_view.visible = true
-	else:
-		search_view.visible = false
-
-func show_answer_pressed() -> void:
-	print("show_answer_pressed")
-	var show_fetched: Callable = func(data_received: Dictionary) -> void:
-		print("show_fetched data_received: ", data_received)
-		game_label.text = data_received.Game
-		song_label.text = data_received.Song
-		var format_string: String = "%d. %s - %s"
-		var actual_string: String = format_string % [(data_received.SongNo+1), data_received.Game, data_received.Song]
-		if next_label == null:
-			next_label = Label.new()
-			next_label.set_texture_filter(TextureFilter.TEXTURE_FILTER_NEAREST)
-			next_label.add_theme_font_size_override("font_size", 20)
-		next_label.text = actual_string
-	Settings.make_request2("/music/info", show_fetched, true)
-
-func fetch_full_music_list_at_start() -> void:
-	print("fetch_full_music_list_at_start")
-	var show_music_list_at_start: Callable = func(data) -> void:
-		if data == null:
-			song_list = []
-			Settings.delete_children(music_list)
-			return
-		if typeof(data) == TYPE_ARRAY:
-			song_list = []
-			song_list.append_array(data)
-			print("song_list", song_list)
-			for song: Dictionary in song_list:
-				var music_list_label: Label = Label.new()
-				music_list_label.set_texture_filter(TextureFilter.TEXTURE_FILTER_NEAREST)
-				music_list_label.add_theme_font_size_override("font_size", 20)
-				music_list_label.autowrap_mode = TextServer.AUTOWRAP_WORD
-				var format_string: String = "%d. %s - %s"
-				var actual_string: String = format_string % [(song.SongNo+1), song.Game, song.Song]
-				music_list_label.text = actual_string
-				music_list_label.mouse_filter = Control.MOUSE_FILTER_PASS
-				music_list_label.gui_input.connect(song_clicked.bind(music_list_label, song.SongNo))
-				music_list.add_child(music_list_label)
-		else:
-			print("Unexpected data")
-	Settings.make_request2("/music/list", show_music_list_at_start, true)
+func _on_player_removed(player_to_remove: int) -> void:
+	print("_on_player_removed ", player_to_remove)
+	Settings.player_array.remove_at(player_to_remove)
+	load_players()
 	
-func fetch_full_music_list(event: InputEvent, song_no: int) -> void:
-	print("fetch_full_music_list")
-	if (event is InputEventMouseButton && event.pressed && event.button_index == MOUSE_BUTTON_LEFT):
-		var show_music_list: Callable = func(data_received) -> void:
-			if typeof(data_received) == TYPE_ARRAY:
-				song_list = []
-				song_list.append_array(data_received)
-				Settings.delete_children(music_list)
-				for song: Dictionary in song_list:
-					var music_label: Label= Label.new()
-					music_label.set_texture_filter(TextureFilter.TEXTURE_FILTER_NEAREST)
-					music_label.add_theme_font_size_override("font_size", 20)
-					music_label.autowrap_mode = TextServer.AUTOWRAP_WORD
-					game_label.text = song.Game
-					song_label.text = song.Song
-					var format_string: String = "%d. %s - %s"
-					var actual_string: String = format_string % [(song.SongNo+1), song.Game, song.Song]
-					music_label.text = actual_string
-					music_label.mouse_filter = Control.MOUSE_FILTER_PASS
-					music_label.gui_input.connect(song_clicked.bind(music_label, song.SongNo))
-					print(str(music_list.get_child_count()) + " | " + str(song_list.size() - 1))
-					if music_list.get_child_count() == song_list.size() - 1:
-						music_label.add_theme_color_override("font_color", Color(1, 0.5, 0))
-					music_list.add_child(music_label)
-			else:
-				print("Unexpected data")
-		Settings.make_request2("/music/list", show_music_list, true)
-		Settings.make_request2("/music?song=" + str(song_no), music_player_container.play_song, true)
-		Settings.make_request2("/music/info", show_answer, true)
-
-func show_answer(answer: Dictionary) -> void:
-	print("show_answer1: ", answer)
-	game_label.text = answer.Game
-	song_label.text = answer.Song
-
-func fetched() -> void:
-	print("fetched")
-	var show_fetched_list: Callable = func(data_received) -> void:
-		if typeof(data_received) == TYPE_ARRAY:
-			song_list = []
-			song_list.append_array(data_received)
-			Settings.delete_children(music_list)
-			song_list.remove_at(song_list.size() - 1)
-			for song: Dictionary in song_list:
-				var fetched_song_label: Label = Label.new()
-				fetched_song_label.set_texture_filter(TextureFilter.TEXTURE_FILTER_NEAREST)
-				fetched_song_label.add_theme_font_size_override("font_size", 20)
-				fetched_song_label.autowrap_mode = TextServer.AUTOWRAP_WORD
-				var format_string: String = "%d. %s - %s"
-				var actual_string: String = format_string % [(song.SongNo+1), song.Game, song.Song]
-				fetched_song_label.text = actual_string
-				fetched_song_label.mouse_filter = Control.MOUSE_FILTER_PASS
-				fetched_song_label.gui_input.connect(song_clicked.bind(fetched_song_label, song.SongNo))
-				music_list.add_child(fetched_song_label)
-			
-			songs = music_list.get_children()
-			for song: Label in songs:
-				song.remove_theme_color_override("font_color")
-			next_label = Label.new()
-			next_label.set_texture_filter(TextureFilter.TEXTURE_FILTER_NEAREST)
-			next_label.add_theme_font_size_override("font_size", 20)
-			next_label.add_theme_color_override("font_color", Color(1, 0.5, 0))
-			next_label.text = "??? - ???"
-			next_label.mouse_filter = Control.MOUSE_FILTER_PASS
-			next_label.gui_input.connect(fetch_full_music_list.bind(songs.size()))
-			music_list.add_child(next_label)
-		else:
-			print("Unexpected data")
-	Settings.make_request2("/music/list", show_fetched_list, true)
-
-func song_clicked(event: InputEvent, clicked_song_label: Label, song_no: int) -> void:
-	print("song_clicked")
-	if (event is InputEventMouseButton && event.pressed && event.button_index == MOUSE_BUTTON_LEFT):
-		print("Song Clicked: " + str(song_no))
-		songs = music_list.get_children()
-		for song: Label in songs:
-			song.remove_theme_color_override("font_color")
-		clicked_song_label.add_theme_color_override("font_color", Color(1, 0.5, 0))
-		Settings.make_request2("/music?song=" + str(song_no), music_player_container.play_song, true)
-		Settings.make_request2("/music/info", show_answer, true)
-
-func _on_player_removed(new_player: Node) -> void:
-	print("_on_player_removed")
-	Settings.player_removed()
-	players.remove_child(new_player)
+	for song_list_object: SongObject in Settings.song_object_array:
+		Settings.song_object_array[song_list_object.song_number].players_given_point.remove_at(Settings.song_object_array[song_list_object.song_number].players_given_point.find(player_to_remove))
+	update_song_list()
 
 func _on_player_change_character_clicked(new_player: Node) -> void:
 	print("_on_player_change_character_clicked")
@@ -441,6 +464,14 @@ func _on_character_selected(file_name: String) -> void:
 	character_select.visible = false
 	current_player._on_control_character_selected_clicked(file_name)
 
+func show_search() -> void:
+	print("show_search")
+	if search_view.visible == false:
+		search_view.visible = true
+	else:
+		search_view.visible = false
+
+
 ###Local
 
 var local_path: String = '/Users/sebastian/ResilioSync/Sorterat_test/Metal Gear Solid 4 - Guns of the Patriots/2-16 Metal Gear Saga.mp3'