WinGui: Tidyup around the Scan Objects. Complete some incomplete models. Introduce a factory for Title objects.

2 files changed, 26 insertions, 12 deletions

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index 8396a584f..3e133c5fa 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
@@ -611,6 +611,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
             if (job.MetaData != null)
             {
                 metaData.Artist = job.MetaData.Artist;
+                metaData.Album = job.MetaData.Album;
                 metaData.AlbumArtist = job.MetaData.AlbumArtist;
                 metaData.Comment = job.MetaData.Comment;
                 metaData.Composer = job.MetaData.Composer;
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/MetaData.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/MetaData.cs
index e86212a39..02dc02ffb 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/MetaData.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/MetaData.cs
@@ -9,13 +9,13 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
+    using HandBrakeWPF.Services.Scan.Model;
+
     /// <summary>
     /// The meta data.
     /// </summary>
     public class MetaData
     {
-        private string albumArtist;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="MetaData"/> class. 
         /// </summary>
@@ -34,6 +34,7 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
             if (metadata != null)
             {
                 this.AlbumArtist = metadata.AlbumArtist;
+                this.Album = metadata.Album;
                 this.Artist = metadata.Artist;
                 this.Comment = metadata.Comment;
                 this.Composer = metadata.Composer;
@@ -45,22 +46,34 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
             }
         }
 
-        /// <summary>
-        ///     Gets or sets the album artist.
-        /// </summary>
-        public string AlbumArtist
+        public MetaData(Metadata metadata)
         {
-            get
-            {
-                return this.albumArtist;
-            }
-            set
+            if (metadata != null)
             {
-                this.albumArtist = value;
+                this.AlbumArtist = metadata.AlbumArtist;
+                this.Album = metadata.Album;
+                this.Artist = metadata.Artist;
+                this.Comment = metadata.Comment;
+                this.Composer = metadata.Composer;
+                this.Description = metadata.Description;
+                this.Genre = metadata.Genre;
+                this.LongDescription = metadata.LongDescription;
+                this.Name = metadata.Name;
+                this.ReleaseDate = metadata.ReleaseDate;
             }
         }
 
         /// <summary>
+        ///     Gets or sets the album artist.
+        /// </summary>
+        public string AlbumArtist { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the album.
+        /// </summary>
+        public string Album { get; set; }
+
+        /// <summary>
         ///     Gets or sets the artist.
         /// </summary>
         public string Artist { get; set; }