Make private API start with underscore

rsubtil · rsubtil · commit f199afff1154 · 2023-11-02T17:42:52.000Z
diff --git a/scenes/config/ConfigPopup.gd b/scenes/config/ConfigPopup.gd
@@ -96,8 +96,8 @@ func _on_SettingsTab_focus_entered():
 
 func _on_ConfigPopup_popup_hide():
 	if should_reload_theme:
-		RetroHubConfig.load_user_data()
-		RetroHub.load_theme()
+		RetroHubConfig._load_user_data()
+		RetroHub._load_theme()
 	should_reload_theme = false
 	RetroHubConfig.save_theme_config()
 	TTS.speak("Configuration closed.")
diff --git a/scenes/config/GameSettings.gd b/scenes/config/GameSettings.gd
@@ -42,7 +42,7 @@ func _on_save_pressed():
 	n_game_metadata_editor.save_changes()
 	n_game_info_editor.save_changes()
 	n_game_emulator_editor.save_changes()
-	if RetroHubConfig.save_game_data(n_game_metadata_editor.game_data):
+	if RetroHubConfig._save_game_data(n_game_metadata_editor.game_data):
 		_on_reset_state()
 
 
diff --git a/scenes/config/ScraperSettings.gd b/scenes/config/ScraperSettings.gd
@@ -137,7 +137,7 @@ func _on_ScraperSettings_visibility_changed():
 		update_scrape_stats(true)
 	elif n_ss_settings:
 		n_ss_settings.save_credentials()
-		RetroHubConfig.save_config()
+		RetroHubConfig._save_config()
 
 func convert_hash_size_from_range(value: float) -> int:
 	# Value is actually an int
diff --git a/scenes/config/settings/EmulatorSettings.gd b/scenes/config/settings/EmulatorSettings.gd
@@ -84,7 +84,7 @@ func get_current_emulator_editor():
 func save_changes():
 	var emulator_raw : Dictionary = get_current_emulator_editor().save()
 	emulator_raw["#modified"] = true
-	RetroHubConfig.save_emulator(emulator_raw)
+	RetroHubConfig._save_emulator(emulator_raw)
 	update_emulator_selection(emulator_raw)
 	n_save.disabled = true
 	n_discard.disabled = true
@@ -97,7 +97,7 @@ func discard_changes():
 
 
 func _on_RestoreEmulator_pressed():
-	var default_emulator : Dictionary = RetroHubConfig.restore_emulator(get_current_emulator_editor().curr_emulator)
+	var default_emulator : Dictionary = RetroHubConfig._restore_emulator(get_current_emulator_editor().curr_emulator)
 	get_current_emulator_editor().curr_emulator = default_emulator
 	update_emulator_selection(default_emulator)
 	n_save.disabled = true
@@ -124,7 +124,7 @@ func _on_AddCustomInfoPopup_identifier_picked(id):
 	}
 
 	RetroHubConfig.emulators_map[id] = emulator
-	RetroHubConfig.save_emulator(emulator)
+	RetroHubConfig._save_emulator(emulator)
 
 	var idx : int = n_emulator_selection.get_item_count()
 	n_emulator_selection.add_item("[%s] %s" % [emulator["name"], emulator["fullname"]], idx)
@@ -156,7 +156,7 @@ func _on_RetroArchEmulatorEditor_request_add_core():
 
 func _on_RemoveEmulator_pressed():
 	var emulator_raw : Dictionary = get_current_emulator_editor().curr_emulator
-	RetroHubConfig.remove_custom_emulator(emulator_raw)
+	RetroHubConfig._remove_custom_emulator(emulator_raw)
 
 	for idx in n_emulator_selection.get_item_count():
 		if idx == sep_idx:
diff --git a/scenes/config/settings/GeneralSettings.gd b/scenes/config/settings/GeneralSettings.gd
@@ -41,21 +41,21 @@ func set_themes():
 			var theme_pck := file.get_line()
 			if theme_pck.ends_with(".pck"):
 				n_themes.add_item(theme_pck.get_file().get_basename(), id)
-				if RetroHubConfig.get_default_themes_dir() in RetroHubConfig.theme_path and \
+				if RetroHubConfig._get_default_themes_dir() in RetroHubConfig.theme_path and \
 					theme_pck in RetroHubConfig.theme_path:
 					n_themes.selected = id
 				theme_id_map[id] = "res://default_themes/" + theme_pck
 				id += 1
 	n_themes.add_separator()
 	id += 1
 	# User themes
