Merge pull request #630 from Vocaluxe/feature/642-read-tags

Merge release-0.4.1 branch to develop and add tags-feature

Output/Languages/en.xml

@@ -65,6 +65,7 @@
   <string name="TR_CONFIG_ARTIST_LETTER">Artist by letter</string>
   <string name="TR_CONFIG_TITLE_LETTER">Title by letter</string>
   <string name="TR_CONFIG_EDITION">Edition</string>
+  <string name="TR_CONFIG_TAGS">Tags</string>
   <string name="TR_CONFIG_GENRE">Genre</string>
   <string name="TR_CONFIG_YEAR">Year</string>
   <string name="TR_CONFIG_DECADE">Decade</string>
@@ -148,6 +149,7 @@
   <string name="TR_SCREENSONG_NOYEAR">No Year</string>
   <string name="TR_SCREENSONG_NOGENRE">No Genre</string>
   <string name="TR_SCREENSONG_NOEDITION">No Edition</string>
+  <string name="TR_SCREENSONG_NOTAGS">No Tags</string>
   <string name="TR_SCREENSONG_ALLSONGS">All Songs</string>
   <string name="TR_SCREENSONG_NUMSONGS">(%v songs)</string>
   <string name="TR_SCREENSONG_NUMSONG">(%v song)</string>

Vocaluxe/Base/CCover.cs

@@ -252,6 +252,8 @@ namespace Vocaluxe.Base
                     return ECoverGeneratorType.Edition;
                 case ESongSorting.TR_CONFIG_GENRE:
                     return ECoverGeneratorType.Genre;
+                case ESongSorting.TR_CONFIG_TAGS:
+                    return ECoverGeneratorType.Tags;
                 case ESongSorting.TR_CONFIG_LANGUAGE:
                     return ECoverGeneratorType.Language;
                 case ESongSorting.TR_CONFIG_YEAR:

Vocaluxe/Base/CSongCategorizer.cs

@@ -142,6 +142,9 @@ namespace Vocaluxe.Base
                 case ESongSorting.TR_CONFIG_GENRE:
                     noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOGENRE");
                     break;
+                case ESongSorting.TR_CONFIG_TAGS:
+                    noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOTAGS");
+                    break;
                 case ESongSorting.TR_CONFIG_LANGUAGE:
                     noCategoryName = CLanguage.Translate("TR_SCREENSONG_NOLANGUAGE");
                     break;
@@ -186,4 +189,4 @@ namespace Vocaluxe.Base
             _Changed = false;
         }
     }
-}
+}

Vocaluxe/Base/CSongSorter.cs

@@ -154,6 +154,9 @@ namespace Vocaluxe.Base
                 case ESongSorting.TR_CONFIG_GENRE:
                     values = song.Genres;
                     break;
+                case ESongSorting.TR_CONFIG_TAGS:
+                    values = song.Tags;
+                    break;
                 case ESongSorting.TR_CONFIG_LANGUAGE:
                     values = song.Languages;
                     break;

VocaluxeLib/Enums.cs

@@ -28,6 +28,7 @@ namespace VocaluxeLib
         Letter,
         Edition,
         Genre,
+        Tags,
         Language,
         Year,
         Decade,
@@ -233,6 +234,7 @@ namespace VocaluxeLib
         TR_CONFIG_TITLE_LETTER,
         TR_CONFIG_EDITION,
         TR_CONFIG_GENRE,
+        TR_CONFIG_TAGS,
         TR_CONFIG_LANGUAGE,
         TR_CONFIG_YEAR,
         TR_CONFIG_DECADE,

VocaluxeLib/Songs/CSong.cs

@@ -89,7 +89,7 @@ namespace VocaluxeLib.Songs
 
         public SShortEnd ShortEnd;
 
-        public Encoding Encoding = Encoding.Default;
+        public Encoding Encoding = new UTF8Encoding();
         public bool ManualEncoding;
         public string Folder = String.Empty;
         public string FolderName = String.Empty;
@@ -169,6 +169,7 @@ namespace VocaluxeLib.Songs
 
         public readonly List<string> Editions = new List<string>();
         public readonly List<string> Genres = new List<string>();
+        public readonly List<string> Tags = new List<string>();
         public string Album = "";
         public string Year = "";
 
@@ -263,6 +264,7 @@ namespace VocaluxeLib.Songs
 
             Editions = new List<string>(song.Editions);
             Genres = new List<string>(song.Genres);
+            Tags = new List<string>(song.Tags);
             Album = song.Album;
             Year = song.Year;
 

VocaluxeLib/Songs/CSongLoader.cs

@@ -210,6 +210,12 @@ namespace VocaluxeLib.Songs
                                 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;
                                 break;

VocaluxeLib/Songs/CSongWriter.cs

@@ -88,6 +88,7 @@ namespace VocaluxeLib.Songs
                     _WriteHeaderEntry("ARTIST-ON-SORTING", _Song.ArtistSorting);
                 _WriteHeaderEntrys("EDITION", _Song.Editions);
                 _WriteHeaderEntrys("GENRE", _Song.Genres);
+                _WriteHeaderEntry("TAGS", String.Join(",", _Song.Tags.ToArray()));
                 _WriteHeaderEntrys("LANGUAGE", _Song.Languages);
                 _WriteHeaderEntry("ALBUM", _Song.Album);
                 _WriteHeaderEntry("YEAR", _Song.Year);