Merge remote-tracking branch 'origin/main'

This commit is contained in:
Campbell 2024-08-02 23:57:58 -04:00
commit cfd5abac7e
Signed by: NinjaCheetah
GPG Key ID: B547958AF96ED344
3 changed files with 8 additions and 9 deletions

View File

@ -114,7 +114,6 @@ class IOSPatcher:
patch_count += 1 patch_count += 1
self.title.set_content(target_content, self.es_module_index) self.title.set_content(target_content, self.es_module_index)
self.title.content.content_records[self.es_module_index].content_type = 1 # Sets content to be non-shared
return patch_count return patch_count

View File

@ -329,14 +329,14 @@ class Ticket:
version_str_split = new_version.split(".") version_str_split = new_version.split(".")
if len(version_str_split) != 2: if len(version_str_split) != 2:
raise ValueError("Title version is not valid! String version must be entered in format \"X.X\".") raise ValueError("Title version is not valid! String version must be entered in format \"X.X\".")
if int(version_str_split[0]) > 255 or (int(version_str_split[0]) == 255 and int(version_str_split[1]) > 0): if int(version_str_split[0]) > 255 or int(version_str_split[1]) > 255:
raise ValueError("Title version is not valid! String version number cannot exceed v255.0.") raise ValueError("Title version is not valid! String version number cannot exceed v255.255.")
version_converted = title_ver_standard_to_dec(new_version, str(self.title_id.decode())) version_converted = title_ver_standard_to_dec(new_version, str(self.title_id.decode()))
self.title_version = version_converted self.title_version = version_converted
elif type(new_version) is int: elif type(new_version) is int:
# Validate that the version isn't higher than v65280. If the check passes, set that as the title version. # Validate that the version isn't higher than v65280. If the check passes, set that as the title version.
if new_version > 65280: if new_version > 65535:
raise ValueError("Title version is not valid! Integer version number cannot exceed v65280.") raise ValueError("Title version is not valid! Integer version number cannot exceed v65535.")
self.title_version = new_version self.title_version = new_version
else: else:
raise TypeError("Title version type is not valid! Type must be either integer or string.") raise TypeError("Title version type is not valid! Type must be either integer or string.")

View File

@ -402,16 +402,16 @@ class TMD:
version_str_split = new_version.split(".") version_str_split = new_version.split(".")
if len(version_str_split) != 2: if len(version_str_split) != 2:
raise ValueError("Title version is not valid! String version must be entered in format \"X.X\".") raise ValueError("Title version is not valid! String version must be entered in format \"X.X\".")
if int(version_str_split[0]) > 255 or (int(version_str_split[0]) == 255 and int(version_str_split[1]) > 0): if int(version_str_split[0]) > 255 or int(version_str_split[1]) > 255:
raise ValueError("Title version is not valid! String version number cannot exceed v255.0.") raise ValueError("Title version is not valid! String version number cannot exceed v255.255.")
self.title_version_converted = new_version self.title_version_converted = new_version
version_converted = title_ver_standard_to_dec(new_version, self.title_id) version_converted = title_ver_standard_to_dec(new_version, self.title_id)
self.title_version = version_converted self.title_version = version_converted
elif type(new_version) is int: elif type(new_version) is int:
# Validate that the version isn't higher than v65280. If the check passes, set that as the title version, # Validate that the version isn't higher than v65280. If the check passes, set that as the title version,
# then convert to standard form and set that as well. # then convert to standard form and set that as well.
if new_version > 65280: if new_version > 65535:
raise ValueError("Title version is not valid! Integer version number cannot exceed v65280.") raise ValueError("Title version is not valid! Integer version number cannot exceed v65535.")
self.title_version = new_version self.title_version = new_version
version_converted = title_ver_dec_to_standard(new_version, self.title_id) version_converted = title_ver_dec_to_standard(new_version, self.title_id)
self.title_version_converted = version_converted self.title_version_converted = version_converted