-	var dir := DirAccess.open(RetroHubConfig.get_themes_dir())
+	var dir := DirAccess.open(RetroHubConfig._get_themes_dir())
 	if dir and not dir.list_dir_begin(): # TODOGODOT4 fill missing arguments https://github.com/godotengine/godot/pull/40547
 		var next := dir.get_next()
 		while not next.is_empty():
 			if not dir.current_is_dir() and next.ends_with(".pck"):
 				n_themes.add_item(next, id)
-				if not RetroHubConfig.get_default_themes_dir() in RetroHubConfig.theme_path and \
+				if not RetroHubConfig._get_default_themes_dir() in RetroHubConfig.theme_path and \
 					next in RetroHubConfig.theme_path:
 					n_themes.selected = id
 				theme_id_map[id] = next
@@ -91,7 +91,7 @@ func _on_Themes_item_selected(index):
 
 func _on_SetThemePath_pressed():
 	#warning-ignore:return_value_discarded
-	OS.shell_open(RetroHubConfig.get_themes_dir())
+	OS.shell_open(RetroHubConfig._get_themes_dir())
 
 func _on_SetGamePath_pressed():
 	RetroHubUI.filesystem_filters([])
@@ -108,7 +108,7 @@ func _on_Language_item_selected(index):
 			RetroHubConfig.config.lang = "en"
 
 func _on_AppSettings_hide():
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 
 func _on_AppSettings_visibility_changed():
@@ -128,12 +128,12 @@ func _on_SetupWizardButton_pressed():
 
 func _on_GraphicsMode_item_selected(index):
 	RetroHubConfig.config.fullscreen = index == 1
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 
 func _on_VSync_toggled(button_pressed):
 	RetroHubConfig.config.vsync = button_pressed
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 
 func _on_RenderRes_value_changed(value):
@@ -143,4 +143,4 @@ func _on_RenderRes_value_changed(value):
 
 func _on_ScreenReader_toggled(button_pressed):
 	RetroHubConfig.config.accessibility_screen_reader_enabled = button_pressed
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
diff --git a/scenes/config/settings/InputSettings.gd b/scenes/config/settings/InputSettings.gd
@@ -105,7 +105,7 @@ func _on_input_type_changed(input_type: int):
 		n_input_tab.current_tab = input_type
 
 func _on_hide():
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 
 func _on_StartLayout_pressed():
@@ -117,7 +117,7 @@ func _on_ClearLayout_pressed():
 	if splits.size() > 1:
 		Input.remove_joy_mapping(splits[0])
 	RetroHubConfig.config.custom_input_remap = ""
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 	n_cn_clear_layout.disabled = true
 
 
@@ -143,7 +143,7 @@ func _on_KeyboardRemap_key_remapped(key, old_code, new_code):
 			keymap[_key].erase(new_code)
 			keymap[_key].push_back(old_code)
 	RetroHubConfig.config.mark_for_saving()
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 func _on_CN_pressed(input_key):
 	var button := get_viewport().gui_get_focus_owner()
@@ -167,7 +167,7 @@ func _on_ControllerButtonRemap_remap_done(key, old_button, new_button):
 			if not old_button in map[_key]:
 				map[_key].push_back(old_button)
 	RetroHubConfig.config.mark_for_saving()
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 func _on_CNAxis_pressed(axis):
 	var button := get_viewport().gui_get_focus_owner()
@@ -179,7 +179,7 @@ func _on_ControllerAxisRemap_remap_done(action, old_axis, new_axis):
 	var is_main : bool = action == "rh_left"
 	RetroHubConfig.config.input_controller_main_axis = new_axis if is_main else old_axis
 	RetroHubConfig.config.input_controller_secondary_axis = old_axis if is_main else new_axis
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 
 func _on_CNIconType_item_selected(index):
@@ -224,14 +224,14 @@ func _on_CNDelay_value_changed(value):
 
 func _on_KBReset_pressed():
 	RetroHubConfig.config.input_key_map = ConfigData.default_input_key_map()
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 
 func _on_CNReset_pressed():
 	RetroHubConfig.config.input_controller_map = ConfigData.default_input_controller_map()
 	RetroHubConfig.config.input_controller_main_axis = "left"
 	RetroHubConfig.config.input_controller_secondary_axis = "right"
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 
 func _on_VirtualKeyboardLayout_item_selected(index):
diff --git a/scenes/config/settings/RegionSettings.gd b/scenes/config/settings/RegionSettings.gd
@@ -120,7 +120,7 @@ func _on_DateFormat_item_selected(index):
 			RetroHubConfig.config.date_format = "yyyy/mm/dd"
 
 func _on_AppSettings_hide():
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 
 
 func _on_ResetRegion_pressed():
