universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improvements to JSON parsing and Vocaloid5 VPR reading

Browse Source
This commit is contained in:
Michael Becker 2022-10-14 09:39:35 -04:00
parent 6509a5145f
commit 8f42f04af2
No known key found for this signature in database
GPG Key ID: DA394832305DA332
3 changed files with 98 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Libraries/UniversalEditor.Essential/DataFormats/PropertyList/JavaScriptObjectNotation/JSONDataFormat.cs
View File

@ -33,10 +33,9 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
{
private class _Context
{
public bool CloseGroup { get; set; } = false;
public string CurrentStringRaw { get; set; } = String.Empty;
public Property CurrentProperty { get; set; } = null;
public bool InsideArray { get; set; } = false;
public System.Collections.Generic.List<object> CurrentList { get; } = new System.Collections.Generic.List<object>();
@ -93,10 +92,12 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
// we close current object
if (ctx.CurrentString != null)
{
/*
if (ctx.CurrentProperty != null)
{
ctx.CurrentProperty.Value = ctx.CurrentString;
}
*/
}
}
@ -224,6 +225,7 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
else if (c == '}' || c == ',')
{
// could be null?
ctx.CloseGroup = (c == '}');
if (ctx.CurrentStringRaw == "null")
{
r.Seek(-1, SeekOrigin.Current);
@ -242,6 +244,40 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
ctx.CurrentStringRaw = String.Empty;
return false;
}
else
{
object value = null;
if (Byte.TryParse(ctx.CurrentStringRaw, out byte r_Byte))
{
value = r_Byte;
}
else if (Int16.TryParse(ctx.CurrentStringRaw, out short r_Int16))
{
value = r_Int16;
}
else if (Int32.TryParse(ctx.CurrentStringRaw, out int r_Int32))
{
value = r_Int32;
}
else if (Int64.TryParse(ctx.CurrentStringRaw, out long r_Int64))
{
value = r_Int64;
}
else if (Single.TryParse(ctx.CurrentStringRaw, out float r_Single))
{
value = r_Single;
}
else if (Double.TryParse(ctx.CurrentStringRaw, out double r_Double))
{
value = r_Double;
}
else if (Decimal.TryParse(ctx.CurrentStringRaw, out decimal r_Decimal))
{
value = r_Decimal;
}
ctx.CurrentStringRaw = String.Empty;
return value;
}
}
else
{
@ -280,9 +316,23 @@ namespace UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation
ctx.CurrentString = String.Empty;
object obj = ReadNextObject(ctx, r);
if (obj is Group)
{
Group g2 = (obj as Group);
g2.Name = propertyName;
g.Items.Add(g2);
}
else
{
Property p = new Property(propertyName, obj);
g.Items.Add(p);
}
}
Property p = new Property(propertyName, obj);
g.Items.Add(p);
if (ctx.CloseGroup)
{
ctx.CloseGroup = false;
break;
}
}
return g;

6
Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VPR/VPRProjectZIPDataFormat.cs
View File

@ -67,12 +67,11 @@ namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.Synthesi
else
{
// huh?
throw new ObjectModelNotSupportedException();
}
}
protected override void BeforeSaveInternal(Stack<ObjectModel> objectModels)
{
base.BeforeSaveInternal(objectModels);
ObjectModel whatever = objectModels.Pop();
FileSystemObjectModel fsom = new FileSystemObjectModel();
@ -89,8 +88,11 @@ namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.Synthesi
else
{
// huh?
throw new ObjectModelNotSupportedException();
}
objectModels.Push(fsom);
base.BeforeSaveInternal(objectModels);
}
}
}

57
Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VPR/VPRSequenceJSONDataFormat.cs
View File

