huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Fix crash when importing a corrupt pxo

Browse source
This commit is contained in:
Emmanouil Papadeas 2024-03-05 16:05:13 +02:00
parent e726dcfc09
commit 36d4b0fa18
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/Autoload/OpenSave.gd
View file

@ -185,30 +185,30 @@ func handle_loading_video(file: String) -> bool:
func open_pxo_file(path: String, untitled_backup := false, replace_empty := true) -> void: func open_pxo_file(path: String, untitled_backup := false, replace_empty := true) -> void:
var empty_project := Global.current_project.is_empty() and replace_empty var empty_project := Global.current_project.is_empty() and replace_empty
var new_project: Project var new_project: Project
if empty_project:
new_project = Global.current_project
new_project.frames = []
new_project.layers = []
new_project.animation_tags.clear()
new_project.name = path.get_file()
else:
new_project = Project.new([], path.get_file())
var zip_reader := ZIPReader.new() var zip_reader := ZIPReader.new()
var err := zip_reader.open(path) var err := zip_reader.open(path)
if err == FAILED: if err == FAILED:
# Most likely uses the old pxo format, load that # Most likely uses the old pxo format, load that
var success := open_v0_pxo_file(path, new_project) new_project = open_v0_pxo_file(path, empty_project)
if not success: if not is_instance_valid(new_project):
return return
elif err != OK: elif err != OK:
Global.popup_error(tr("File failed to open. Error code %s (%s)") % [err, error_string(err)]) Global.popup_error(tr("File failed to open. Error code %s (%s)") % [err, error_string(err)])
return return
else: else:
if empty_project:
new_project = Global.current_project
new_project.frames = []
new_project.layers = []
new_project.animation_tags.clear()
new_project.name = path.get_file()
else:
new_project = Project.new([], path.get_file())
var data_json := zip_reader.read_file("data.json").get_string_from_utf8() var data_json := zip_reader.read_file("data.json").get_string_from_utf8()
var test_json_conv := JSON.new() var test_json_conv := JSON.new()
var error := test_json_conv.parse(data_json) var error := test_json_conv.parse(data_json)
if error != OK: if error != OK:
print("Error, corrupt pxo file") print("Error, corrupt pxo file. Error code %s (%s)" % [error, error_string(error)])
zip_reader.close() zip_reader.close()
return return
var result = test_json_conv.get_data() var result = test_json_conv.get_data()
@ -284,7 +284,7 @@ func open_pxo_file(path: String, untitled_backup := false, replace_empty := true
save_project_to_recent_list(path) save_project_to_recent_list(path)
func open_v0_pxo_file(path: String, new_project: Project) -> bool: func open_v0_pxo_file(path: String, empty_project: bool) -> Project:
var file := FileAccess.open_compressed(path, FileAccess.READ, FileAccess.COMPRESSION_ZSTD) var file := FileAccess.open_compressed(path, FileAccess.READ, FileAccess.COMPRESSION_ZSTD)
if FileAccess.get_open_error() == ERR_FILE_UNRECOGNIZED: if FileAccess.get_open_error() == ERR_FILE_UNRECOGNIZED:
# If the file is not compressed open it raw (pre-v0.7) # If the file is not compressed open it raw (pre-v0.7)
@ -292,22 +292,31 @@ func open_v0_pxo_file(path: String, new_project: Project) -> bool:
var err := FileAccess.get_open_error() var err := FileAccess.get_open_error()
if err != OK: if err != OK:
Global.popup_error(tr("File failed to open. Error code %s (%s)") % [err, error_string(err)]) Global.popup_error(tr("File failed to open. Error code %s (%s)") % [err, error_string(err)])
return false return null
var first_line := file.get_line() var first_line := file.get_line()
var test_json_conv := JSON.new() var test_json_conv := JSON.new()
var error := test_json_conv.parse(first_line) var error := test_json_conv.parse(first_line)
if error != OK: if error != OK:
print("Error, corrupt pxo file") print("Error, corrupt pxo file. Error code %s (%s)" % [error, error_string(error)])
file.close() file.close()
return false return null
var result = test_json_conv.get_data() var result = test_json_conv.get_data()
if typeof(result) != TYPE_DICTIONARY: if typeof(result) != TYPE_DICTIONARY:
print("Error, json parsed result is: %s" % typeof(result)) print("Error, json parsed result is: %s" % typeof(result))
file.close() file.close()
return false return null
var new_project: Project
if empty_project:
new_project = Global.current_project
new_project.frames = []
new_project.layers = []
new_project.animation_tags.clear()
new_project.name = path.get_file()
else:
new_project = Project.new([], path.get_file())
new_project.deserialize(result) new_project.deserialize(result)
for frame in new_project.frames: for frame in new_project.frames:
for cel in frame.cels: for cel in frame.cels:
@ -344,7 +353,7 @@ func open_v0_pxo_file(path: String, new_project: Project) -> bool:
else: else:
new_project.tiles.reset_mask() new_project.tiles.reset_mask()
file.close() file.close()
return true return new_project
func save_pxo_file( func save_pxo_file(