Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: ♻️ split validation functions #191

Merged
merged 2 commits into from
Mar 28, 2023
Merged

refactor: ♻️ split validation functions #191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ec95ef
refactor: :recycle: split validation functions
KANAjetzt Mar 28, 2023
2aba044
Merge branch 'development' into refactor_split_validate_dependencies_…
KANAjetzt Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 3 additions & 25 deletions addons/mod_loader/classes/mod_manifest.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ func _init(manifest: Dictionary) -> void:
config_defaults = godot_details.config_defaults

var mod_id = get_mod_id()
if (not validate_dependencies_and_incompatibilities(mod_id, dependencies, incompatibilities) or
not validate_dependencies_and_incompatibilities_conflicts(mod_id, dependencies, incompatibilities) or
not validate_optional_dependencies(mod_id, optional_dependencies)):
if (not is_mod_id_array_valid(mod_id, dependencies, "dependency") or
not is_mod_id_array_valid(mod_id, incompatibilities, "incompatibility") or
not is_mod_id_array_valid(mod_id, optional_dependencies, "optional_dependency")):
return


Expand Down Expand Up @@ -249,28 +249,6 @@ static func is_semver_valid(check_version_number: String, is_silent := false) ->
return true


static func validate_dependencies_and_incompatibilities(mod_id: String, dependencies: PoolStringArray, incompatibilities: PoolStringArray, is_silent := false) -> bool:
var valid_dependencies := validate_dependencies(mod_id, dependencies, is_silent)
var valid_incompatibilities := validate_incompatibilities(mod_id, incompatibilities, is_silent)

if not valid_dependencies or not valid_incompatibilities:
return false

return true


static func validate_optional_dependencies(mod_id: String, optional_dependencies: PoolStringArray, is_silent := false) -> bool:
return is_mod_id_array_valid(mod_id, optional_dependencies, "optional_dependency", is_silent)


static func validate_dependencies(mod_id: String, dependencies: PoolStringArray, is_silent := false) -> bool:
return is_mod_id_array_valid(mod_id, dependencies, "dependency", is_silent)


static func validate_incompatibilities(mod_id: String, incompatibilities: PoolStringArray, is_silent := false) -> bool:
return is_mod_id_array_valid(mod_id, incompatibilities, "incompatibility", is_silent)


# Validates a mod's dependencies and incompatibilities to ensure they don't conflict.
static func validate_dependencies_and_incompatibilities_conflicts(
mod_id: String,
Expand Down