Added icons, a lot of refactoring and optimising
This commit is contained in:
606
MainWindow.gd
606
MainWindow.gd
@@ -3,217 +3,190 @@ extends Control
|
||||
# 601 LOC 11/9 - 2023
|
||||
# 628 LOC 15/9 - 2023
|
||||
# 631 LOC 16/9 - 2023
|
||||
# 554 LOC 30/5 - 2024
|
||||
# 551 LOC 3/6 - 2024
|
||||
# 386 LOC 12/6 - 2024
|
||||
|
||||
##TODO
|
||||
# 11. Refactor components
|
||||
# 13. Fix graphics in lists
|
||||
# 14. Fix layout
|
||||
# 15. Fix for local play
|
||||
# 16. Change all calls to make_request and function in function
|
||||
# 17. Change some buttons to icons
|
||||
|
||||
@onready
|
||||
var open_button := $Open
|
||||
var open_button: Button = $Open
|
||||
|
||||
@onready
|
||||
var fileDialog := $FileDialog
|
||||
var fileDialog: FileDialog = $FileDialog
|
||||
|
||||
@onready
|
||||
var insperation_scroll := $ScrollContainer
|
||||
var inspiration_scroll: ScrollContainer = $ScrollContainer
|
||||
|
||||
@onready
|
||||
var insperation_list := $ScrollContainer/VBoxContainer
|
||||
var inspiration_list: VBoxContainer = $ScrollContainer/VBoxContainer
|
||||
|
||||
@onready
|
||||
var game_label := $VBoxContainer/GameLabel
|
||||
var game_label: Label = $VBoxContainer/GameLabel
|
||||
|
||||
@onready
|
||||
var song_label := $VBoxContainer/SongLabel
|
||||
var song_label: Label = $VBoxContainer/SongLabel
|
||||
|
||||
@onready
|
||||
var play_button := $PanelContainer/HBoxContainer/PlayButton
|
||||
var add_player_container: VBoxContainer = $Players/VBoxContainer/AddPlayerContainer
|
||||
|
||||
@onready
|
||||
var restart_button := $PanelContainer/HBoxContainer/RestartButton
|
||||
var add_players_button: Button = $Players/VBoxContainer/HBoxContainer/AddPlayersButton
|
||||
|
||||
@onready
|
||||
var audio := $AudioStreamPlayer
|
||||
var add_player_button: Button = $Players/VBoxContainer/AddPlayerContainer/AddPlayerButton
|
||||
|
||||
@onready
|
||||
var progress := $PanelContainer/HBoxContainer/HSlider
|
||||
var new_player_name_field: LineEdit = $Players/VBoxContainer/AddPlayerContainer/PlayerNameField
|
||||
|
||||
@onready
|
||||
var label := $PanelContainer/HBoxContainer/Label
|
||||
var reset_playlist_button: Button = $ResetPlaylistButton
|
||||
|
||||
@onready
|
||||
var add_player_container := $Players/VBoxContainer/AddPlayerContainer
|
||||
var reset_points_button: Button = $ResetPointsButton
|
||||
|
||||
@onready
|
||||
var add_players_button := $Players/VBoxContainer/HBoxContainer/AddPlayersButton
|
||||
var sound_test_button: Button = $SoundTestButton
|
||||
|
||||
@onready
|
||||
var add_player_button := $Players/VBoxContainer/AddPlayerContainer/AddPlayerButton
|
||||
var sync_button: Button = $SyncButton
|
||||
|
||||
@onready
|
||||
var new_player_name_field := $Players/VBoxContainer/AddPlayerContainer/PlayerNameField
|
||||
var sync_popup: PopupPanel = $SyncPopupPanel
|
||||
|
||||
@onready
|
||||
var reset_playlist_button := $ResetPlaylistButton
|
||||
var settings_button: Button = $SettingsButton
|
||||
|
||||
@onready
|
||||
var reset_points_button := $ResetPointsButton
|
||||
var settings_popup: PopupPanel = $SettingsPopupPanel
|
||||
|
||||
@onready
|
||||
var sound_test_button := $SoundTestButton
|
||||
var statistics_button: Button = $StatisticsButton
|
||||
|
||||
@onready
|
||||
var sync_button := $SyncButton
|
||||
var statistic_popup: PopupPanel = $StatisticsPopupPanel
|
||||
|
||||
@onready
|
||||
var sync_popup := $SyncPopupPanel
|
||||
var statistic_label: Label = $StatisticsPopupPanel/StatisticsLabel
|
||||
|
||||
@onready
|
||||
var settings_button := $SettingsButton
|
||||
var about_button: Button = $AboutButton
|
||||
|
||||
@onready
|
||||
var settings_popup := $SettingsPopupPanel
|
||||
var about_popup: PopupPanel = $AboutPopupPanel
|
||||
|
||||
@onready
|
||||
var statistics_button := $StatisticsButton
|
||||
var show_answer_button: Button = $ShowAnswerButton
|
||||
|
||||
@onready
|
||||
var statistic_popup := $StatisticsPopupPanel
|
||||
var next_button: Button = $NextButton
|
||||
|
||||
@onready
|
||||
var statistic_label := $StatisticsPopupPanel/StatisticsLabel
|
||||
var music_list_scroll: ScrollContainer = $MusicListPanel/ScrollContainer
|
||||
|
||||
@onready
|
||||
var about_button := $AboutButton
|
||||
var music_list: VBoxContainer = $MusicListPanel/ScrollContainer/MusicList
|
||||
|
||||
@onready
|
||||
var about_popup := $AboutPopupPanel
|
||||
var players: VBoxContainer = $Players/VBoxContainer
|
||||
|
||||
@onready
|
||||
var show_answer_button := $ShowAnswerButton
|
||||
var character_select: Control = $CharacterSelect
|
||||
|
||||
@onready
|
||||
var next_button := $NextButton
|
||||
var search_button: Button = $SearchButton
|
||||
|
||||
@onready
|
||||
var music_list_scroll := $MusicListPanel/ScrollContainer
|
||||
var search_view: Control= $Search
|
||||
|
||||
@onready
|
||||
var music_list := $MusicListPanel/ScrollContainer/MusicList
|
||||
var version_label: Label = $AboutPopupPanel/VBoxContainer/VersionLabel
|
||||
|
||||
@onready
|
||||
var players := $Players/VBoxContainer
|
||||
var whats_new_label: Label = $AboutPopupPanel/VBoxContainer/HBoxContainer/NewLabel
|
||||
|
||||
@onready
|
||||
var character_select := $CharacterSelect
|
||||
var shortcut_label: Label = $AboutPopupPanel/VBoxContainer/HBoxContainer/ShortcutsLabel
|
||||
|
||||
@onready
|
||||
var search_button := $SearchButton
|
||||
var coming_label: Label = $AboutPopupPanel/VBoxContainer/HBoxContainer/CommingLabel
|
||||
|
||||
@onready
|
||||
var search_view := $Search
|
||||
var winner_popup: PopupPanel = $WinnerPopupPanel
|
||||
|
||||
@onready
|
||||
var version_label := $AboutPopupPanel/VBoxContainer/VersionLabel
|
||||
var winner_label: Label = $WinnerPopupPanel/WinnerLabel
|
||||
|
||||
@onready
|
||||
var new_label := $AboutPopupPanel/VBoxContainer/HBoxContainer/NewLabel
|
||||
|
||||
@onready
|
||||
var shortcut_label := $AboutPopupPanel/VBoxContainer/HBoxContainer/ShortcutsLabel
|
||||
|
||||
@onready
|
||||
var comming_label := $AboutPopupPanel/VBoxContainer/HBoxContainer/CommingLabel
|
||||
|
||||
@onready
|
||||
var winner_popup := $WinnerPopupPanel
|
||||
|
||||
@onready
|
||||
var winner_label := $WinnerPopupPanel/WinnerLabel
|
||||
var music_player_container: PanelContainer = $MusicPlayer
|
||||
|
||||
var player := preload("res://Player.tscn")
|
||||
|
||||
@onready
|
||||
var path = '/Users/sebastian/ResilioSync/Sorterat_test/Metal Gear Solid 4 - Guns of the Patriots/2-16 Metal Gear Saga.mp3'
|
||||
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():
|
||||
next_button.pressed.connect(fetch_next_song)
|
||||
play_button.pressed.connect(play_or_pause)
|
||||
restart_button.pressed.connect(restart)
|
||||
show_answer_button.pressed.connect(show_answer)
|
||||
func _ready() -> void:
|
||||
next_button.pressed.connect(music_player_container.fetch_next_song)
|
||||
show_answer_button.pressed.connect(show_answer_pressed)
|
||||
search_button.pressed.connect(show_search)
|
||||
sync_button.pressed.connect(sync_games)
|
||||
sound_test_button.pressed.connect(get_sound_test_song)
|
||||
sound_test_button.pressed.connect(music_player_container.get_sound_test_song)
|
||||
statistics_button.pressed.connect(get_statistics)
|
||||
about_button.pressed.connect(show_about)
|
||||
settings_button.pressed.connect(show_settings)
|
||||
reset_playlist_button.pressed.connect(reset_playlist)
|
||||
reset_points_button.pressed.connect(reset_points)
|
||||
|
||||
progress.drag_started.connect(_on_drag_started)
|
||||
progress.drag_ended.connect(_on_drag_ended)
|
||||
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)
|
||||
|
||||
add_players_button.pressed.connect(add_players)
|
||||
add_player_button.pressed.connect(add_player)
|
||||
|
||||
open_button.pressed.connect(open)
|
||||
|
||||
get_suggestion_list()
|
||||
fetch_full_music_list_at_start()
|
||||
|
||||
func reset_playlist():
|
||||
|
||||
func reset_playlist() -> void:
|
||||
print("reset_playlist")
|
||||
Settings.make_request2("/music/reset", fetch_full_music_list_at_start, false)
|
||||
|
||||
func reset_points():
|
||||
var players_to_reset := players.get_children()
|
||||
for player_to_reset in players_to_reset:
|
||||
func reset_points() -> void:
|
||||
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()
|
||||
|
||||
func show_about():
|
||||
func show_about() -> void:
|
||||
about_popup.visible = true
|
||||
version_label.text = Settings.version
|
||||
new_label.text = Settings.whats_new
|
||||
whats_new_label.text = Settings.whats_new
|
||||
shortcut_label.text = Settings.shortcuts
|
||||
comming_label.text = Settings.whats_left
|
||||
coming_label.text = Settings.whats_left
|
||||
|
||||
func show_settings():
|
||||
func show_settings() -> void:
|
||||
settings_popup.visible = true
|
||||
|
||||
func get_statistics():
|
||||
func get_statistics() -> void:
|
||||
statistic_popup.visible = true
|
||||
statistic_label.text = "Total amount of games in the playlist: " + str(games.size())
|
||||
|
||||
func get_sound_test_song():
|
||||
var play_sound_test_song = func(result, _response_code, _headers, body):
|
||||
if result != HTTPRequest.RESULT_SUCCESS:
|
||||
push_error("Song couldn't be downloaded. Try a different song.")
|
||||
var sound = AudioStreamMP3.new()
|
||||
sound.data = body
|
||||
audio.stream = sound
|
||||
audio.play()
|
||||
stream = audio.stream
|
||||
progress.max_value = round(stream.get_length())
|
||||
progress.tick_count = round(stream.get_length() / 60)
|
||||
|
||||
make_request(Settings.default_path + "/music/soundTest", play_sound_test_song)
|
||||
|
||||
func sound_test_local():
|
||||
audio.stream = preload("res://01. Opening.mp3")
|
||||
audio.play()
|
||||
stream = audio.stream
|
||||
progress.max_value = round(stream.get_length())
|
||||
progress.tick_count = round(stream.get_length() / 60)
|
||||
|
||||
func sync_games():
|
||||
var games_synced = func():
|
||||
func _on_add_to_queue() -> void:
|
||||
print("add_to_queue")
|
||||
Settings.make_request2("/music/addQue", fetched, false)
|
||||
game_label.text = "????????"
|
||||
song_label.text = "??????"
|
||||
|
||||
func sync_games() -> void:
|
||||
var games_synced: Callable = func() -> void:
|
||||
sync_popup.visible = true
|
||||
print("games_synced")
|
||||
reset_playlist()
|
||||
@@ -221,86 +194,72 @@ func sync_games():
|
||||
Settings.make_request2("/sync", games_synced, false)
|
||||
|
||||
func get_suggestion_list() -> void:
|
||||
var populate_list = func(array):
|
||||
var populate_list: Callable = func(array: Array) -> void:
|
||||
if typeof(array) == TYPE_ARRAY:
|
||||
games.append_array(array)
|
||||
for game in games:
|
||||
var insperation_label := Label.new()
|
||||
insperation_label.text = game
|
||||
insperation_label.autowrap_mode = TextServer.AUTOWRAP_WORD
|
||||
insperation_list.add_child(insperation_label)
|
||||
insperation_scroll.scroll_to_bottom()
|
||||
for game: String in games:
|
||||
var inspiration_label: Label= Label.new()
|
||||
inspiration_label.text = game
|
||||
inspiration_label.autowrap_mode = TextServer.AUTOWRAP_WORD
|
||||
inspiration_list.add_child(inspiration_label)
|
||||
inspiration_scroll.scroll_to_bottom()
|
||||
else:
|
||||
print("Unexpected data")
|
||||
Settings.make_request2("/music/all", populate_list, true)
|
||||
|
||||
func add_players():
|
||||
func add_players() -> void:
|
||||
add_player_container.visible = !add_player_container.visible
|
||||
new_player_name_field.grab_focus()
|
||||
|
||||
func add_player():
|
||||
var new_player := player.instantiate()
|
||||
new_player.new_name(new_player_name_field.text + ": 0")
|
||||
func add_player() -> void:
|
||||
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_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", _on_point_triggerd.bind("first", ""))
|
||||
new_player.connect("match_point_triggerd", _on_point_triggerd.bind("match", ""))
|
||||
new_player.connect("winner_triggerd", _on_point_triggerd.bind("winner", new_player.player_name))
|
||||
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))
|
||||
|
||||
func _on_point_triggerd(point: String, player_name: String):
|
||||
if point == "first":
|
||||
var value = randi_range(0, 10)
|
||||
if value == 0:
|
||||
audio.stream = preload("res://sounds/sound1.mp3")
|
||||
elif value < 5:
|
||||
audio.stream = preload("res://sounds/intro_long.mp3")
|
||||
else:
|
||||
audio.stream = preload("res://sounds/intro_short.mp3")
|
||||
elif point == "match":
|
||||
audio.stream = preload("res://sounds/sound0.mp3")
|
||||
elif point == "winner":
|
||||
audio.stream = preload("res://sounds/winning.mp3")
|
||||
winner_popup.visible = true
|
||||
winner_label.text = player_name + " won!!"
|
||||
|
||||
audio.play()
|
||||
play_button.text = "Pause"
|
||||
stream = audio.stream
|
||||
progress.max_value = round(stream.get_length())
|
||||
progress.tick_count = round(stream.get_length() / 60)
|
||||
|
||||
func show_search():
|
||||
func _on_player_won(player_name: String) -> void:
|
||||
winner_popup.visible = true
|
||||
winner_label.text = player_name + " won!!"
|
||||
music_player_container.play_sound(preload("res://sounds/winning.mp3"))
|
||||
|
||||
func show_search() -> void:
|
||||
if search_view.visible == false:
|
||||
search_view.visible = true
|
||||
else:
|
||||
search_view.visible = false
|
||||
|
||||
func show_answer():
|
||||
var http_request = HTTPRequest.new()
|
||||
add_child(http_request)
|
||||
http_request.request_completed.connect(show_fetched)
|
||||
|
||||
# Perform a GET request. The URL below returns JSON as of writing.
|
||||
var error = http_request.request(Settings.default_path + "/music/info")
|
||||
if error != OK:
|
||||
push_error("An error occurred in the HTTP request.")
|
||||
func show_answer_pressed() -> void:
|
||||
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.text = actual_string
|
||||
Settings.make_request2("/music/info", show_fetched, true)
|
||||
|
||||
func fetch_full_music_list_at_start():
|
||||
func fetch_full_music_list_at_start() -> void:
|
||||
print("fetch_full_music_list_at_start")
|
||||
var show_music_list_at_start = func(data):
|
||||
var show_music_list_at_start: Callable = func(data: Array) -> void:
|
||||
if data == null:
|
||||
song_list = []
|
||||
delete_children(music_list)
|
||||
Settings.delete_children(music_list)
|
||||
return
|
||||
if typeof(data) == TYPE_ARRAY:
|
||||
song_list = []
|
||||
song_list.append_array(data)
|
||||
for song in song_list:
|
||||
var music_list_label := Label.new()
|
||||
var format_string = "%d. %s - %s"
|
||||
var actual_string = format_string % [(song.SongNo+1), song.Game, song.Song]
|
||||
for song: Dictionary in song_list:
|
||||
var music_list_label: Label = Label.new()
|
||||
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))
|
||||
@@ -309,105 +268,55 @@ func fetch_full_music_list_at_start():
|
||||
print("Unexpected data")
|
||||
Settings.make_request2("/music/list", show_music_list_at_start, true)
|
||||
|
||||
func fetch_full_music_list(event, song_no: int):
|
||||
func fetch_full_music_list(event: InputEvent, song_no: int) -> void:
|
||||
if (event is InputEventMouseButton && event.pressed && event.button_index == MOUSE_BUTTON_LEFT):
|
||||
var show_music_list = func(_result, _response_code, _headers, body):
|
||||
var json = JSON.new()
|
||||
var error = json.parse(body.get_string_from_utf8())
|
||||
|
||||
if error == OK:
|
||||
var data_received = json.get_data()
|
||||
if typeof(data_received) == TYPE_ARRAY:
|
||||
song_list = []
|
||||
song_list.append_array(data_received)
|
||||
delete_children(music_list)
|
||||
for song in song_list:
|
||||
var label := Label.new()
|
||||
game_label.text = song.Game
|
||||
song_label.text = song.Song
|
||||
var format_string = "%d. %s - %s"
|
||||
var actual_string = format_string % [(song.SongNo+1), song.Game, song.Song]
|
||||
label.text = actual_string
|
||||
label.mouse_filter = Control.MOUSE_FILTER_PASS
|
||||
label.gui_input.connect(song_clicked.bind(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:
|
||||
label.add_theme_color_override("font_color", Color(1, 0.5, 0))
|
||||
music_list.add_child(label)
|
||||
else:
|
||||
print("Unexpected data")
|
||||
make_request(Settings.default_path + "/music/list", show_music_list)
|
||||
var play_clicked_song = func(result, _response_code, _headers, body):
|
||||
if result != HTTPRequest.RESULT_SUCCESS:
|
||||
push_error("Song couldn't be downloaded. Try a different song.")
|
||||
var sound = AudioStreamMP3.new()
|
||||
sound.data = body
|
||||
audio.stream = sound
|
||||
audio.play()
|
||||
play_button.text = "Pause"
|
||||
stream = audio.stream
|
||||
progress.max_value = round(stream.get_length())
|
||||
progress.tick_count = round(stream.get_length() / 60)
|
||||
make_request(Settings.default_path + "/music?song=" + str(song_no), play_clicked_song)
|
||||
var show_answer = func(result, response_code, headers, body):
|
||||
var json = JSON.new()
|
||||
var error = json.parse(body.get_string_from_utf8())
|
||||
|
||||
if error == OK:
|
||||
var data_received = json.get_data()
|
||||
game_label.text = data_received.Game
|
||||
song_label.text = data_received.Song
|
||||
make_request(Settings.default_path + "/music/info", show_answer)
|
||||
|
||||
var show_music_list: Callable = func(data_received: Array) -> 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()
|
||||
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 fetched():
|
||||
var http_request2 = HTTPRequest.new()
|
||||
add_child(http_request2)
|
||||
http_request2.request_completed.connect(show_fetched_list)
|
||||
|
||||
# Perform a GET request. The URL below returns JSON as of writing.
|
||||
var error2 = http_request2.request(Settings.default_path + "/music/list")
|
||||
if error2 != OK:
|
||||
push_error("An error occurred in the HTTP request.")
|
||||
|
||||
func show_answer(answer: JSON) -> void:
|
||||
print("show_answer1: ", answer)
|
||||
game_label.text = answer.Game
|
||||
song_label.text = answer.Song
|
||||
|
||||
var next_label: Label
|
||||
func show_fetched(result, response_code, headers, body) -> void:
|
||||
var json = JSON.new()
|
||||
var error = json.parse(body.get_string_from_utf8())
|
||||
|
||||
if error == OK:
|
||||
var data_received = json.get_data()
|
||||
print("data_received: ", data_received)
|
||||
game_label.text = data_received.Game
|
||||
song_label.text = data_received.Song
|
||||
var format_string = "%d. %s - %s"
|
||||
var actual_string = format_string % [(data_received.SongNo+1), data_received.Game, data_received.Song]
|
||||
next_label.text = actual_string
|
||||
|
||||
var song_list = []
|
||||
func show_fetched_list(result, response_code, headers, body) -> void:
|
||||
var json = JSON.new()
|
||||
var error = json.parse(body.get_string_from_utf8())
|
||||
|
||||
if error == OK:
|
||||
var data_received = json.get_data()
|
||||
func fetched() -> void:
|
||||
var show_fetched_list: Callable = func(data_received: Array) -> void:
|
||||
if typeof(data_received) == TYPE_ARRAY:
|
||||
song_list = []
|
||||
song_list.append_array(data_received)
|
||||
delete_children(music_list)
|
||||
Settings.delete_children(music_list)
|
||||
song_list.remove_at(song_list.size() - 1)
|
||||
for song in song_list:
|
||||
var label := Label.new()
|
||||
var format_string = "%d. %s - %s"
|
||||
var actual_string = format_string % [(song.SongNo+1), song.Game, song.Song]
|
||||
label.text = actual_string
|
||||
label.mouse_filter = Control.MOUSE_FILTER_PASS
|
||||
label.gui_input.connect(song_clicked.bind(label, song.SongNo))
|
||||
music_list.add_child(label)
|
||||
for song: Dictionary in song_list:
|
||||
var fetched_song_label: Label = Label.new()
|
||||
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)
|
||||
|
||||
var songs := music_list.get_children()
|
||||
for song in songs:
|
||||
songs = music_list.get_children()
|
||||
for song: Label in songs:
|
||||
song.remove_theme_color_override("font_color")
|
||||
next_label = Label.new()
|
||||
next_label.add_theme_color_override("font_color", Color(1, 0.5, 0))
|
||||
@@ -415,61 +324,49 @@ func show_fetched_list(result, response_code, headers, body) -> void:
|
||||
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, label: Label, song_no: int):
|
||||
func song_clicked(event: InputEvent, clicked_song_label: Label, song_no: int) -> void:
|
||||
if (event is InputEventMouseButton && event.pressed && event.button_index == MOUSE_BUTTON_LEFT):
|
||||
print("Song Clicked: " + str(song_no))
|
||||
var songs := music_list.get_children()
|
||||
for song in songs:
|
||||
songs = music_list.get_children()
|
||||
for song: Label in songs:
|
||||
song.remove_theme_color_override("font_color")
|
||||
label.add_theme_color_override("font_color", Color(1, 0.5, 0))
|
||||
var play_clicked_song = func(result, response_code, headers, body):
|
||||
if result != HTTPRequest.RESULT_SUCCESS:
|
||||
push_error("Song couldn't be downloaded. Try a different song.")
|
||||
var sound = AudioStreamMP3.new()
|
||||
sound.data = body
|
||||
audio.stream = sound
|
||||
audio.play()
|
||||
play_button.text = "Pause"
|
||||
stream = audio.stream
|
||||
progress.max_value = round(stream.get_length())
|
||||
progress.tick_count = round(stream.get_length() / 60)
|
||||
make_request(Settings.default_path + "/music?song=" + str(song_no), play_clicked_song)
|
||||
var show_answer = func(result, response_code, headers, body):
|
||||
var json = JSON.new()
|
||||
var error = json.parse(body.get_string_from_utf8())
|
||||
|
||||
if error == OK:
|
||||
var data_received = json.get_data()
|
||||
game_label.text = data_received.Game
|
||||
song_label.text = data_received.Song
|
||||
make_request(Settings.default_path + "/music/info", show_answer)
|
||||
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:
|
||||
players.remove_child(new_player)
|
||||
|
||||
func open():
|
||||
func _on_player_change_character_clicked(new_player: Node) -> void:
|
||||
print("_on_player_change_character_clicked")
|
||||
current_player = new_player
|
||||
character_select.visible = true
|
||||
|
||||
func _on_character_selected(file_name: String) -> void:
|
||||
print("_on_character_selected")
|
||||
character_select.visible = false
|
||||
current_player._on_control_character_selected_clicked(file_name)
|
||||
|
||||
###Local
|
||||
|
||||
var local_path: String = '/Users/sebastian/ResilioSync/Sorterat_test/Metal Gear Solid 4 - Guns of the Patriots/2-16 Metal Gear Saga.mp3'
|
||||
|
||||
func open() -> void:
|
||||
fileDialog.popup()
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta):
|
||||
if audio.has_stream_playback() && !is_changing && !audio.stream_paused:
|
||||
progress.value = audio.get_playback_position()
|
||||
label.text = format_text(progress.value, stream.get_length())
|
||||
|
||||
func _on_file_dialog_dir_selected(path):
|
||||
|
||||
func _on_file_dialog_dir_selected(path: String) -> void:
|
||||
print(path)
|
||||
dir_contents(path)
|
||||
|
||||
var songs := []
|
||||
var games := []
|
||||
|
||||
func dir_contents(path: String) -> void:
|
||||
var dir = DirAccess.open(path)
|
||||
var dir: DirAccess = DirAccess.open(path)
|
||||
if dir:
|
||||
dir.list_dir_begin()
|
||||
var file_name = dir.get_next()
|
||||
var file_name: String = dir.get_next()
|
||||
songs.clear()
|
||||
while file_name != "":
|
||||
if dir.current_is_dir():
|
||||
@@ -480,151 +377,10 @@ func dir_contents(path: String) -> void:
|
||||
if file_name.ends_with(".mp3"):
|
||||
songs.append(path + "/" + file_name)
|
||||
file_name = dir.get_next()
|
||||
|
||||
else:
|
||||
print("An error occurred when trying to access the path.")
|
||||
|
||||
for game in games:
|
||||
var label := Label.new()
|
||||
label.text = game
|
||||
insperation_list.add_child(label)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
var is_changing: bool = false
|
||||
var playback_position: float
|
||||
var stream: AudioStream
|
||||
|
||||
func set_songs(new_songs) -> void:
|
||||
songs = new_songs
|
||||
|
||||
func make_request(address, func_name) -> void:
|
||||
var http_request = HTTPRequest.new()
|
||||
add_child(http_request)
|
||||
http_request.request_completed.connect(func_name)
|
||||
|
||||
# Perform a GET request. The URL below returns JSON as of writing.
|
||||
var error = http_request.request(address)
|
||||
if error != OK:
|
||||
push_error("An error occurred in the HTTP request.")
|
||||
|
||||
|
||||
func format_time(time: float) -> String:
|
||||
var mins: String = "%02d" % floor(time / 60)
|
||||
var sec: String = "%02d" % round(fmod(time, 60))
|
||||
return mins + ":" + sec
|
||||
|
||||
func format_text(part: float, total: float) -> String:
|
||||
return format_time(part) + " / " + format_time(total)
|
||||
|
||||
|
||||
func fetch_next_song() -> void:
|
||||
var http_request = HTTPRequest.new()
|
||||
add_child(http_request)
|
||||
http_request.request_completed.connect(song_fetched)
|
||||
|
||||
# Perform a GET request. The URL below returns JSON as of writing.
|
||||
var path = ""
|
||||
if Settings.use_low_played_mode:
|
||||
path = "/music/rand/low"
|
||||
else:
|
||||
path = "/music/rand"
|
||||
var error = http_request.request(Settings.default_path + path)
|
||||
if error != OK:
|
||||
push_error("An error occurred in the HTTP request.")
|
||||
|
||||
func song_fetched(result, response_code, headers, body) -> void:
|
||||
if result != HTTPRequest.RESULT_SUCCESS:
|
||||
push_error("Song couldn't be downloaded. Try a different song.")
|
||||
var sound = AudioStreamMP3.new()
|
||||
sound.data = body
|
||||
print("play given song")
|
||||
audio.stream = sound
|
||||
audio.play()
|
||||
play_button.text = "Pause"
|
||||
stream = audio.stream
|
||||
make_request(Settings.default_path + "/music/addQue", add_que)
|
||||
progress.max_value = round(stream.get_length())
|
||||
progress.tick_count = round(stream.get_length() / 60)
|
||||
game_label.text = "????????"
|
||||
song_label.text = "??????"
|
||||
if Settings.add_to_stats:
|
||||
Settings.make_request2("/music/played", func(): pass , false)
|
||||
if !Settings.stop_after_current:
|
||||
audio.finished.connect(fetch_next_song)
|
||||
if !Settings.hide_next_track:
|
||||
show_answer()
|
||||
|
||||
func add_que(result, response_code, headers, body) -> void:
|
||||
print("response_code", response_code)
|
||||
fetched()
|
||||
|
||||
func play_local_song(song) -> void:
|
||||
if songs:
|
||||
path = songs[0]
|
||||
print(path)
|
||||
print(FileAccess.file_exists(path))
|
||||
audio.stream = load_mp3(path)
|
||||
print("play")
|
||||
audio.play()
|
||||
stream = audio.stream
|
||||
progress.max_value = round(stream.get_length())
|
||||
progress.tick_count = round(stream.get_length() / 60)
|
||||
|
||||
func play_or_pause():
|
||||
if audio.stream_paused:
|
||||
play_button.text = "Pause"
|
||||
audio.stream_paused = false
|
||||
audio.seek(playback_position)
|
||||
print("continue")
|
||||
progress.max_value = round(stream.get_length())
|
||||
progress.tick_count = round(stream.get_length() / 60)
|
||||
else:
|
||||
audio.stream_paused = true
|
||||
playback_position = audio.get_playback_position()
|
||||
play_button.text = "Play"
|
||||
|
||||
func restart() -> void:
|
||||
audio.stop()
|
||||
audio.stream_paused = false
|
||||
progress.value = 0
|
||||
playback_position = audio.get_playback_position()
|
||||
audio.seek(playback_position)
|
||||
play_button.text = "Pause"
|
||||
audio.play()
|
||||
|
||||
func _on_drag_started() -> void:
|
||||
is_changing = true
|
||||
|
||||
func _on_drag_ended(_changed) -> void:
|
||||
audio.seek(progress.value)
|
||||
playback_position = progress.value
|
||||
is_changing = false
|
||||
|
||||
func load_mp3(_path) -> AudioStream:
|
||||
var file = FileAccess.open(_path, FileAccess.READ)
|
||||
var sound = AudioStreamMP3.new()
|
||||
sound.data = file.get_buffer(file.get_length())
|
||||
return sound
|
||||
|
||||
func _on_player_removed(new_player):
|
||||
players.remove_child(new_player)
|
||||
|
||||
var current_player
|
||||
func _on_player_change_character_clicked(new_player):
|
||||
print("_on_player_change_character_clicked")
|
||||
current_player = new_player
|
||||
character_select.visible = true
|
||||
|
||||
func _on_character_selected(file_name: String):
|
||||
print("_on_character_selected")
|
||||
character_select.visible = false
|
||||
current_player._on_control_character_selected_clicked(file_name)
|
||||
|
||||
|
||||
func delete_children(node):
|
||||
for n in node.get_children():
|
||||
node.remove_child(n)
|
||||
n.queue_free()
|
||||
for game: String in games:
|
||||
var local_inspiration_label: Label = Label.new()
|
||||
local_inspiration_label.text = game
|
||||
inspiration_list.add_child(local_inspiration_label)
|
||||
|
||||
Reference in New Issue
Block a user