diff --git a/scenes/config/settings/SystemSettings.gd b/scenes/config/settings/SystemSettings.gd
@@ -73,7 +73,7 @@ func _on_SystemEditor_change_ocurred():
 func save_changes():
 	var system_raw : Dictionary = n_system_editor.save()
 	system_raw["#modified"] = true
-	RetroHubConfig.save_system(system_raw)
+	RetroHubConfig._save_system(system_raw)
 	update_system_selection(system_raw)
 	emit_signal("theme_reload")
 	n_save.disabled = true
@@ -95,7 +95,7 @@ func _on_SystemEditor_request_extensions(system_name, curr_extensions):
 
 
 func _on_RestoreSystem_pressed():
-	var default_system : Dictionary = RetroHubConfig.restore_system(n_system_editor.curr_system)
+	var default_system : Dictionary = RetroHubConfig._restore_system(n_system_editor.curr_system)
 	n_system_editor.curr_system = default_system
 	update_system_selection(default_system)
 	emit_signal("theme_reload")
@@ -125,7 +125,7 @@ func _on_AddCustomInfoPopup_identifier_picked(id):
 	}
 
 	RetroHubConfig._systems_raw[id] = system
-	RetroHubConfig.save_system(system)
+	RetroHubConfig._save_system(system)
 
 	var idx : int = n_system_selection.get_item_count()
 	n_system_selection.add_item("[%s] %s" % [system["name"], system["fullname"]], idx)
@@ -140,7 +140,7 @@ func _on_AddSystem_pressed():
 
 func _on_RemoveSystem_pressed():
 	var system_raw : Dictionary = n_system_editor.curr_system
-	RetroHubConfig.remove_custom_system(system_raw)
+	RetroHubConfig._remove_custom_system(system_raw)
 
 	for idx in n_system_selection.get_item_count():
 		if idx == sep_idx:
diff --git a/scenes/config/settings/emulator/EmulatorEditor.gd b/scenes/config/settings/emulator/EmulatorEditor.gd
@@ -34,7 +34,7 @@ func save() -> Dictionary:
 	curr_emulator["binpath"] = n_path.text
 	curr_emulator["command"] = n_command.text
 
-	RetroHubConfig.set_emulator_path(curr_emulator["name"], "binpath", n_path.text)
+	RetroHubConfig._set_emulator_path(curr_emulator["name"], "binpath", n_path.text)
 
 	return curr_emulator
 
diff --git a/scenes/config/settings/emulator/RetroArchEmulatorEditor.gd b/scenes/config/settings/emulator/RetroArchEmulatorEditor.gd
@@ -69,8 +69,8 @@ func save() -> Dictionary:
 
 	curr_emulator["cores"] = cores.duplicate(true)
 
-	RetroHubConfig.set_emulator_path("retroarch", "binpath", n_path.text)
-	RetroHubConfig.set_emulator_path("retroarch", "corepath", n_core_path.text)
+	RetroHubConfig._set_emulator_path("retroarch", "binpath", n_path.text)
+	RetroHubConfig._set_emulator_path("retroarch", "corepath", n_core_path.text)
 
 	return curr_emulator
 
diff --git a/scenes/config/settings/input/ControllerLayout.gd b/scenes/config/settings/input/ControllerLayout.gd
@@ -275,7 +275,7 @@ func create_mapping_string(mapping) -> String:
 func _remap(mapping):
 	var mapping_str := create_mapping_string(mapping)
 	RetroHubConfig.config.custom_input_remap = mapping_str
-	RetroHubConfig.save_config()
+	RetroHubConfig._save_config()
 	mark_done()
 
 func reset():
diff --git a/scenes/game_launched/GameLaunched.gd b/scenes/game_launched/GameLaunched.gd
@@ -54,4 +54,4 @@ func _ready():
 	n_emu_name.text = emu_name_orig_text % RetroHub.launched_emulator["fullname"]
 
 func _on_Timer_timeout():
-	RetroHub.kill_game_process()
+	RetroHub._kill_game_process()
diff --git a/scenes/popups/first_time/FirstTimePopups.gd b/scenes/popups/first_time/FirstTimePopups.gd
@@ -24,7 +24,7 @@ func reset_section():
 func advance_section():
 	if n_main_content.current_tab == n_main_content.get_tab_count() - 1:
 		RetroHubConfig.config.is_first_time = false
-		RetroHubConfig.save_config()
+		RetroHubConfig._save_config()
 		hide()
 	n_main_content.current_tab += 1
 
