Merge branch 'beta'

2 files changed, 23 insertions, 0 deletions

diff --git a/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs b/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
index ae701ea68..830d55bf5 100644
--- a/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
+++ b/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
@@ -9,9 +9,16 @@ namespace MediaBrowser.Model.FileOrganization
         /// <value>The tv options.</value>
         public TvFileOrganizationOptions TvOptions { get; set; }
 
+        /// <summary>
+        /// Gets or sets a list of smart match entries.
+        /// </summary>
+        /// <value>The smart match entries.</value>
+        public SmartMatchInfo[] SmartMatchInfos { get; set; }
+
         public AutoOrganizeOptions()
         {
             TvOptions = new TvFileOrganizationOptions();
+            SmartMatchInfos = new SmartMatchInfo[]{};
         }
     }
 }
diff --git a/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs b/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs
new file mode 100644
index 000000000..28c99b89b
--- /dev/null
+++ b/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs
@@ -0,0 +1,16 @@
+
+namespace MediaBrowser.Model.FileOrganization
+{
+    public class SmartMatchInfo
+    {
+        public string ItemName { get; set; }
+        public string DisplayName { get; set; }
+        public FileOrganizerType OrganizerType { get; set; }
+        public string[] MatchStrings { get; set; }
+
+        public SmartMatchInfo()
+        {
+            MatchStrings = new string[] { };
+        }
+    }
+}