Apply R# clean-up for reliability (#877)
* Apply R# clean-up for reliability - Migrate to NUnit4 Assert.That - Update dependencise versions - Fix LangVersion to 9.0 (until net core migration) - Reformat code - Apply 'var' style (easier for refactoring) - Remove redundant parentheses - Add braces on every condition blocks (1 line) - Uses new null checking patterns - Uses AutoProperties when possible - Uses string scalar type instead of class - Clean usings - Add .orig files in git ignore - Rename some properties to respect defined conventions and US format definition - ID -> Id - BPM -> Bpm - Finish -> End * Update R# settings according to the clean-up made
This commit is contained in:
Quentin Bray authored and GitHub committed
1 parent
b9b0f7c8df
commit
6ffa63b923
236 files changed
+14194
-7278
No files matched your search
@@ -18,7 +18,6 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using VocaluxeLib.Log;
|
||||
|
||||
namespace VocaluxeLib.Songs
|
||||
@@ -31,7 +30,7 @@ namespace VocaluxeLib.Songs
|
||||
/// <summary>
|
||||
/// Factor the bpm given in the txt is multiplied with
|
||||
/// </summary>
|
||||
private const int _BPMFactor = 4;
|
||||
private const int _BpmFactor = 4;
|
||||
|
||||
private class CSongLoader
|
||||
{
|
||||
@@ -46,38 +45,48 @@ namespace VocaluxeLib.Songs
|
||||
public bool InitPaths(string filePath)
|
||||
{
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
_Song.Folder = Path.GetDirectoryName(filePath);
|
||||
if (_Song.Folder == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach (string folder in CBase.Config.GetSongFolders().Where(folder => _Song.Folder.StartsWith(folder)))
|
||||
foreach (var folder in CBase.Config.GetSongFolders().Where(folder => _Song.Folder.StartsWith(folder)))
|
||||
{
|
||||
if (_Song.Folder.Length == folder.Length)
|
||||
{
|
||||
_Song.FolderName = "Songs";
|
||||
}
|
||||
else
|
||||
{
|
||||
_Song.FolderName = _Song.Folder.Substring(folder.Length + 1);
|
||||
|
||||
int pos = _Song.FolderName.IndexOf("\\", StringComparison.Ordinal);
|
||||
var pos = _Song.FolderName.IndexOf("\\", StringComparison.Ordinal);
|
||||
if (pos >= 0)
|
||||
{
|
||||
_Song.FolderName = _Song.FolderName.Substring(0, pos);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
_Song.FileName = Path.GetFileName(filePath);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
public bool ReadHeader(bool useSetEncoding = false)
|
||||
{
|
||||
string filePath = Path.Combine(_Song.Folder, _Song.FileName);
|
||||
var filePath = Path.Combine(_Song.Folder, _Song.FileName);
|
||||
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
_Song.Languages.Clear();
|
||||
_Song.Genres.Clear();
|
||||
@@ -101,52 +110,61 @@ namespace VocaluxeLib.Songs
|
||||
sr = new StreamReader(filePath, _Song.Encoding, true);
|
||||
while (!sr.EndOfStream)
|
||||
{
|
||||
string line = sr.ReadLine();
|
||||
var line = sr.ReadLine();
|
||||
_LineNr++;
|
||||
if (line == "")
|
||||
{
|
||||
continue;
|
||||
if (!line[0].Equals('#'))
|
||||
break;
|
||||
}
|
||||
|
||||
int pos = line.IndexOf(":", StringComparison.Ordinal);
|
||||
if (!line[0].Equals('#'))
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
var pos = line.IndexOf(":", StringComparison.Ordinal);
|
||||
|
||||
if (pos <= 1)
|
||||
{
|
||||
_Song.UnknownTags.Add(line);
|
||||
continue;
|
||||
}
|
||||
string identifier = line.Substring(1, pos - 1).Trim().ToUpper();
|
||||
|
||||
var identifier = line.Substring(1, pos - 1).Trim().ToUpper();
|
||||
if (identifier.Contains(" "))
|
||||
{
|
||||
_Song.UnknownTags.Add(line);
|
||||
continue;
|
||||
}
|
||||
string value = line.Substring(pos + 1).Trim();
|
||||
|
||||
var value = line.Substring(pos + 1).Trim();
|
||||
|
||||
if (value == "")
|
||||
{
|
||||
_Song.UnknownTags.Add(line);
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Empty value skipped", CLog.Params(_Song.FileName));
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Empty value skipped", CLog.Params(_Song.FileName));
|
||||
continue;
|
||||
}
|
||||
|
||||
switch (identifier)
|
||||
{
|
||||
case "ENCODING":
|
||||
Encoding newEncoding = value.GetEncoding();
|
||||
var newEncoding = value.GetEncoding();
|
||||
_Song.ManualEncoding = true;
|
||||
if (!newEncoding.Equals(sr.CurrentEncoding))
|
||||
{
|
||||
if (useSetEncoding)
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Duplicate encoding ignored", CLog.Params(_Song.FileName));
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Duplicate encoding ignored", CLog.Params(_Song.FileName));
|
||||
continue;
|
||||
}
|
||||
|
||||
sr.Dispose();
|
||||
sr = null;
|
||||
_Song.Encoding = newEncoding;
|
||||
return ReadHeader(true);
|
||||
}
|
||||
|
||||
break;
|
||||
case "TITLE":
|
||||
_Song.Title = value;
|
||||
@@ -190,6 +208,7 @@ namespace VocaluxeLib.Songs
|
||||
CLog.CSongLog.Error("[{SongFileName}] Can't find audio file: {AudioFile}", CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
return false;
|
||||
}
|
||||
|
||||
break;
|
||||
case "INSTRUMENTAL":
|
||||
if (File.Exists(Path.Combine(_Song.Folder, value)))
|
||||
@@ -199,9 +218,11 @@ namespace VocaluxeLib.Songs
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] Can't find instrumental audio file: {AudioFile}", CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Can't find instrumental audio file: {AudioFile}",
|
||||
CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
return false;
|
||||
}
|
||||
|
||||
break;
|
||||
case "VOCALS":
|
||||
if (File.Exists(Path.Combine(_Song.Folder, value)))
|
||||
@@ -211,36 +232,56 @@ namespace VocaluxeLib.Songs
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] Can't find vocal audio file: {AudioFile}", CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Can't find vocal audio file: {AudioFile}",
|
||||
CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
return false;
|
||||
}
|
||||
|
||||
break;
|
||||
case "BPM":
|
||||
if (CHelper.TryParse(value, out _Song.BPM))
|
||||
if (CHelper.TryParse(value, out _Song.Bpm))
|
||||
{
|
||||
_Song.BPM *= _BPMFactor;
|
||||
headerFlags |= EHeaderFlags.BPM;
|
||||
_Song.Bpm *= _BpmFactor;
|
||||
headerFlags |= EHeaderFlags.Bpm;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid BPM value: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "EDITION":
|
||||
if (value.Length > 1)
|
||||
{
|
||||
_Song.Editions.Add(value);
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid edition: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "GENRE":
|
||||
if (value.Length > 1)
|
||||
{
|
||||
_Song.Genres.Add(value);
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid genre: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "TAGS":
|
||||
if (value.Length > 1)
|
||||
{
|
||||
_Song.Tags.AddRange(value.Split(','));
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid tags: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "ALBUM":
|
||||
_Song.Album = value;
|
||||
@@ -248,68 +289,121 @@ namespace VocaluxeLib.Songs
|
||||
case "YEAR":
|
||||
int num;
|
||||
if (value.Length == 4 && int.TryParse(value, out num) && num > 0)
|
||||
{
|
||||
_Song.Year = value;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid year: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "LANGUAGE":
|
||||
if (value.Length > 1)
|
||||
{
|
||||
_Song.Languages.Add(_UnifyLanguage(value));
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid language: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "COMMENT":
|
||||
if (!String.IsNullOrEmpty(_Song._Comment))
|
||||
if (!string.IsNullOrEmpty(_Song._Comment))
|
||||
{
|
||||
_Song._Comment += "\r\n";
|
||||
}
|
||||
|
||||
_Song._Comment += value;
|
||||
break;
|
||||
case "GAP":
|
||||
if (CHelper.TryParse(value, out _Song.Gap))
|
||||
{
|
||||
_Song.Gap /= 1000f;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid gap: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "COVER":
|
||||
if (File.Exists(Path.Combine(_Song.Folder, value)))
|
||||
{
|
||||
_Song.CoverFileName = value;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Can't find cover file: {MissingFile}", CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
}
|
||||
|
||||
break;
|
||||
case "BACKGROUND":
|
||||
if (File.Exists(Path.Combine(_Song.Folder, value)))
|
||||
{
|
||||
_Song.BackgroundFileNames.Add(value);
|
||||
}
|
||||
else
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Can't find background file: {MissingFile}", CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Can't find background file: {MissingFile}",
|
||||
CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
}
|
||||
|
||||
break;
|
||||
case "VIDEO":
|
||||
if (File.Exists(Path.Combine(_Song.Folder, value)))
|
||||
{
|
||||
_Song.VideoFileName = value;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Can't find video file: {MissingFile}", CLog.Params(_Song.FileName, Path.Combine(_Song.Folder, value)));
|
||||
}
|
||||
|
||||
break;
|
||||
case "VIDEOGAP":
|
||||
if (!CHelper.TryParse(value, out _Song.VideoGap))
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid videogap: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "VIDEOASPECT":
|
||||
if (!CHelper.TryParse(value, out _Song.VideoAspect, true))
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid videoaspect: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "START":
|
||||
if (!CHelper.TryParse(value, out _Song.Start))
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid start: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "END":
|
||||
if (CHelper.TryParse(value, out _Song.Finish))
|
||||
_Song.Finish /= 1000f;
|
||||
if (CHelper.TryParse(value, out _Song.End))
|
||||
{
|
||||
_Song.End /= 1000f;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid end: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "PREVIEWSTART":
|
||||
if (CHelper.TryParse(value, out _Song.Preview.StartTime) && _Song.Preview.StartTime >= 0f)
|
||||
{
|
||||
_Song.Preview.Source = EDataSource.Tag;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid previewstart: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "PREVIEW":
|
||||
if (CHelper.TryParse(value, out _Song.Preview.StartTime) && _Song.Preview.StartTime >= 0f)
|
||||
@@ -319,40 +413,62 @@ namespace VocaluxeLib.Songs
|
||||
_Song.Preview.Source = EDataSource.Tag;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid previewstart: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "MEDLEYSTARTBEAT":
|
||||
if (int.TryParse(value, out _Song.Medley.StartBeat))
|
||||
{
|
||||
headerFlags |= EHeaderFlags.MedleyStartBeat;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid medleystartbeat: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "MEDLEYENDBEAT":
|
||||
if (int.TryParse(value, out _Song.Medley.EndBeat))
|
||||
{
|
||||
headerFlags |= EHeaderFlags.MedleyEndBeat;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid medleyendbeat: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
|
||||
break;
|
||||
case "ENDSHORT":
|
||||
if ((headerFlags & EHeaderFlags.BPM) != 0)
|
||||
if ((headerFlags & EHeaderFlags.Bpm) != 0)
|
||||
{
|
||||
int endTime;
|
||||
if (int.TryParse(value, out endTime) || endTime < 0)
|
||||
{
|
||||
_Song.ShortEnd.EndBeat = (int)CBase.Game.GetBeatFromTime(endTime / 1000f, _Song.BPM, _Song.Gap);
|
||||
_Song.ShortEnd.EndBeat = (int)CBase.Game.GetBeatFromTime(endTime / 1000f, _Song.Bpm, _Song.Gap);
|
||||
_Song.ShortEnd.Source = EDataSource.Tag;
|
||||
}
|
||||
else
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Invalid shortendbeat: {Value}", CLog.Params(_Song.FileName, value));
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
case "CALCMEDLEY":
|
||||
if (value.ToUpper() == "OFF")
|
||||
{
|
||||
_Song._CalculateMedley = false;
|
||||
}
|
||||
|
||||
break;
|
||||
case "RELATIVE":
|
||||
if (value.ToUpper() == "YES")
|
||||
{
|
||||
_Song.Relative = true;
|
||||
}
|
||||
|
||||
break;
|
||||
case "RESOLUTION":
|
||||
case "NOTESGAP":
|
||||
@@ -364,15 +480,20 @@ namespace VocaluxeLib.Songs
|
||||
{
|
||||
identifier = identifier.Substring(10);
|
||||
if (!identifier.StartsWith("P")) // fix for missing "P"
|
||||
{
|
||||
identifier = "P" + identifier;
|
||||
}
|
||||
}
|
||||
|
||||
if (identifier.StartsWith("P"))
|
||||
{
|
||||
int player;
|
||||
if (int.TryParse(identifier.Substring(1).Trim(), out player))
|
||||
{
|
||||
foreach (int curPlayer in player.GetSetBits())
|
||||
foreach (var curPlayer in player.GetSetBits())
|
||||
{
|
||||
_Song.Notes.VoiceNames[curPlayer] = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -388,32 +509,32 @@ namespace VocaluxeLib.Songs
|
||||
if (sr.EndOfStream)
|
||||
{
|
||||
//No other data then header
|
||||
CLog.CSongLog.Error("[{SongFileName}] Lyrics/Notes missing", CLog.Params(_Song.FileName));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Lyrics/Notes missing", CLog.Params(_Song.FileName));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((headerFlags & EHeaderFlags.Title) == 0)
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] Title tag missing", CLog.Params(_Song.FileName));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Title tag missing", CLog.Params(_Song.FileName));
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((headerFlags & EHeaderFlags.Artist) == 0)
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] Artist tag missing", CLog.Params(_Song.FileName));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Artist tag missing", CLog.Params(_Song.FileName));
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((headerFlags & EHeaderFlags.MP3) == 0)
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] MP3 or AUDIO tag missing", CLog.Params(_Song.FileName));
|
||||
CLog.CSongLog.Error("[{SongFileName}] MP3 or AUDIO tag missing", CLog.Params(_Song.FileName));
|
||||
return false;
|
||||
}
|
||||
|
||||
if ((headerFlags & EHeaderFlags.BPM) == 0)
|
||||
if ((headerFlags & EHeaderFlags.Bpm) == 0)
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] BPM tag missing", CLog.Params(_Song.FileName));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Bpm tag missing", CLog.Params(_Song.FileName));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -422,7 +543,8 @@ namespace VocaluxeLib.Songs
|
||||
{
|
||||
if (_Song.Medley.StartBeat > _Song.Medley.EndBeat)
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] MedleyStartBeat is bigger than MedleyEndBeat in file: {StartBeat} > {EndBeat}", CLog.Params(_Song.FileName, _Song.Medley.StartBeat > _Song.Medley.EndBeat));
|
||||
CLog.CSongLog.Error("[{SongFileName}] MedleyStartBeat is bigger than MedleyEndBeat in file: {StartBeat} > {EndBeat}",
|
||||
CLog.Params(_Song.FileName, _Song.Medley.StartBeat > _Song.Medley.EndBeat));
|
||||
headerFlags = headerFlags - EHeaderFlags.MedleyStartBeat - EHeaderFlags.MedleyEndBeat;
|
||||
}
|
||||
}
|
||||
@@ -430,7 +552,7 @@ namespace VocaluxeLib.Songs
|
||||
if (_Song.Preview.Source == EDataSource.None)
|
||||
{
|
||||
//PreviewStart is not set or <=0
|
||||
_Song.Preview.StartTime = (headerFlags & EHeaderFlags.MedleyStartBeat) != 0 ? CBase.Game.GetTimeFromBeats(_Song.Medley.StartBeat, _Song.BPM) : 0f;
|
||||
_Song.Preview.StartTime = (headerFlags & EHeaderFlags.MedleyStartBeat) != 0 ? CBase.Game.GetTimeFromBeats(_Song.Medley.StartBeat, _Song.Bpm) : 0f;
|
||||
// ReSharper disable CompareOfFloatsByEqualityOperator
|
||||
_Song.Preview.Source = _Song.Preview.StartTime == 0 ? EDataSource.None : EDataSource.Calculated;
|
||||
// ReSharper restore CompareOfFloatsByEqualityOperator
|
||||
@@ -447,22 +569,30 @@ namespace VocaluxeLib.Songs
|
||||
catch (Exception e)
|
||||
{
|
||||
if (sr != null)
|
||||
{
|
||||
sr.Dispose();
|
||||
}
|
||||
|
||||
CLog.CSongLog.Error(e, "[{SongFileName}] Error reading txt header with Message: {ExceptionMessage}", CLog.Params(e.Message, _Song.FileName));
|
||||
return false;
|
||||
}
|
||||
|
||||
_Song.Encoding = sr.CurrentEncoding;
|
||||
sr.Dispose();
|
||||
_Song._CheckFiles();
|
||||
|
||||
CBase.DataBase.GetDataBaseSongInfos(_Song.Artist, _Song.Title, out _Song.NumPlayed, out _Song.DateAdded, out _Song.DataBaseSongID);
|
||||
CBase.DataBase.GetDataBaseSongInfos(_Song.Artist, _Song.Title, out _Song.NumPlayed, out _Song.DateAdded, out _Song.DataBaseSongId);
|
||||
|
||||
//Before saving this tags to .txt: Check, if ArtistSorting and Artist are equal, then don't save this tag.
|
||||
if (String.IsNullOrEmpty(_Song.ArtistSorting))
|
||||
if (string.IsNullOrEmpty(_Song.ArtistSorting))
|
||||
{
|
||||
_Song.ArtistSorting = _Song.Artist;
|
||||
}
|
||||
|
||||
if (String.IsNullOrEmpty(_Song.TitleSorting))
|
||||
if (string.IsNullOrEmpty(_Song.TitleSorting))
|
||||
{
|
||||
_Song.TitleSorting = _Song.Title;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -485,6 +615,7 @@ namespace VocaluxeLib.Songs
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return lang;
|
||||
}
|
||||
|
||||
@@ -511,15 +642,25 @@ namespace VocaluxeLib.Songs
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
string result = "";
|
||||
int skippedNotesCt = ZeroLengthNoteCt + OverlapNoteCt + NoTextNoteCt;
|
||||
var result = "";
|
||||
var skippedNotesCt = ZeroLengthNoteCt + OverlapNoteCt + NoTextNoteCt;
|
||||
if (skippedNotesCt > 0)
|
||||
result += "Skipped " + skippedNotesCt + " notes (0-Length: " + ZeroLengthNoteCt + ", Overlapping: " + OverlapNoteCt + ", No text: " + NoTextNoteCt + ")\r\n";
|
||||
{
|
||||
result += "Skipped " + skippedNotesCt + " notes (0-Length: " + ZeroLengthNoteCt + ", Overlapping: " + OverlapNoteCt + ", No text: " + NoTextNoteCt +
|
||||
")\r\n";
|
||||
}
|
||||
|
||||
if (InvalidPosBreakCt > 0)
|
||||
{
|
||||
result += "Skipped " + InvalidPosBreakCt + " line breaks (Invalid position)\r\n";
|
||||
int adjustedBreakCt = AjustedBreakCt + NoLengthBreakCt;
|
||||
}
|
||||
|
||||
var adjustedBreakCt = AjustedBreakCt + NoLengthBreakCt;
|
||||
if (adjustedBreakCt > 0)
|
||||
{
|
||||
result += "Adjusted " + adjustedBreakCt + " line breaks (Overlapping previous note: " + AjustedBreakCt + ", No length: " + NoLengthBreakCt + ")\r\n";
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -539,25 +680,27 @@ namespace VocaluxeLib.Songs
|
||||
{
|
||||
//Skip loading if already done and no reload is forced
|
||||
if (_Song.NotesLoaded && !forceReload)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
string filePath = Path.Combine(_Song.Folder, _Song.FileName);
|
||||
var filePath = Path.Combine(_Song.Folder, _Song.FileName);
|
||||
|
||||
if (!File.Exists(filePath))
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] The file songfile does not exist", CLog.Params(_Song.FileName));
|
||||
CLog.CSongLog.Error("[{SongFileName}] The file songfile does not exist", CLog.Params(_Song.FileName));
|
||||
return false;
|
||||
}
|
||||
|
||||
int currentBeat = 0; //Used for relative songs
|
||||
var currentBeat = 0; //Used for relative songs
|
||||
CSongNote lastNote = null; //Holds last parsed note. Get's reset on player change
|
||||
bool endFound = false; // True if end tag was found
|
||||
var endFound = false; // True if end tag was found
|
||||
|
||||
int player = 1;
|
||||
var player = 1;
|
||||
_LineNr = 0;
|
||||
|
||||
char[] trimChars = {' ', ':'};
|
||||
char[] splitChars = {' '};
|
||||
char[] trimChars = { ' ', ':' };
|
||||
char[] splitChars = { ' ' };
|
||||
|
||||
var changesMade = new CAutoChanges();
|
||||
|
||||
@@ -571,15 +714,17 @@ namespace VocaluxeLib.Songs
|
||||
//Search for Note Beginning
|
||||
while (!sr.EndOfStream && !endFound)
|
||||
{
|
||||
string line = sr.ReadLine();
|
||||
var line = sr.ReadLine();
|
||||
_LineNr++;
|
||||
|
||||
if (String.IsNullOrEmpty(line))
|
||||
if (string.IsNullOrEmpty(line))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
char tag = line[0];
|
||||
var tag = line[0];
|
||||
//Remove tag and potential space
|
||||
line = (line.Length >= 2 && line[1] == ' ') ? line.Substring(2) : line.Substring(1);
|
||||
line = line.Length >= 2 && line[1] == ' ' ? line.Substring(2) : line.Substring(1);
|
||||
|
||||
int beat, length;
|
||||
switch (tag)
|
||||
@@ -597,6 +742,7 @@ namespace VocaluxeLib.Songs
|
||||
CLog.CSongLog.Error("[{SongFileName}] Wrong or missing number after \"P\" (in line {LineNr})", CLog.Params(_Song.FileName, _LineNr));
|
||||
return false;
|
||||
}
|
||||
|
||||
currentBeat = 0;
|
||||
lastNote = null;
|
||||
break;
|
||||
@@ -605,7 +751,7 @@ namespace VocaluxeLib.Songs
|
||||
case 'R':
|
||||
case 'G':
|
||||
case 'F':
|
||||
string[] noteData = line.Split(splitChars, 4);
|
||||
var noteData = line.Split(splitChars, 4);
|
||||
if (noteData.Length < 4)
|
||||
{
|
||||
if (noteData.Length == 3)
|
||||
@@ -614,36 +760,46 @@ namespace VocaluxeLib.Songs
|
||||
changesMade.NoTextNoteCt++;
|
||||
continue;
|
||||
}
|
||||
|
||||
CLog.CSongLog.Error("[{SongFileName}] Invalid note found (in line {LineNr}): {noteData}", CLog.Params(_Song.FileName, _LineNr, noteData));
|
||||
sr.Dispose();
|
||||
return false;
|
||||
}
|
||||
|
||||
int tone;
|
||||
if (!int.TryParse(noteData[0], out beat) || !int.TryParse(noteData[1], out length) || !int.TryParse(noteData[2], out tone))
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] Invalid note found (non-numeric values) (in line {LineNr}): {noteData}", CLog.Params(_Song.FileName, _LineNr, noteData));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Invalid note found (non-numeric values) (in line {LineNr}): {noteData}",
|
||||
CLog.Params(_Song.FileName, _LineNr, noteData));
|
||||
sr.Dispose();
|
||||
return false;
|
||||
}
|
||||
string text = noteData[3].TrimMultipleWs();
|
||||
|
||||
var text = noteData[3].TrimMultipleWs();
|
||||
if (text == "")
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Ignored note without text (in line {LineNr})", CLog.Params(_Song.FileName, _LineNr));
|
||||
changesMade.NoTextNoteCt++;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (_CurrentReadMode == ENoteReadMode.ZeroBased)
|
||||
{
|
||||
length++;
|
||||
}
|
||||
|
||||
if (length < 1)
|
||||
{
|
||||
changesMade.ZeroLengthNoteCt++;
|
||||
if (_CurrentReadMode == ENoteReadMode.Normal && changesMade.ZeroLengthNoteCt > _MaxZeroNoteCt && changesMade.OverlapNoteCt <= _MaxOverlapNoteCt)
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Found more than {MaxZeroNoteCt} notes with length < 1. Trying alternative read mode.", CLog.Params(_Song.FileName, _MaxZeroNoteCt));
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Found more than {MaxZeroNoteCt} notes with length < 1. Trying alternative read mode.",
|
||||
CLog.Params(_Song.FileName, _MaxZeroNoteCt));
|
||||
_CurrentReadMode = ENoteReadMode.ZeroBased;
|
||||
sr.Dispose();
|
||||
return ReadNotes(true);
|
||||
}
|
||||
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Ignored note with length < 1 (in line {LineNr})", CLog.Params(_Song.FileName, _LineNr));
|
||||
}
|
||||
else
|
||||
@@ -651,9 +807,13 @@ namespace VocaluxeLib.Songs
|
||||
ENoteType noteType;
|
||||
|
||||
if (tag.Equals('*'))
|
||||
{
|
||||
noteType = ENoteType.Golden;
|
||||
}
|
||||
else if (tag.Equals('F'))
|
||||
{
|
||||
noteType = ENoteType.Freestyle;
|
||||
}
|
||||
else if (tag.Equals('R'))
|
||||
{
|
||||
noteType = ENoteType.Rap;
|
||||
@@ -665,13 +825,17 @@ namespace VocaluxeLib.Songs
|
||||
_Song.IsRap = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
noteType = ENoteType.Normal;
|
||||
}
|
||||
|
||||
if (_Song.Relative)
|
||||
{
|
||||
beat += currentBeat;
|
||||
}
|
||||
|
||||
bool ignored = false;
|
||||
foreach (int curPlayer in player.GetSetBits())
|
||||
var ignored = false;
|
||||
foreach (var curPlayer in player.GetSetBits())
|
||||
{
|
||||
//Create the note here as we want independent instances in the lines. Otherwhise we can't modify them later
|
||||
lastNote = new CSongNote(beat, length, tone, text, noteType);
|
||||
@@ -683,28 +847,36 @@ namespace VocaluxeLib.Songs
|
||||
changesMade.OverlapNoteCt++;
|
||||
if (changesMade.OverlapNoteCt > _MaxOverlapNoteCt && _CurrentReadMode == ENoteReadMode.ZeroBased)
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Found more than {MaxOverlapNoteCt} overlapping notes. Using standard mode.", CLog.Params(_Song.FileName, _MaxOverlapNoteCt));
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Found more than {MaxOverlapNoteCt} overlapping notes. Using standard mode.",
|
||||
CLog.Params(_Song.FileName, _MaxOverlapNoteCt));
|
||||
_CurrentReadMode = ENoteReadMode.OneBased;
|
||||
sr.Dispose();
|
||||
return ReadNotes(true);
|
||||
}
|
||||
}
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Ignored note for player {CurrentPlayerNumber} because it overlaps with other note (in line {LineNr})", CLog.Params(_Song.FileName, (curPlayer + 1), _LineNr));
|
||||
|
||||
CLog.CSongLog.Warning(
|
||||
"[{SongFileName}] Ignored note for player {CurrentPlayerNumber} because it overlaps with other note (in line {LineNr})",
|
||||
CLog.Params(_Song.FileName, curPlayer + 1, _LineNr));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
case '-':
|
||||
string[] lineBreakData = line.Split(splitChars);
|
||||
var lineBreakData = line.Split(splitChars);
|
||||
if (lineBreakData.Length < 1)
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] Invalid line break found (No beat) (in line {LineNr}): {LineBreakData}", CLog.Params(_Song.FileName, _LineNr, lineBreakData));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Invalid line break found (No beat) (in line {LineNr}): {LineBreakData}",
|
||||
CLog.Params(_Song.FileName, _LineNr, lineBreakData));
|
||||
sr.Dispose();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!int.TryParse(lineBreakData[0], out beat))
|
||||
{
|
||||
CLog.CSongLog.Error("[{SongFileName}] Invalid line break found (Non-numeric value) (in line {LineNr}): {LineBreakData}", CLog.Params(_Song.FileName, _LineNr, lineBreakData));
|
||||
CLog.CSongLog.Error("[{SongFileName}] Invalid line break found (Non-numeric value) (in line {LineNr}): {LineBreakData}",
|
||||
CLog.Params(_Song.FileName, _LineNr, lineBreakData));
|
||||
sr.Dispose();
|
||||
return false;
|
||||
}
|
||||
@@ -714,21 +886,28 @@ namespace VocaluxeLib.Songs
|
||||
beat += currentBeat;
|
||||
if (lineBreakData.Length < 2 || !int.TryParse(lineBreakData[1], out length))
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Missing line break length (in line {LineNr}):{LineBreakData}", CLog.Params(_Song.FileName, _LineNr, lineBreakData));
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Missing line break length (in line {LineNr}):{LineBreakData}",
|
||||
CLog.Params(_Song.FileName, _LineNr, lineBreakData));
|
||||
changesMade.NoLengthBreakCt++;
|
||||
currentBeat = beat;
|
||||
}
|
||||
else
|
||||
{
|
||||
currentBeat += length;
|
||||
}
|
||||
}
|
||||
|
||||
if (lastNote != null && beat <= lastNote.EndBeat)
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Line break is before previous note end. Adjusted. (in line {LineNr})", CLog.Params(_Song.FileName, _LineNr));
|
||||
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Line break is before previous note end. Adjusted. (in line {LineNr})",
|
||||
CLog.Params(_Song.FileName, _LineNr));
|
||||
|
||||
changesMade.AjustedBreakCt++;
|
||||
if (_Song.Relative)
|
||||
{
|
||||
currentBeat += lastNote.EndBeat - beat + 1;
|
||||
}
|
||||
|
||||
beat = lastNote.EndBeat + 1;
|
||||
}
|
||||
|
||||
@@ -739,12 +918,16 @@ namespace VocaluxeLib.Songs
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (int curPlayer in player.GetSetBits())
|
||||
foreach (var curPlayer in player.GetSetBits())
|
||||
{
|
||||
if (!_NewSentence(curPlayer, beat))
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Ignored line break for player {CurPlayerNr} (Overlapping or duplicate) (in line {LineNr})", CLog.Params(_Song.FileName, (curPlayer + 1) , _LineNr));
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Ignored line break for player {CurPlayerNr} (Overlapping or duplicate) (in line {LineNr})",
|
||||
CLog.Params(_Song.FileName, curPlayer + 1, _LineNr));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
CLog.CSongLog.Error("[{SongFileName}] Unexpected or missing character ({Tag})", CLog.Params(_Song.FileName, tag));
|
||||
@@ -752,12 +935,16 @@ namespace VocaluxeLib.Songs
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < _Song.Notes.VoiceCount; i++)
|
||||
for (var i = 0; i < _Song.Notes.VoiceCount; i++)
|
||||
{
|
||||
CVoice voice = _Song.Notes.GetVoice(i);
|
||||
int emptyLines = voice.RemoveEmptyLines();
|
||||
var voice = _Song.Notes.GetVoice(i);
|
||||
var emptyLines = voice.RemoveEmptyLines();
|
||||
if (emptyLines > 0)
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Removed {NumEmptyLines} empty lines from P .This often indicates a problem with the line breaks in the file", CLog.Params(_Song.FileName, emptyLines));
|
||||
{
|
||||
CLog.CSongLog.Warning("[{SongFileName}] Removed {NumEmptyLines} empty lines from P .This often indicates a problem with the line breaks in the file",
|
||||
CLog.Params(_Song.FileName, emptyLines));
|
||||
}
|
||||
|
||||
voice.UpdateTimings();
|
||||
}
|
||||
}
|
||||
@@ -765,9 +952,13 @@ namespace VocaluxeLib.Songs
|
||||
{
|
||||
CLog.CSongLog.Error(e, "[{SongFileName}] An unhandled exception occured: {ExceptionMessage}", CLog.Params(_Song.FileName, e.Message));
|
||||
if (sr != null)
|
||||
{
|
||||
sr.Dispose();
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
sr.Dispose();
|
||||
try
|
||||
{
|
||||
@@ -776,7 +967,9 @@ namespace VocaluxeLib.Songs
|
||||
_Song._FindShortEnd();
|
||||
_Song.NotesLoaded = true;
|
||||
if (_Song.IsDuet)
|
||||
{
|
||||
_Song._CheckDuet();
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -786,27 +979,28 @@ namespace VocaluxeLib.Songs
|
||||
|
||||
if (changesMade.IsModified)
|
||||
{
|
||||
CLog.Warning("Automatic changes have been made to {FilePath} Please check result!\r\n{ChangesMade}" , CLog.Params(filePath, changesMade));
|
||||
CLog.Warning("Automatic changes have been made to {FilePath} Please check result!\r\n{ChangesMade}", CLog.Params(filePath, changesMade));
|
||||
if (CBase.Config.GetSaveModifiedSongs() == EOffOn.TR_CONFIG_ON)
|
||||
{
|
||||
string name = Path.GetFileNameWithoutExtension(_Song.FileName);
|
||||
var name = Path.GetFileNameWithoutExtension(_Song.FileName);
|
||||
_Song.Save(Path.Combine(_Song.Folder, name + ".fix"));
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private bool _AddNote(int player, CSongNote note)
|
||||
{
|
||||
CVoice voice = _Song.Notes.GetVoice(player, true);
|
||||
var voice = _Song.Notes.GetVoice(player, true);
|
||||
return voice.AddNote(note, false);
|
||||
}
|
||||
|
||||
private bool _NewSentence(int player, int start)
|
||||
{
|
||||
CVoice voice = _Song.Notes.GetVoice(player, true);
|
||||
var voice = _Song.Notes.GetVoice(player, true);
|
||||
return voice.AddLine(start);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user