diff --git a/src/classes/Basemodule.gd b/src/classes/basemodule.gd similarity index 100% rename from src/classes/Basemodule.gd rename to src/classes/basemodule.gd diff --git a/src/classes/Config.gd b/src/classes/config.gd similarity index 100% rename from src/classes/Config.gd rename to src/classes/config.gd diff --git a/src/classes/Loggerinstance.gd b/src/classes/loggerinstance.gd similarity index 99% rename from src/classes/Loggerinstance.gd rename to src/classes/loggerinstance.gd index fc64653..af07884 100644 --- a/src/classes/Loggerinstance.gd +++ b/src/classes/loggerinstance.gd @@ -14,6 +14,7 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . + ## Passes [code]origin[/code] for you. ## ## Pretty much a wrapper around CORE's logging implementation. diff --git a/src/classes/Types.gd b/src/classes/types.gd similarity index 100% rename from src/classes/Types.gd rename to src/classes/types.gd diff --git a/src/Core.gd b/src/core.gd similarity index 94% rename from src/Core.gd rename to src/core.gd index 6da7776..0d70fda 100644 --- a/src/Core.gd +++ b/src/core.gd @@ -23,12 +23,12 @@ extends Node class_name Core # Constants -## The release number -const version_release: int = 1 -## The release type +## The version number +const version_version: int = 1 +## The version type const version_type: CoreTypes.VersionType = CoreTypes.VersionType.BETA -## The release type number. Resets on every new release and release type. -const version_typerelease: int = 3 +## The version type number. Resets on every new version and version type. +const version_typerelease: int = 4 # Modules ## Use this to access CORE's logging implementation. @@ -92,12 +92,12 @@ func initialize_modules() -> void: edl.name = "EasyDownLoader" storage.name = "Storage" # Set scripts - logger.set_script(ResourceLoader.load(basepath + "src/Logger.gd")) - misc.set_script(ResourceLoader.load(basepath + "src/Misc.gd")) - sms.set_script(ResourceLoader.load(basepath + "src/Sms.gd")) - logui.set_script(ResourceLoader.load(basepath + "src/Logui.gd")) - edl.set_script(ResourceLoader.load(basepath + "src/Edl.gd")) - storage.set_script(ResourceLoader.load(basepath + "src/Storage.gd")) + logger.set_script(ResourceLoader.load(basepath + "src/logger.gd")) + misc.set_script(ResourceLoader.load(basepath + "src/misc.gd")) + sms.set_script(ResourceLoader.load(basepath + "src/sms.gd")) + logui.set_script(ResourceLoader.load(basepath + "src/logui.gd")) + edl.set_script(ResourceLoader.load(basepath + "src/edl.gd")) + storage.set_script(ResourceLoader.load(basepath + "src/storage.gd")) # Set reference to self logger.core = self misc.core = self @@ -254,10 +254,10 @@ func is_devmode() -> bool: ## - [code]%headless%[/code]: Returns the headless mode status func get_formatted_string(string: String) -> String: # Version strings - string = string.replace("%release%", str(version_release)) - string = string.replace("%release_type%", str(version_typerelease)) + string = string.replace("%version%", str(version_version)) + string = string.replace("%version_type%", str(version_typerelease)) var semantic_version: Array[int] = get_version_semantic() - string = string.replace("%release_semantic%", str(semantic_version[0]) + "." + str(semantic_version[1]) + "." + str(semantic_version[2])) + string = string.replace("%version_semantic%", str(semantic_version[0]) + "." + str(semantic_version[1]) + "." + str(semantic_version[2])) match(version_type): CoreTypes.VersionType.RELEASE: string = string.replace("%type%", "Release") @@ -293,7 +293,7 @@ func get_version_semantic() -> Array[int]: CoreTypes.VersionType.RELEASECANDIDATE: version_type_int = 2 CoreTypes.VersionType.BETA: version_type_int = 1 CoreTypes.VersionType.ALPHA: version_type_int = 0 - return [version_release, version_type_int, version_typerelease] + return [version_version, version_type_int, version_typerelease] # Determines CORE's installation/base path ## Determines CORE's installation/base path[br] diff --git a/src/Edl.gd b/src/edl.gd similarity index 82% rename from src/Edl.gd rename to src/edl.gd index 36d2e41..3f11cf5 100644 --- a/src/Edl.gd +++ b/src/edl.gd @@ -30,10 +30,10 @@ func generate_id() -> int: logger.diagf("Edl", "Generated new download id " + str(id)) return id -func awaited_request(url: String, method: HTTPClient.Method = HTTPClient.Method.METHOD_GET, headers: PackedStringArray = PackedStringArray([]), data: String = "") -> Dictionary: +func awaited_request(url: String, parse_utf8: bool, method: HTTPClient.Method = HTTPClient.Method.METHOD_GET, headers: PackedStringArray = PackedStringArray([]), data: String = "") -> Dictionary: logger.verbf("Edl", "Creating awaited request") var id: int = create_download(url, method, headers, data) - start_download(id) + start_download(id, parse_utf8) logger.diagf("Edl", "Waiting for request " + str(id) + " to finish") while !is_download_complete(id): await get_tree().create_timer(0.1, true).timeout var dldata: Dictionary = list_complete[id] @@ -41,19 +41,19 @@ func awaited_request(url: String, method: HTTPClient.Method = HTTPClient.Method. return dldata func oneline_awaited_request(url: String, return_utf8: bool = true, ignore_http_code: bool = false, method: HTTPClient.Method = HTTPClient.Method.METHOD_GET, headers: PackedStringArray = PackedStringArray([]), data: String = "") -> Variant: - var dldata: Dictionary = await awaited_request(url, method, headers, data) + var dldata: Dictionary = await awaited_request(url, return_utf8, method, headers, data) if dldata["result"] != Error.OK: return null elif !ignore_http_code and dldata["http_code"] != 200: return null else: if return_utf8: return dldata["body_utf8"] else: return dldata["body"] -func batch_awaited_request(urls: PackedStringArray, method: HTTPClient.Method = HTTPClient.Method.METHOD_GET, headers: PackedStringArray = PackedStringArray([]), data: String = "") -> Array[Dictionary]: +func batch_awaited_request(urls: PackedStringArray, parse_utf8: bool, method: HTTPClient.Method = HTTPClient.Method.METHOD_GET, headers: PackedStringArray = PackedStringArray([]), data: String = "") -> Array[Dictionary]: logger.verbf("Edl", "Creating " + str(urls.size()) + " awaited request(s)") var dldata: Array[Dictionary]= [] for url in urls: var id: int = create_download(url, method, headers, data) - start_download(id) + start_download(id, parse_utf8) logger.diagf("Edl", "Waiting for request " + str(id) + " to finish") while !is_download_complete(id): await get_tree().create_timer(0.1, true).timeout dldata.append(list_complete[id]) @@ -61,12 +61,12 @@ func batch_awaited_request(urls: PackedStringArray, method: HTTPClient.Method = return dldata func create_download(url: String, method: HTTPClient.Method = HTTPClient.Method.METHOD_GET, headers: PackedStringArray = PackedStringArray([]), body: String = "") -> int: - logger.verbf("Edl", "Creating new request\n-> URL: " + url + "\n-> Method: " + str(method) + "\nHeaders:\n" + str(headers) + "\nBody:\n" + body) + logger.verbf("Edl", "Creating new request\n-> URL: " + url + "\n-> Method: " + str(method) + "\nHeaders: " + str(headers.size()) + "\nBody size: " + str(body.length()) + " Characters") var id = generate_id() list_queue.merge({ id: { "url": url, "method": method, "headers": headers, "body": body } }) return id -func start_download(id) -> void: +func start_download(id: int, parse_utf8: bool) -> void: logger.verbf("Edl", "Starting request " + str(id)) list_active.merge({ id: list_queue[id] }) list_queue.erase(id) @@ -76,8 +76,8 @@ func start_download(id) -> void: download.accept_gzip = true download.use_threads = true var lambda: Callable = func(result: int, http_code: int, headers: PackedStringArray, body: PackedByteArray) -> void: - logger.verbf("Edl", "Request " + str(id) + " completed\nResult: " + str(result) + "\nHTTP response code: " + str(http_code) + "\nHeaders:\n" + str(headers) + "\nBody size: " + str(body.size()) + " Bytes // " + str(core.misc.byte2mib(body.size(), true)) + " MiB") - list_complete.merge({ id: { "result": result, "http_code": http_code, "headers": headers, "body": body, "body_utf8": body.get_string_from_utf8() } }) + logger.verbf("Edl", "Request " + str(id) + " completed\nResult: " + str(result) + "\nHTTP response code: " + str(http_code) + "\nHeaders: " + str(headers.size()) + "\nBody size: " + str(body.size()) + " Bytes // " + str(core.misc.byte2mib(body.size(), true)) + " MiB") + list_complete.merge({ id: { "result": result, "http_code": http_code, "headers": headers, "body": body, "body_utf8": body.get_string_from_utf8() if !parse_utf8 else "" } }) list_active.erase(id) download.connect("request_completed", lambda) add_child(download) diff --git a/src/Logger.gd b/src/logger.gd similarity index 100% rename from src/Logger.gd rename to src/logger.gd diff --git a/src/Logui.gd b/src/logui.gd similarity index 100% rename from src/Logui.gd rename to src/logui.gd diff --git a/src/Misc.gd b/src/misc.gd similarity index 100% rename from src/Misc.gd rename to src/misc.gd diff --git a/src/Sms.gd b/src/sms.gd similarity index 100% rename from src/Sms.gd rename to src/sms.gd diff --git a/src/Storage.gd b/src/storage.gd similarity index 100% rename from src/Storage.gd rename to src/storage.gd