@ -55,49 +55,72 @@ namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.Synthesi
PropertyListObjectModel plom = (objectModels.Pop() as PropertyListObjectModel);
SynthesizedAudioObjectModel vsq = (objectModels.Pop() as SynthesizedAudioObjectModel);
if (plom.Items.Count < 0)
throw new InvalidDataFormatException();
Group g = (plom.Items[0] as Group);
Group gVersion = g.Items.OfType<Group>("version");
Property pTracks = g.Items.OfType<Property>("tracks");
Group[] gTracks = pTracks.Value as Group[];
object[] gTracks = pTracks.Value as object[];
if (gTracks == null) throw new InvalidDataFormatException("tracks is not a Group[]");
for (int i = 0; i < gTracks.Length; i++)
{
Group gTrack = gTracks[i] as Group;
if (gTrack == null) throw new InvalidDataFormatException("gTrack is not a Group");
SynthesizedAudioTrack track = new SynthesizedAudioTrack();
Property pParts = gTracks[i].Items.OfType<Property>("parts");
Group[] gParts = pParts.Value as Group[];
Property pParts = gTrack.Items.OfType<Property>("parts");
object[] gParts = pParts?.Value as object[];
if (gParts == null) throw new InvalidDataFormatException("parts is not a Group[]");
for (int j = 0; j < gParts.Length; j++)
{
Property pNotes = gParts[j].Items.OfType<Property>("notes");
Group[] gNotes = pNotes.Value as Group[];
if (gNotes == null) throw new InvalidDataFormatException("notes is not a Group[]");
object[] pNotes = ((gParts[j] as Group).Items?.OfType<Property>("notes"))?.Value as object[];
if (pNotes == null) throw new InvalidDataFormatException("notes");
for (int k = 0; k < gNotes.Length; k++)
for (int k = 0; k < pNotes.Length; k++)
{
Group gNote = pNotes[k] as Group;
SynthesizedAudioCommandNote note = new SynthesizedAudioCommandNote();
Property pLyric = gNotes[k].Items.OfType<Property>("lyric");
Property pPhoneme = gNotes[k].Items.OfType<Property>("phoneme");
Property pIsProtected = gNotes[k].Items.OfType<Property>("isProtected");
Property pPos = gNotes[k].Items.OfType<Property>("pos");
Property pDuration = gNotes[k].Items.OfType<Property>("duration");
Property pNumber = gNotes[k].Items.OfType<Property>("number");
Property pVelocity = gNotes[k].Items.OfType<Property>("velocity");
Property pLyric = gNote.Items.OfType<Property>("lyric");
note.Lyric = (string)pLyric.Value;
Group gExp = gNotes[k].Items.OfType<Group>("exp");
Property pPhoneme = gNote.Items.OfType<Property>("phoneme");
note.Phoneme = (string)pPhoneme.Value;
Property pIsProtected = gNote.Items.OfType<Property>("isProtected");
note.Protected = (bool)pIsProtected.Value;
Property pPos = gNote.Items.OfType<Property>("pos");
// FIXME: we can't take object (short) and convert using (int)
note.Position = Convert.ToInt32(pPos.Value);
Property pDuration = gNote.Items.OfType<Property>("duration");
note.Length = Convert.ToInt32(pDuration.Value);
Property pNumber = gNote.Items.OfType<Property>("number");
note.Frequency = Convert.ToInt32(pNumber.Value);
Property pVelocity = gNote.Items.OfType<Property>("velocity");
Group gExp = gNote.Items.OfType<Group>("exp");
Property pExpOpening = gExp.Items.OfType<Property>("opening");
note.Opening = Convert.ToInt32(pExpOpening.Value);
Group dvqm = gNotes[k].Items.OfType<Group>("dvqm");
Group dvqm = gNote.Items.OfType<Group>("dvqm");
Group dvqmRelease = dvqm.Items.OfType<Group>("release");
Property dvqmReleaseCompID = dvqmRelease.Items.OfType<Property>("compID");
Group gVibrato = gNotes[k].Items.OfType<Group>("vibrato");
Group gVibrato = gNote.Items.OfType<Group>("vibrato");
Property pVibratoType = gVibrato.Items.OfType<Property>("type");
note.VibratoType = (SynthesizedAudioVibratoType) Convert.ToInt32(pVibratoType.Value);
Property pVibratoDuration = gVibrato.Items.OfType<Property>("duration");
note.VibratoLength = Convert.ToInt32(pVibratoDuration.Value);
track.Commands.Add(note);
}