Added option to config.xml to ignore articles of title and artist on sorting. Do we need a entry on options screen?

This commit is contained in:
Florian Kuepper committed 2012-05-30 14:47:14 +02:00
1 parent 391036bb5f
commit 6c70c52a1f
2 files changed
+129 -1

No files matched your search

+5
View File
@@ -210,6 +210,7 @@ namespace Vocaluxe.Base
public static List<string> SongFolder = new List<string>(); public static List<string> SongFolder = new List<string>();
public static ESongMenu SongMenu = ESongMenu.TR_CONFIG_TILE_BOARD; public static ESongMenu SongMenu = ESongMenu.TR_CONFIG_TILE_BOARD;
public static ESongSorting SongSorting = ESongSorting.TR_CONFIG_ARTIST; public static ESongSorting SongSorting = ESongSorting.TR_CONFIG_ARTIST;
public static EOffOn IgnoreArticles = EOffOn.TR_CONFIG_ON;
public static float ScoreAnimationTime = 10; public static float ScoreAnimationTime = 10;
public static ETimerMode TimerMode = ETimerMode.TR_CONFIG_TIMERMODE_REMAINING; public static ETimerMode TimerMode = ETimerMode.TR_CONFIG_TIMERMODE_REMAINING;
public static int NumPlayer = 2; public static int NumPlayer = 2;
@@ -347,6 +348,7 @@ namespace Vocaluxe.Base
CHelper.TryGetEnumValueFromXML<ESongMenu>("//root/Game/SongMenu", navigator, ref SongMenu); CHelper.TryGetEnumValueFromXML<ESongMenu>("//root/Game/SongMenu", navigator, ref SongMenu);
CHelper.TryGetEnumValueFromXML<ESongSorting>("//root/Game/SongSorting", navigator, ref SongSorting); CHelper.TryGetEnumValueFromXML<ESongSorting>("//root/Game/SongSorting", navigator, ref SongSorting);
CHelper.TryGetEnumValueFromXML<EOffOn>("//root/Game/IgnoreArticles", navigator, ref IgnoreArticles);
CHelper.TryGetFloatValueFromXML("//root/Game/ScoreAnimationTime", navigator, ref ScoreAnimationTime); CHelper.TryGetFloatValueFromXML("//root/Game/ScoreAnimationTime", navigator, ref ScoreAnimationTime);
CHelper.TryGetEnumValueFromXML<ETimerMode>("//root/Game/TimerMode", navigator, ref TimerMode); CHelper.TryGetEnumValueFromXML<ETimerMode>("//root/Game/TimerMode", navigator, ref TimerMode);
CHelper.TryGetIntValueFromXML("//root/Game/NumPlayer", navigator, ref NumPlayer); CHelper.TryGetIntValueFromXML("//root/Game/NumPlayer", navigator, ref NumPlayer);
@@ -578,6 +580,9 @@ namespace Vocaluxe.Base
writer.WriteComment("SongSorting: " + ListStrings(Enum.GetNames(typeof(ESongSorting)))); writer.WriteComment("SongSorting: " + ListStrings(Enum.GetNames(typeof(ESongSorting))));
writer.WriteElementString("SongSorting", Enum.GetName(typeof(ESongSorting), SongSorting)); writer.WriteElementString("SongSorting", Enum.GetName(typeof(ESongSorting), SongSorting));
writer.WriteComment("Ignore articles on song-sorting: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
writer.WriteElementString("IgnoreArticles", Enum.GetName(typeof(EOffOn), IgnoreArticles));
writer.WriteComment("ScoreAnimationTime: Values >= 1 or 0 for no animation. Time is in seconds."); writer.WriteComment("ScoreAnimationTime: Values >= 1 or 0 for no animation. Time is in seconds.");
writer.WriteElementString("ScoreAnimationTime", ScoreAnimationTime.ToString()); writer.WriteElementString("ScoreAnimationTime", ScoreAnimationTime.ToString());
+124 -1
View File
@@ -352,6 +352,21 @@ namespace Vocaluxe.Base
{ {
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper()); int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0) if (res == 0)
{
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
string string1 = IgnoreArticle(_Songs[s1.SongID].Artist.ToUpper());
string string2 = IgnoreArticle(_Songs[s2.SongID].Artist.ToUpper());
res = string1.CompareTo(string2);
if (res == 0)
{
string1 = IgnoreArticle(_Songs[s1.SongID].Title.ToUpper());
string2 = IgnoreArticle(_Songs[s2.SongID].Title.ToUpper());
return string1.CompareTo(string2);
}
return res;
}
else
{ {
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper()); res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0) if (res == 0)
@@ -360,6 +375,7 @@ namespace Vocaluxe.Base
} }
return res; return res;
} }
}
return res; return res;
}); });
@@ -406,6 +422,21 @@ namespace Vocaluxe.Base
{ {
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper()); int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0) if (res == 0)
{
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
string string1 = IgnoreArticle(_Songs[s1.SongID].Artist.ToUpper());
string string2 = IgnoreArticle(_Songs[s2.SongID].Artist.ToUpper());
res = string1.CompareTo(string2);
if (res == 0)
{
string1 = IgnoreArticle(_Songs[s1.SongID].Title.ToUpper());
string2 = IgnoreArticle(_Songs[s2.SongID].Title.ToUpper());
return string1.CompareTo(string2);
}
return res;
}
else
{ {
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper()); res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0) if (res == 0)
@@ -414,6 +445,7 @@ namespace Vocaluxe.Base
} }
return res; return res;
} }
}
return res; return res;
}); });
@@ -479,6 +511,21 @@ namespace Vocaluxe.Base
{ {
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper()); int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0) if (res == 0)
{
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
string string1 = IgnoreArticle(_Songs[s1.SongID].Artist.ToUpper());
string string2 = IgnoreArticle(_Songs[s2.SongID].Artist.ToUpper());
res = string1.CompareTo(string2);
if (res == 0)
{
string1 = IgnoreArticle(_Songs[s1.SongID].Title.ToUpper());
string2 = IgnoreArticle(_Songs[s2.SongID].Title.ToUpper());
return string1.CompareTo(string2);
}
return res;
}
else
{ {
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper()); res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0) if (res == 0)
@@ -487,6 +534,7 @@ namespace Vocaluxe.Base
} }
return res; return res;
} }
}
return res; return res;
}); });
@@ -510,6 +558,21 @@ namespace Vocaluxe.Base
} }
_SortList.Sort(delegate(SongPointer s1, SongPointer s2) _SortList.Sort(delegate(SongPointer s1, SongPointer s2)
{
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
string string1 = IgnoreArticle(s1.SortString.ToUpper());
string string2 = IgnoreArticle(s2.SortString.ToUpper());
int res = string1.CompareTo(string2);
if (res == 0)
{
string1 = IgnoreArticle(_Songs[s1.SongID].Title.ToUpper());
string2 = IgnoreArticle(_Songs[s2.SongID].Title.ToUpper());
return string1.CompareTo(string2);
}
return res;
}
else
{ {
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper()); int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0) if (res == 0)
@@ -517,6 +580,7 @@ namespace Vocaluxe.Base
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper()); return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
} }
return res; return res;
}
}); });
_SongsSortList = _SortList.ToArray(); _SongsSortList = _SortList.ToArray();
@@ -535,6 +599,9 @@ namespace Vocaluxe.Base
case ESongSorting.TR_CONFIG_ARTIST_LETTER: case ESongSorting.TR_CONFIG_ARTIST_LETTER:
foreach (CSong song in _SongList) foreach (CSong song in _SongList)
{ {
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
_SortList.Add(new SongPointer(song.ID, IgnoreArticle(song.Artist)));
else
_SortList.Add(new SongPointer(song.ID, song.Artist)); _SortList.Add(new SongPointer(song.ID, song.Artist));
} }
@@ -583,6 +650,9 @@ namespace Vocaluxe.Base
case ESongSorting.TR_CONFIG_TITLE_LETTER: case ESongSorting.TR_CONFIG_TITLE_LETTER:
foreach (CSong song in _SongList) foreach (CSong song in _SongList)
{ {
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
_SortList.Add(new SongPointer(song.ID, IgnoreArticle(song.Title)));
else
_SortList.Add(new SongPointer(song.ID, song.Title)); _SortList.Add(new SongPointer(song.ID, song.Title));
} }
@@ -591,7 +661,7 @@ namespace Vocaluxe.Base
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper()); int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0) if (res == 0)
{ {
return _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper()); return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
} }
return res; return res;
}); });
@@ -638,6 +708,21 @@ namespace Vocaluxe.Base
{ {
int res = s1.SortString.CompareTo(s2.SortString); int res = s1.SortString.CompareTo(s2.SortString);
if (res == 0) if (res == 0)
{
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
string string1 = IgnoreArticle(_Songs[s1.SongID].Artist.ToUpper());
string string2 = IgnoreArticle(_Songs[s2.SongID].Artist.ToUpper());
res = string1.CompareTo(string2);
if (res == 0)
{
string1 = IgnoreArticle(_Songs[s1.SongID].Title.ToUpper());
string2 = IgnoreArticle(_Songs[s2.SongID].Title.ToUpper());
return string1.CompareTo(string2);
}
return res;
}
else
{ {
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper()); res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0) if (res == 0)
@@ -646,6 +731,7 @@ namespace Vocaluxe.Base
} }
return res; return res;
} }
}
return res; return res;
}); });
@@ -685,6 +771,21 @@ namespace Vocaluxe.Base
{ {
int res = s1.SortString.CompareTo(s2.SortString); int res = s1.SortString.CompareTo(s2.SortString);
if (res == 0) if (res == 0)
{
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
string string1 = IgnoreArticle(_Songs[s1.SongID].Artist.ToUpper());
string string2 = IgnoreArticle(_Songs[s2.SongID].Artist.ToUpper());
res = string1.CompareTo(string2);
if (res == 0)
{
string1 = IgnoreArticle(_Songs[s1.SongID].Title.ToUpper());
string2 = IgnoreArticle(_Songs[s2.SongID].Title.ToUpper());
return string1.CompareTo(string2);
}
return res;
}
else
{ {
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper()); res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0) if (res == 0)
@@ -693,6 +794,7 @@ namespace Vocaluxe.Base
} }
return res; return res;
} }
}
return res; return res;
}); });
@@ -739,6 +841,21 @@ namespace Vocaluxe.Base
{ {
int res = s1.SortString.CompareTo(s2.SortString); int res = s1.SortString.CompareTo(s2.SortString);
if (res == 0) if (res == 0)
{
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
string string1 = IgnoreArticle(_Songs[s1.SongID].Artist.ToUpper());
string string2 = IgnoreArticle(_Songs[s2.SongID].Artist.ToUpper());
res = string1.CompareTo(string2);
if (res == 0)
{
string1 = IgnoreArticle(_Songs[s1.SongID].Title.ToUpper());
string2 = IgnoreArticle(_Songs[s2.SongID].Title.ToUpper());
return string1.CompareTo(string2);
}
return res;
}
else
{ {
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper()); res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0) if (res == 0)
@@ -747,6 +864,7 @@ namespace Vocaluxe.Base
} }
return res; return res;
} }
}
return res; return res;
}); });
@@ -920,5 +1038,10 @@ namespace Vocaluxe.Base
_CoverLoaded = true; _CoverLoaded = true;
CDataBase.CommitCovers(); CDataBase.CommitCovers();
} }
private static string IgnoreArticle(string _string)
{
return Regex.Replace(_string, @"^\s*(de|het|de|der|die|das|des|dem|den|the|el|la|lo|los|las|le|la|les|il|lo|la|i|gli|a|az)\s+", string.Empty, RegexOptions.IgnoreCase);
}
} }
} }