Fixed light icons. Made the search "better". Added more shortcuts and tried to fix som bugs.

SearchWindow.gd

@@ -15,7 +15,7 @@ var search_bar := $Searchbar
 var games := []
 
 # Called when the node enters the scene tree for the first time.
-func _ready():
+func _ready() -> void:
 	get_list_of_games()
 	clear_button.pressed.connect(clear)
 	close_button.pressed.connect(close)
@@ -23,47 +23,86 @@ func _ready():
 	search_bar.text_changed.connect(search)
 	visibility_changed.connect(focus)
 	
-func focus():
+func focus() -> void:
 	if self.visible == true:
 		search_bar.grab_focus()
+		clear()
 
-func close():
+func close() -> void:
 	clear()
 	self.visible = false
 
-func search():
+func search() -> void:
 	print(search_bar.text)
 	Settings.delete_children(search_list)
-	for game in games:
-		if is_match(search_bar.text, game):
-			var label := Label.new()
-			label.text = game
-			label.autowrap_mode = TextServer.AUTOWRAP_WORD
-			search_list.add_child(label)
-			
-func is_match(search_term: String, game_name: String) -> bool:
-	search_term = search_term.replace(" ", "").replace("é", "e").to_lower()
-	game_name = game_name.replace(" ", "").replace("é", "e").to_lower()
+	for game: String in games:
+		if is_match_exact(search_bar.text, game):
+			add_game(game)
+	for game: String in games:
+		if is_match_contains(clean_term(search_bar.text), clean_term(game)):
+			add_game(game)
+	for game: String in games:
+		if is_match_regex(clean_term(search_bar.text), clean_term(game)):
+			add_game(game)
+
+func clean_term(term: String) -> String:
+	return term.replace(" ", "").replace("é", "e").replace("+", "plus").replace("&", "and").replace("'n", "and").to_lower()
+
+func is_match_exact(search_term: String, game_name: String) -> bool:
+	search_term = search_term.to_lower()
+	game_name = game_name.to_lower()
 	
+	if search_term == "":
+		return true
+	elif game_name.contains(search_term):
+		return true
+	else:
+		return false
+
+func is_match_contains(search_term: String, game_name: String) -> bool:
+	if search_term == "":
+		return true
+	elif game_name.contains(search_term):
+		return true
+	else:
+		return false	
+			
+func is_match_regex(search_term: String, game_name: String) -> bool:
 	if search_term == "":
 		return true
 	elif compile_regex(search_term).search(game_name):
 		return true
 	else:
 		return false
+		
+func add_game(game: String) -> void:
+	var label := Label.new()
+	label.text = game
+	print("game: " + game)
+	label.autowrap_mode = TextServer.AUTOWRAP_WORD
+	if !game_exists(game):
+		search_list.add_child(label)
+
+func game_exists(game: String) -> bool:
+	var game_exists: bool = false
+	for child: Label in search_list.get_children():
+		if child.text == game:
+			game_exists = true
+	return game_exists
 
 func compile_regex(search_term: String) -> RegEx:
 	var regex = RegEx.new()
 	var regText: String = ".*"
 	for letter in search_term:
 		regText += letter + ".*"
-	print(regText)
+	#print(regText)
 	regex.compile(regText)
 	return regex
 
 func get_list_of_games() -> void:
-	var handle_games = func(array):
+	var handle_games = func handle_games(array):
 		if typeof(array) == TYPE_ARRAY:
+			games = []
 			games.append_array(array)
 			for game in games:
 				var label := Label.new()
@@ -74,7 +113,7 @@ func get_list_of_games() -> void:
 			print("Unexpected data")
 	Settings.make_request2("/music/all/order", handle_games, true)
 
-func clear():
+func clear() -> void:
 	search_bar.text = ""
 	search()
 	search_bar.grab_focus()