Merge pull request #493 from V-Sekai/lint

Add code lint sample

Author: fire

.pre-commit-config.yaml

@@ -1,6 +1,14 @@
 repos:
   - repo: local
     hooks:
+      - id: gdlint
+        name: gdlint
+        entry: gdlint
+        language: python
+        additional_dependencies: [gdtoolkit==4.3.3]       
+        files: ^addons/godot_uro/godot_uro_helper\.gd$
+        types: [gdscript]
+
       # vsk_importer_exporter is ignored due to broken code.
       # VRM and godot_state_charts are ignored because upstream changes are complicated
       - id: gdformat

addons/godot_uro/godot_uro_helper.gd

@@ -7,20 +7,36 @@
 extends RefCounted
 
 enum UroUserContentType { UNKNOWN, AVATAR, MAP, PROP }
+enum RequesterCode {
+	OK = 0,
+	CANCELLED,
+	TERMINATED,
+	CANT_CONNECT,
+	CANT_RESOLVE,
+	SSL_HANDSHAKE_ERROR,
+	DISCONNECTED,
+	CONNECTION_ERROR,
+	UNKNOWN_STATUS_ERROR,
+	FILE_ERROR,
+	HTTP_RESPONSE_NOT_OK,
+	NO_TOKEN,
+	MALFORMED_RESPONSE_DATA,
+	JSON_PARSE_ERROR,
+	JSON_VALIDATE_ERROR,
+	NO_RESPONSE_BODY,
+	FAILED_TO_CONNECT,
+	POLL_ERROR,
+}
 
 const LOCALHOST_HOST = "127.0.0.1"
 const LOCALHOST_PORT = 4000
-
 const DEFAULT_URO_HOST = LOCALHOST_HOST
 const DEFAULT_URO_PORT = LOCALHOST_PORT
-
 const API_PATH = "/api"
 const API_VERSION = "/v1"
-
 const SHOW_PATH = "/show"
 const NEW_PATH = "/new"
 const RENEW_PATH = "/renew"
-
 const PROFILE_PATH = "/profile"
 const SESSION_PATH = "/session"
 const REGISTRATION_PATH = "/registration"
@@ -29,35 +45,12 @@ const AVATARS_PATH = "/avatars"
 const MAPS_PATH = "/maps"
 const SHARDS_PATH = "/shards"
 const DASHBOARD_PATH = "/dashboard"
-
 const DEFAULT_ACCOUNT_ID = "UNKNOWN_ID"
 const DEFAULT_ACCOUNT_USERNAME = "UNKNOWN_USERNAME"
 const DEFAULT_ACCOUNT_DISPLAY_NAME = "UNKNOWN_DISPLAY_NAME"
-
 const UNTITLED_SHARD = "UNTITLED_SHARD"
 const UNKNOWN_MAP = "UNKNOWN_MAP"
 
-enum RequesterCode {
-	OK = 0,
-	CANCELLED,
-	TERMINATED,
-	CANT_CONNECT,
-	CANT_RESOLVE,
-	SSL_HANDSHAKE_ERROR,
-	DISCONNECTED,
-	CONNECTION_ERROR,
-	UNKNOWN_STATUS_ERROR,
-	FILE_ERROR,
-	HTTP_RESPONSE_NOT_OK,
-	NO_TOKEN,
-	MALFORMED_RESPONSE_DATA,
-	JSON_PARSE_ERROR,
-	JSON_VALIDATE_ERROR,
-	NO_RESPONSE_BODY,
-	FAILED_TO_CONNECT,
-	POLL_ERROR,
-}
-
 
 static func get_string_for_requester_code(p_requester_code: int) -> String:
 	match p_requester_code:
@@ -108,41 +101,37 @@ static func get_full_requester_error_string(p_requester: Dictionary) -> String:
 				p_requester["generic_code"]
 			]
 		)
-	elif p_requester["requester_code"] == RequesterCode.HTTP_RESPONSE_NOT_OK:
+
+	if p_requester["requester_code"] == RequesterCode.HTTP_RESPONSE_NOT_OK:
 		return (
 			"%s (error code: %s)"
 			% [
 				get_string_for_requester_code(p_requester["requester_code"]),
 				p_requester["response_code"]
 			]
 		)
-	elif p_requester["requester_code"] == RequesterCode.POLL_ERROR:
+
+	if p_requester["requester_code"] == RequesterCode.POLL_ERROR:
 		return (
 			"%s (error code: %s)"
 			% [
 				get_string_for_requester_code(p_requester["requester_code"]),
 				p_requester["generic_code"]
 			]
 		)
-	else:
-		return get_string_for_requester_code(p_requester["requester_code"])
+
+	return get_string_for_requester_code(p_requester["requester_code"])
 
 
 static func requester_result_is_ok(p_result) -> bool:
-	if p_result["requester_code"] == RequesterCode.OK:
-		return true
-	else:
-		return false
+	return p_result["requester_code"] == RequesterCode.OK
 
 
 static func requester_result_has_response(p_result) -> bool:
-	if (
+	return (
 		p_result["requester_code"] == RequesterCode.OK
 		or p_result["requester_code"] == RequesterCode.HTTP_RESPONSE_NOT_OK
-	):
-		return true
-	else:
-		return false
+	)
 
 
 static func populate_query(p_query_name: String, p_query_dictionary: Dictionary) -> Dictionary:
@@ -162,8 +151,7 @@ static func get_value_of_type(p_data: Dictionary, p_key: String, p_type: int, p_
 	var value = p_data.get(p_key, p_default_value)
 	if typeof(value) == p_type:
 		return value
-	else:
-		return p_default_value
+	return p_default_value
 
 
 static func process_user_privilege_ruleset(p_data) -> Dictionary:
@@ -236,34 +224,33 @@ static func process_session_json(p_input: Dictionary) -> Dictionary:
 				"message": "Malformed response data!",
 			}
 
-		else:
-			var output = p_input.get("output")
-			if output is Dictionary:
-				var error = output.get("error")
-				if error is Dictionary:
-					var message = error.get("message")
-					if message is String:
-						return {
-							"requester_code": p_input["requester_code"],
-							"generic_code": p_input["generic_code"],
-							"response_code": p_input["response_code"],
-							"message": message
-						}
+		var output = p_input.get("output")
+		if output is Dictionary:
+			var error = output.get("error")
+			if error is Dictionary:
+				var message = error.get("message")
+				if message is String:
+					return {
+						"requester_code": p_input["requester_code"],
+						"generic_code": p_input["generic_code"],
+						"response_code": p_input["response_code"],
+						"message": message
+					}
 
-			return {
-				"requester_code": RequesterCode.MALFORMED_RESPONSE_DATA,
-				"generic_code": p_input["generic_code"],
-				"response_code": p_input["response_code"],
-				"message": get_full_requester_error_string(p_input)
-			}
-	else:
 		return {
-			"requester_code": p_input["requester_code"],
+			"requester_code": RequesterCode.MALFORMED_RESPONSE_DATA,
 			"generic_code": p_input["generic_code"],
 			"response_code": p_input["response_code"],
 			"message": get_full_requester_error_string(p_input)
 		}
 
+	return {
+		"requester_code": p_input["requester_code"],
+		"generic_code": p_input["generic_code"],
+		"response_code": p_input["response_code"],
+		"message": get_full_requester_error_string(p_input)
+	}
+
 
 static func process_shards_json(p_input: Dictionary) -> Dictionary:
 	var result_dict: Dictionary = {}