Functions for returning API responses are now handled entirely in the parent class, avoiding code duplication across all supported APIs.

This commit is contained in:
Jamie Greunbaum 2024-05-28 15:59:01 -04:00
parent 407e3b2a9e
commit 58bc591405
2 changed files with 12 additions and 19 deletions

View File

@ -12,16 +12,13 @@ func _init():
func _return_list_of_bugs(map_name:String, callback:Callable) -> int: func _return_list_of_bugs(map_name:String, callback:Callable) -> int:
print("Insert list of ", _current_server_api(), " bugs here.") return __start_thread_with_callback(__return_list_of_bugs_thread.bind(map_name, callback))
return BugbotServerError.OK
func _prepare_form(callback:Callable) -> int: func _prepare_form(callback:Callable) -> int:
print("Prepare ", _current_server_api(), " form here.") return __start_thread_with_callback(__prepare_form_thread.bind(callback))
return BugbotServerError.OK
func _send_form_data(data:Dictionary, map_name:String, bug_position:Vector3, bug_normal:Vector3, callback:Callable) -> int: func _send_form_data(data:Dictionary, map_name:String, bug_position:Vector3, bug_normal:Vector3, callback:Callable) -> int:
print("Send ", _current_server_api(), " form data here.") return __start_thread_with_callback(__send_form_data_thread.bind(data, map_name, bug_position, bug_normal, callback))
return BugbotServerError.OK
static func _create_new_server_api() -> BugbotServerAPI: static func _create_new_server_api() -> BugbotServerAPI:
@ -80,10 +77,16 @@ func __create_header_data(content_length:int = -1) -> Array:
func __return_list_of_bugs_thread(map_name:String, callback:Callable) -> void: func __return_list_of_bugs_thread(map_name:String, callback:Callable) -> void:
pass print("Insert list of ", _current_server_api(), " bugs here.")
callback.call_deferred([])
__bugbot_server_thread.call_deferred("wait_to_finish")
func __prepare_form_thread(callback:Callable) -> void: func __prepare_form_thread(callback:Callable) -> void:
pass print("Prepare ", _current_server_api(), " form here.")
callback.call_deferred([])
__bugbot_server_thread.call_deferred("wait_to_finish")
func __send_form_data_thread(data:Dictionary, map_name:String, bug_position:Vector3, bug_normal:Vector3, callback:Callable) -> void: func __send_form_data_thread(data:Dictionary, map_name:String, bug_position:Vector3, bug_normal:Vector3, callback:Callable) -> void:
pass print("Send ", _current_server_api(), " form data here.")
callback.call_deferred([])
__bugbot_server_thread.call_deferred("wait_to_finish")

View File

@ -21,16 +21,6 @@ const RESOLVED_TAG : StringName = &"Status/Resolved"
#endregion #endregion
func _return_list_of_bugs(map_name:String, callback:Callable) -> int:
return __start_thread_with_callback(__return_list_of_bugs_thread.bind(map_name, callback))
func _prepare_form(callback:Callable) -> int:
return __start_thread_with_callback(__prepare_form_thread.bind(callback))
func _send_form_data(data:Dictionary, map_name:String, bug_position:Vector3, bug_normal:Vector3, callback:Callable) -> int:
return __start_thread_with_callback(__send_form_data_thread.bind(data, map_name, bug_position, bug_normal, callback))
func __return_list_of_bugs_thread(map_name:String, callback:Callable) -> void: func __return_list_of_bugs_thread(map_name:String, callback:Callable) -> void:
var http_client : HTTPClient = HTTPClient.new() var http_client : HTTPClient = HTTPClient.new()
if __connect_to_server(http_client, DEFAULT_SERVER) != HTTPClient.STATUS_CONNECTED: if __connect_to_server(http_client, DEFAULT_SERVER) != HTTPClient.STATUS_CONNECTED: