Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support #SOURCE, #ALBUM

Browse Source 
Write #COMMENT
Keep unknown tags/lines
This commit is contained in:
Flamefire committed 2013-10-12 16:10:24 +02:00
1 parent 0a97a2e46d
commit b0cb402dc3
4 files changed
+41 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Songs/CSongLoader.cs
+27 -3
View File
@@ -87,6 +87,7 @@ namespace VocaluxeLib.Songs
_Song.Languages.Clear();
_Song.Genres.Clear();
_Song.UnknownTags.Clear();
_Song._Comment = "";
var headerFlags = new EHeaderFlags();
@@ -107,14 +108,21 @@ namespace VocaluxeLib.Songs
int pos = line.IndexOf(":", StringComparison.Ordinal);
if (pos <= 1)
{
_Song.UnknownTags.Add(line);
continue;
}
string identifier = line.Substring(1, pos - 1).Trim().ToUpper();
if (identifier.Contains(" "))
{
_Song.UnknownTags.Add(line);
continue;
}
string value = line.Substring(pos + 1).Trim();
if (value == "")
{
_Song.UnknownTags.Add(line);
_LogWarning("Empty value skipped");
continue;
}
@@ -150,11 +158,17 @@ namespace VocaluxeLib.Songs
_Song.ArtistSorting = value;
break;
case "CREATOR":
case "AUTHOR":
case "AUTOR":
_Song.Creator = value;
break;
case "VERSION":
_Song.Version = value;
break;
case "SOURCE":
case "YOUTUBE":
_Song.Source = value;
break;
case "MP3":
if (File.Exists(Path.Combine(_Song.Folder, value)))
{
@@ -188,6 +202,9 @@ namespace VocaluxeLib.Songs
else
_LogWarning("Invalid genre");
break;
case "ALBUM":
_Song.Album = value;
break;
case "YEAR":
int num;
if (value.Length == 4 && int.TryParse(value, out num) && num > 0)
@@ -289,7 +306,11 @@ namespace VocaluxeLib.Songs
break;
default:
if (identifier.StartsWith("DUETSINGER"))
{
identifier = identifier.Substring(10);
if (identifier.StartsWith("P")) // Possible fix for missing "P"
identifier = "P" + identifier;
}
if (identifier.StartsWith("P"))
{
int player;
@@ -300,7 +321,10 @@ namespace VocaluxeLib.Songs
}
}
else
{
_Song.UnknownTags.Add(line);
_LogWarning("Unknown tag: #" + identifier);
}
break;
}
@@ -606,13 +630,13 @@ namespace VocaluxeLib.Songs
currentBeat += length;
}
if (lastNote != null && beat < lastNote.EndBeat)
if (lastNote != null && beat <= lastNote.EndBeat)
{
_LogWarning("Line break is before previous note end. Adjusted.");
changesMade.AjustedBreakCt++;
if (_Song.Relative)
currentBeat += lastNote.EndBeat - beat;
beat = lastNote.EndBeat;
currentBeat += lastNote.EndBeat - beat + 1;
beat = lastNote.EndBeat + 1;
}
if (beat < 1)