#642: Implemented reading of tags
This commit is contained in:
1 parent
cd6e81a681
commit
90a0d77586
7 files changed
+19
No files matched your search
@@ -246,6 +246,8 @@ namespace Vocaluxe.Base
|
|||||||
return ECoverGeneratorType.Edition;
|
return ECoverGeneratorType.Edition;
|
||||||
case ESongSorting.TR_CONFIG_GENRE:
|
case ESongSorting.TR_CONFIG_GENRE:
|
||||||
return ECoverGeneratorType.Genre;
|
return ECoverGeneratorType.Genre;
|
||||||
|
case ESongSorting.TR_CONFIG_TAGS:
|
||||||
|
return ECoverGeneratorType.Tags;
|
||||||
case ESongSorting.TR_CONFIG_LANGUAGE:
|
case ESongSorting.TR_CONFIG_LANGUAGE:
|
||||||
return ECoverGeneratorType.Language;
|
return ECoverGeneratorType.Language;
|
||||||
case ESongSorting.TR_CONFIG_YEAR:
|
case ESongSorting.TR_CONFIG_YEAR:
|
||||||
|
|||||||
@@ -142,6 +142,9 @@ namespace Vocaluxe.Base
|
|||||||
case ESongSorting.TR_CONFIG_GENRE:
|
case ESongSorting.TR_CONFIG_GENRE:
|
||||||
noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOGENRE");
|
noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOGENRE");
|
||||||
break;
|
break;
|
||||||
|
case ESongSorting.TR_CONFIG_TAGS:
|
||||||
|
noCategoryName = CLanguage.Translate("TR_SCEENSONG_NOTAGS");
|
||||||
|
break;
|
||||||
case ESongSorting.TR_CONFIG_LANGUAGE:
|
case ESongSorting.TR_CONFIG_LANGUAGE:
|
||||||
noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOLANGUAGE");
|
noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOLANGUAGE");
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -136,6 +136,9 @@ namespace Vocaluxe.Base
|
|||||||
case ESongSorting.TR_CONFIG_GENRE:
|
case ESongSorting.TR_CONFIG_GENRE:
|
||||||
values = song.Genres;
|
values = song.Genres;
|
||||||
break;
|
break;
|
||||||
|
case ESongSorting.TR_CONFIG_TAGS:
|
||||||
|
values = song.Tags;
|
||||||
|
break;
|
||||||
case ESongSorting.TR_CONFIG_LANGUAGE:
|
case ESongSorting.TR_CONFIG_LANGUAGE:
|
||||||
values = song.Languages;
|
values = song.Languages;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ namespace VocaluxeLib
|
|||||||
Letter,
|
Letter,
|
||||||
Edition,
|
Edition,
|
||||||
Genre,
|
Genre,
|
||||||
|
Tags,
|
||||||
Language,
|
Language,
|
||||||
Year,
|
Year,
|
||||||
Decade,
|
Decade,
|
||||||
@@ -224,6 +225,7 @@ namespace VocaluxeLib
|
|||||||
TR_CONFIG_TITLE_LETTER,
|
TR_CONFIG_TITLE_LETTER,
|
||||||
TR_CONFIG_EDITION,
|
TR_CONFIG_EDITION,
|
||||||
TR_CONFIG_GENRE,
|
TR_CONFIG_GENRE,
|
||||||
|
TR_CONFIG_TAGS,
|
||||||
TR_CONFIG_LANGUAGE,
|
TR_CONFIG_LANGUAGE,
|
||||||
TR_CONFIG_YEAR,
|
TR_CONFIG_YEAR,
|
||||||
TR_CONFIG_DECADE,
|
TR_CONFIG_DECADE,
|
||||||
|
|||||||
@@ -167,6 +167,7 @@ namespace VocaluxeLib.Songs
|
|||||||
|
|
||||||
public readonly List<string> Editions = new List<string>();
|
public readonly List<string> Editions = new List<string>();
|
||||||
public readonly List<string> Genres = new List<string>();
|
public readonly List<string> Genres = new List<string>();
|
||||||
|
public readonly List<string> Tags = new List<string>();
|
||||||
public string Album = "";
|
public string Album = "";
|
||||||
public string Year = "";
|
public string Year = "";
|
||||||
|
|
||||||
@@ -261,6 +262,7 @@ namespace VocaluxeLib.Songs
|
|||||||
|
|
||||||
Editions = new List<string>(song.Editions);
|
Editions = new List<string>(song.Editions);
|
||||||
Genres = new List<string>(song.Genres);
|
Genres = new List<string>(song.Genres);
|
||||||
|
Tags = new List<string>(song.Tags);
|
||||||
Album = song.Album;
|
Album = song.Album;
|
||||||
Year = song.Year;
|
Year = song.Year;
|
||||||
|
|
||||||
|
|||||||
@@ -228,6 +228,12 @@ namespace VocaluxeLib.Songs
|
|||||||
else
|
else
|
||||||
_LogWarning("Invalid genre");
|
_LogWarning("Invalid genre");
|
||||||
break;
|
break;
|
||||||
|
case "TAGS":
|
||||||
|
if (value.Length > 1)
|
||||||
|
_Song.Tags.AddRange(value.Split(','));
|
||||||
|
else
|
||||||
|
_LogWarning("Invalid tags");
|
||||||
|
break;
|
||||||
case "ALBUM":
|
case "ALBUM":
|
||||||
_Song.Album = value;
|
_Song.Album = value;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ namespace VocaluxeLib.Songs
|
|||||||
_WriteHeaderEntry("ARTIST-ON-SORTING", _Song.ArtistSorting);
|
_WriteHeaderEntry("ARTIST-ON-SORTING", _Song.ArtistSorting);
|
||||||
_WriteHeaderEntrys("EDITION", _Song.Editions);
|
_WriteHeaderEntrys("EDITION", _Song.Editions);
|
||||||
_WriteHeaderEntrys("GENRE", _Song.Genres);
|
_WriteHeaderEntrys("GENRE", _Song.Genres);
|
||||||
|
_WriteHeaderEntry("TAGS", String.Join(",", _Song.Tags.ToArray()));
|
||||||
_WriteHeaderEntrys("LANGUAGE", _Song.Languages);
|
_WriteHeaderEntrys("LANGUAGE", _Song.Languages);
|
||||||
_WriteHeaderEntry("ALBUM", _Song.Album);
|
_WriteHeaderEntry("ALBUM", _Song.Album);
|
||||||
_WriteHeaderEntry("YEAR", _Song.Year);
|
_WriteHeaderEntry("YEAR", _Song.Year);
|
||||||
|
|||||||
Reference in new issue
Block a user