diff --git a/scenes/popups/first_time/GamesSection.gd b/scenes/popups/first_time/GamesSection.gd
@@ -28,7 +28,7 @@ func grab_focus():
 func _on_NextButton_pressed():
 	RetroHubConfig.config.games_dir = n_path.text
 	RetroHubConfig.config.custom_gamemedia_dir = n_media_path.text if not n_use_custom_media.button_pressed else ""
-	RetroHubConfig.load_game_data_files()
+	RetroHubConfig._load_game_data_files()
 	emit_signal("advance_section")
 
 func _on_ChooseDir_pressed():
diff --git a/scenes/popups/first_time/ImportSettingsSection.gd b/scenes/popups/first_time/ImportSettingsSection.gd
@@ -23,7 +23,7 @@ func _ready():
 
 func grab_focus():
 	# Importers need emulator info already
-	RetroHubConfig.load_emulators()
+	RetroHubConfig._load_emulators()
 	if RetroHubConfig.config.accessibility_screen_reader_enabled:
 		n_intro_lbl.grab_focus()
 	else:
diff --git a/scenes/popups/first_time/SystemTrees.gd b/scenes/popups/first_time/SystemTrees.gd
@@ -112,7 +112,7 @@ func save():
 		for next in tree.get_root().get_children():
 			if next.is_checked(0):
 				var system : Dictionary = next.get_metadata(0)
-				RetroHubConfig.make_system_folder(system)
+				RetroHubConfig._make_system_folder(system)
 
 func _on_item_selected(tree: Tree):
 	if tree.get_selected().get_metadata(0):
diff --git a/scenes/popups/first_time/SystemsSection.gd b/scenes/popups/first_time/SystemsSection.gd
@@ -19,8 +19,8 @@ func _ready():
 	setup_categories()
 
 func grab_focus():
-	RetroHubConfig.load_systems()
-	RetroHubConfig.load_game_data_files()
+	RetroHubConfig._load_systems()
+	RetroHubConfig._load_game_data_files()
 	n_system_trees.setup_systems(categories)
 	if RetroHubConfig.config.accessibility_screen_reader_enabled:
 		n_intro_lbl.grab_focus()
diff --git a/scenes/popups/scraper/ScraperPopup.gd b/scenes/popups/scraper/ScraperPopup.gd
@@ -303,7 +303,7 @@ func prepare_media_scrape_from_search(game_entry: RetroHubScraperGameEntry, sear
 func t_on_media_scrape_finished(game_data: RetroHubGameData, type: int, data: PackedByteArray, extension: String):
 	if pending_medias.has(game_data):
 		# Save media
-		var path := RetroHubConfig.get_gamemedia_dir() \
+		var path := RetroHubConfig._get_gamemedia_dir() \
 						.path_join(game_data.system.name) \
 						.path_join(RetroHubMedia.convert_type_to_media_path(type)) \
 						.path_join(_get_game_path(game_data) + "." + extension)
@@ -360,8 +360,8 @@ func _finish_scrape(game_entry: RetroHubScraperGameEntry):
 	call_deferred("incr_num_games_success")
 	call_deferred("decr_num_games_pending")
 	if scrape_data:
-		RetroHubMedia.compute_blurhash(game_entry.game_data)
-		RetroHubConfig.call_deferred("save_game_data", game_entry.game_data)
+		RetroHubMedia._compute_blurhash(game_entry.game_data)
+		RetroHubConfig.call_deferred("_save_game_data", game_entry.game_data)
 
 func _convert_type_to_str(type: int):
 	match type:
@@ -546,7 +546,7 @@ func finish_scraping():
 	# Save pending metadata
 	for game_entry in game_entry_list:
 		if game_entry.state != RetroHubScraperGameEntry.State.SUCCESS and game_entry.game_data.has_metadata:
-			if not RetroHubConfig.save_game_data(game_entry.game_data):
+			if not RetroHubConfig._save_game_data(game_entry.game_data):
 				push_error("Error saving game data: " + game_entry.game_data.title)
 	hide()
 
diff --git a/source/Config.gd b/source/Config.gd
diff --git a/source/Media.gd b/source/Media.gd
diff --git a/source/RetroHub.gd b/source/RetroHub.gd
diff --git a/source/emulators/GenericEmulator.gd b/source/emulators/GenericEmulator.gd
diff --git a/source/emulators/RetroarchEmulator.gd b/source/emulators/RetroarchEmulator.gd
diff --git a/source/importers/EmulationStationImporter.gd b/source/importers/EmulationStationImporter.gd
diff --git a/source/importers/RetroArchImporter.gd b/source/importers/RetroArchImporter.gd
diff --git a/tests/box_texture_blit.tscn b/tests/box_texture_blit.tscn
diff --git a/tests/test_theme_loading.gd b/tests/test_theme_loading.gd
