fix a buncha stuff in saveSongInfo for SongCreationScreen (#704)

This commit is contained in:
Til
2025-08-07 18:27:08 +07:00
committed by GitHub
parent 9ce1486269
commit d6937e866c
2 changed files with 38 additions and 5 deletions
+33 -1
View File
@@ -6,5 +6,37 @@
"*.hscript": "haxe",
"*.hsc": "haxe",
"*.hxs": "haxe"
}
},
"lime.targetConfigurations": [
{
"label": "Windows (Test Build)",
"target": "windows",
"args": ["-DTEST_BUILD"]
},
{
"label": "Linux (Test Build)",
"target": "linux",
"args": ["-DTEST_BUILD"]
},
{
"label": "MacOS (Test Build)",
"target": "macos",
"args": ["-DTEST_BUILD"]
},
{
"label": "Windows / Debug (Test Build)",
"target": "windows",
"args": ["-debug", "-DTEST_BUILD"]
},
{
"label": "Linux / Debug (Test Build)",
"target": "linux",
"args": ["-debug", "-DTEST_BUILD"]
},
{
"label": "MacOS / Debug (Test Build)",
"target": "macos",
"args": ["-debug", "-DTEST_BUILD"]
},
]
}
@@ -7,6 +7,7 @@ import funkin.backend.chart.ChartData;
import funkin.backend.chart.FNFLegacyParser.SwagSong;
import funkin.backend.chart.PsychParser;
import funkin.backend.chart.VSliceParser;
import funkin.backend.utils.ZipUtil;
import funkin.backend.utils.ZipUtil.ZipReader;
import funkin.game.HealthIcon;
import haxe.Json;
@@ -360,11 +361,11 @@ class SongCreationScreen extends UISubstateWindow {
{
try switch(engineDropdown.index)
{
case 0 /*"V-Slice Project (.fnfc)"*/:
case 2 /*"V-Slice Project (.fnfc)"*/:
var files:Map<String, Any> = [];
for (field in new ZipReader(new BytesInput(importChartFile.file)).read()) {
var fileName = field.fileName;
var fileContent = field.data;
var fileContent = ZipUtil.unzip(field);
files.set(fileName, fileContent);
}
saveFromVSlice(files);
@@ -405,8 +406,8 @@ class SongCreationScreen extends UISubstateWindow {
CoolUtil.safeSaveFile('$songFolder/charts/${songId}.json', Json.stringify(base, Flags.JSON_PRETTY_PRINT));
#end
});
} catch (e) {
openSubState(new UIWarningSubstate("Importing Song/Charts: Error!", Std.string(e), [
} catch (e:haxe.Exception) {
openSubState(new UIWarningSubstate("Importing Song/Charts: Error!", e.details(), [
{label: "Ok", color: 0xFFFF0000, onClick: function(t) {}}
]));
}