Merge pull request #1 from MediaBrowser/master

Update to latest

2 files changed, 59 insertions, 19 deletions

diff --git a/MediaBrowser.Model/System/LogFile.cs b/MediaBrowser.Model/System/LogFile.cs
new file mode 100644
index 000000000..ba409c542
--- /dev/null
+++ b/MediaBrowser.Model/System/LogFile.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace MediaBrowser.Model.System
+{
+    public class LogFile
+    {
+        /// <summary>
+        /// Gets or sets the date created.
+        /// </summary>
+        /// <value>The date created.</value>
+        public DateTime DateCreated { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date modified.
+        /// </summary>
+        /// <value>The date modified.</value>
+        public DateTime DateModified { get; set; }
+
+        /// <summary>
+        /// Gets or sets the size.
+        /// </summary>
+        /// <value>The size.</value>
+        public long Size { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string Name { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 5b1e7d6bb..4e0d82191 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -6,15 +6,9 @@ namespace MediaBrowser.Model.System
     /// <summary>
     /// Class SystemInfo
     /// </summary>
-    public class SystemInfo
+    public class SystemInfo : PublicSystemInfo
     {
         /// <summary>
-        /// Gets or sets the version.
-        /// </summary>
-        /// <value>The version.</value>
-        public string Version { get; set; }
-
-        /// <summary>
         /// Gets or sets the operating sytem.
         /// </summary>
         /// <value>The operating sytem.</value>
@@ -33,6 +27,12 @@ namespace MediaBrowser.Model.System
         public string MacAddress { get; set; }
 
         /// <summary>
+        /// Gets or sets the local address.
+        /// </summary>
+        /// <value>The local address.</value>
+        public string LocalAddress { get; set; }
+        
+        /// <summary>
         /// Gets or sets a value indicating whether this instance has pending restart.
         /// </summary>
         /// <value><c>true</c> if this instance has pending restart; otherwise, <c>false</c>.</value>
@@ -87,12 +87,6 @@ namespace MediaBrowser.Model.System
         public List<string> FailedPluginAssemblies { get; set; }
 
         /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        /// <value>The id.</value>
-        public string Id { get; set; }
-
-        /// <summary>
         /// Gets or sets the program data path.
         /// </summary>
         /// <value>The program data path.</value>
@@ -153,12 +147,6 @@ namespace MediaBrowser.Model.System
         public bool SupportsAutoRunAtStartup { get; set; }
 
         /// <summary>
-        /// Gets or sets the name of the server.
-        /// </summary>
-        /// <value>The name of the server.</value>
-        public string ServerName { get; set; }
-
-        /// <summary>
         /// Initializes a new instance of the <see cref="SystemInfo" /> class.
         /// </summary>
         public SystemInfo()
@@ -170,4 +158,25 @@ namespace MediaBrowser.Model.System
             FailedPluginAssemblies = new List<string>();
         }
     }
+
+    public class PublicSystemInfo
+    {
+        /// <summary>
+        /// Gets or sets the name of the server.
+        /// </summary>
+        /// <value>The name of the server.</value>
+        public string ServerName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the version.
+        /// </summary>
+        /// <value>The version.</value>
+        public string Version { get; set; }
+
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        public string Id { get; set; }
+    }
 }