浏览代码

update to service stack 3.0.70.0

Luke Pulverenti 11 年之前
父节点
当前提交
58f1a314b5

+ 12 - 9
MediaBrowser.Api/MediaBrowser.Api.csproj

@@ -38,6 +38,18 @@
     <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ServiceStack.Common, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Interfaces, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
@@ -47,15 +59,6 @@
     <Reference Include="MoreLinq">
       <HintPath>..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Common">
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Interfaces">
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>

+ 22 - 1
MediaBrowser.Api/TvShowsService.cs

@@ -81,6 +81,9 @@ namespace MediaBrowser.Api
         [ApiMember(Name = "Season", Description = "Optional filter by season number.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         public int? Season { get; set; }
 
+        [ApiMember(Name = "SeasonId", Description = "Optional. Filter by season id", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
+        public string SeasonId { get; set; }
+        
         [ApiMember(Name = "IsMissing", Description = "Optional filter by items that are missing episodes or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
         public bool? IsMissing { get; set; }
 
@@ -442,7 +445,25 @@ namespace MediaBrowser.Api
 
             var sortOrder = ItemSortBy.SortName;
 
-            if (request.Season.HasValue)
+            if (!string.IsNullOrEmpty(request.SeasonId))
+            {
+                var season = _libraryManager.GetItemById(request.Id) as Season;
+
+                if (season.IndexNumber.HasValue)
+                {
+                    episodes = FilterEpisodesBySeason(episodes, season.IndexNumber.Value, true);
+
+                    sortOrder = ItemSortBy.AiredEpisodeOrder;
+                }
+                else
+                {
+                    episodes = season.RecursiveChildren.OfType<Episode>();
+
+                    sortOrder = ItemSortBy.SortName;
+                }
+            }
+
+            else if (request.Season.HasValue)
             {
                 episodes = FilterEpisodesBySeason(episodes, request.Season.Value, true);
 

+ 2 - 2
MediaBrowser.Api/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="morelinq" version="1.0.16006" targetFramework="net45" />
-  <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
+  <package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" />
+  <package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
 </packages>

+ 18 - 94
MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs

@@ -27,7 +27,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
         /// <summary>
         /// When one request to a host times out, we'll ban all other requests for this period of time, to prevent scans from stalling
         /// </summary>
-        private int TimeoutSeconds = 30;
+        private const int TimeoutSeconds = 30;
 
         /// <summary>
         /// The _logger
@@ -42,16 +42,14 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
         private readonly IFileSystem _fileSystem;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="HttpClientManager"/> class.
+        /// Initializes a new instance of the <see cref="HttpClientManager" /> class.
         /// </summary>
         /// <param name="appPaths">The app paths.</param>
         /// <param name="logger">The logger.</param>
-        /// <param name="getHttpClientHandler">The get HTTP client handler.</param>
-        /// <exception cref="System.ArgumentNullException">
-        /// appPaths
+        /// <param name="fileSystem">The file system.</param>
+        /// <exception cref="System.ArgumentNullException">appPaths
         /// or
-        /// logger
-        /// </exception>
+        /// logger</exception>
         public HttpClientManager(IApplicationPaths appPaths, ILogger logger, IFileSystem fileSystem)
         {
             if (appPaths == null)
@@ -143,7 +141,6 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
         /// Gets the response internal.
         /// </summary>
         /// <param name="options">The options.</param>
-        /// <param name="httpMethod">The HTTP method.</param>
         /// <returns>Task{HttpResponseInfo}.</returns>
         /// <exception cref="HttpException">
         /// </exception>
@@ -490,27 +487,19 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
             }
             catch (OperationCanceledException ex)
             {
-                var exception = GetCancellationException(options.Url, options.CancellationToken, ex);
-
-                throw exception;
+                throw GetTempFileException(ex, options, tempFile);
             }
             catch (HttpRequestException ex)
             {
-                _logger.ErrorException("Error getting response from " + options.Url, ex);
-
-                throw new HttpException(ex.Message, ex);
+                throw GetTempFileException(ex, options, tempFile);
             }
             catch (WebException ex)
             {
-                _logger.ErrorException("Error getting response from " + options.Url, ex);
-
-                throw new HttpException(ex.Message, ex);
+                throw GetTempFileException(ex, options, tempFile);
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error getting response from " + options.Url, ex);
-
-                throw;
+                throw GetTempFileException(ex, options, tempFile);
             }
             finally
             {
@@ -521,65 +510,6 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
             }
         }
 
-        /// <summary>
-        /// Gets the message.
-        /// </summary>
-        /// <param name="options">The options.</param>
-        /// <returns>HttpResponseMessage.</returns>
-        private HttpRequestMessage GetHttpRequestMessage(HttpRequestOptions options)
-        {
-            var message = new HttpRequestMessage(HttpMethod.Get, options.Url);
-
-            foreach (var pair in options.RequestHeaders.ToList())
-            {
-                if (!message.Headers.TryAddWithoutValidation(pair.Key, pair.Value))
-                {
-                    _logger.Error("Unable to add request header {0} with value {1}", pair.Key, pair.Value);
-                }
-            }
-
-            return message;
-        }
-
-        /// <summary>
-        /// Gets the length of the content.
-        /// </summary>
-        /// <param name="response">The response.</param>
-        /// <returns>System.Nullable{System.Int64}.</returns>
-        private long? GetContentLength(HttpResponseMessage response)
-        {
-            IEnumerable<string> lengthValues = null;
-
-            // Seeing some InvalidOperationException here under mono
-            try
-            {
-                response.Headers.TryGetValues("content-length", out lengthValues);
-            }
-            catch (InvalidOperationException ex)
-            {
-                _logger.ErrorException("Error accessing response.Headers.TryGetValues Content-Length", ex);
-            }
-
-            if (lengthValues == null)
-            {
-                try
-                {
-                    response.Content.Headers.TryGetValues("content-length", out lengthValues);
-                }
-                catch (InvalidOperationException ex)
-                {
-                    _logger.ErrorException("Error accessing response.Content.Headers.TryGetValues Content-Length", ex);
-                }
-            }
-
-            if (lengthValues == null)
-            {
-                return null;
-            }
-
-            return long.Parse(string.Join(string.Empty, lengthValues.ToArray()), UsCulture);
-        }
-
         private long? GetContentLength(HttpWebResponse response)
         {
             var length = response.ContentLength;
@@ -616,16 +546,23 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
 
             _logger.ErrorException("Error getting response from " + options.Url, ex);
 
-            var httpRequestException = ex as HttpRequestException;
-
             // Cleanup
             DeleteTempFile(tempFile);
 
+            var httpRequestException = ex as HttpRequestException;
+
             if (httpRequestException != null)
             {
                 return new HttpException(ex.Message, ex);
             }
 
+            var webException = ex as WebException;
+
+            if (webException != null)
+            {
+                return new HttpException(ex.Message, ex);
+            }
+            
             return ex;
         }
 
@@ -711,19 +648,6 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
             return exception;
         }
 
-        /// <summary>
-        /// Ensures the success status code.
-        /// </summary>
-        /// <param name="response">The response.</param>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
-        private void EnsureSuccessStatusCode(HttpResponseMessage response)
-        {
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new HttpException(response.ReasonPhrase) { StatusCode = response.StatusCode };
-            }
-        }
-
         private void EnsureSuccessStatusCode(HttpWebResponse response)
         {
             var statusCode = response.StatusCode;

+ 4 - 3
MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj

@@ -41,6 +41,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NLog.2.1.0\lib\net45\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="ServiceStack.Text, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll</HintPath>
+    </Reference>
     <Reference Include="SharpCompress">
       <HintPath>..\packages\sharpcompress.0.10.1.3\lib\net40\SharpCompress.dll</HintPath>
     </Reference>
@@ -55,9 +59,6 @@
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">

+ 2 - 0
MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs

@@ -169,6 +169,8 @@ namespace MediaBrowser.Common.Implementations.Serialization
             ServiceStack.Text.JsConfig.DateHandler = ServiceStack.Text.JsonDateHandler.ISO8601;
             ServiceStack.Text.JsConfig.ExcludeTypeInfo = true;
             ServiceStack.Text.JsConfig.IncludeNullValues = false;
+            ServiceStack.Text.JsConfig.AlwaysUseUtc = true;
+            ServiceStack.Text.JsConfig.AssumeUtc = true;
         }
 
         /// <summary>

+ 1 - 1
MediaBrowser.Common.Implementations/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NLog" version="2.1.0" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
+  <package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
   <package id="sharpcompress" version="0.10.1.3" targetFramework="net45" />
   <package id="SimpleInjector" version="2.3.6" targetFramework="net45" />
 </packages>

+ 12 - 9
MediaBrowser.Common/MediaBrowser.Common.csproj

@@ -35,18 +35,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="ServiceStack.Common">
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll</HintPath>
+    <Reference Include="ServiceStack.Common, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Common.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Interfaces">
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+    <Reference Include="ServiceStack.Interfaces, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll</HintPath>
+    <Reference Include="ServiceStack.Text, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">

+ 2 - 2
MediaBrowser.Common/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
+  <package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" />
+  <package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
 </packages>

+ 2 - 0
MediaBrowser.Model/Querying/EpisodeQuery.cs

@@ -5,6 +5,8 @@ namespace MediaBrowser.Model.Querying
     {
         public string UserId { get; set; }
 
+        public string SeasonId { get; set; }
+        
         public string SeriesId { get; set; }
 
         public bool? IsMissing { get; set; }

+ 12 - 0
MediaBrowser.Model/System/SystemInfo.cs

@@ -92,6 +92,18 @@ namespace MediaBrowser.Model.System
         /// <value>The program data path.</value>
         public string ProgramDataPath { get; set; }
 
+        /// <summary>
+        /// Gets or sets the items by name path.
+        /// </summary>
+        /// <value>The items by name path.</value>
+        public string ItemsByNamePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the log path.
+        /// </summary>
+        /// <value>The log path.</value>
+        public string LogPath { get; set; }
+        
         /// <summary>
         /// Gets or sets the HTTP server port number.
         /// </summary>

+ 27 - 33
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj

@@ -41,8 +41,29 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\MediaBrowser.BdInfo.1.0.0.5\lib\net20\BDInfo.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.OrmLite.SqliteNET">
-      <HintPath>..\packages\ServiceStack.OrmLite.Sqlite32.3.9.63\lib\net40\ServiceStack.OrmLite.SqliteNET.dll</HintPath>
+    <Reference Include="ServiceStack, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.3.9.70\lib\net35\ServiceStack.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Api.Swagger, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Api.Swagger.3.9.70\lib\net35\ServiceStack.Api.Swagger.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Common, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Interfaces, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.ServiceInterface, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.3.9.70\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -72,39 +93,12 @@
     <Reference Include="MoreLinq">
       <HintPath>..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack">
-      <HintPath>..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Api.Swagger">
-      <HintPath>..\packages\ServiceStack.Api.Swagger.3.9.59\lib\net35\ServiceStack.Api.Swagger.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Common">
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Interfaces">
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll</HintPath>
-    </Reference>
     <Reference Include="ServiceStack.OrmLite.SqlServer">
       <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.43\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Redis">
       <HintPath>..\packages\ServiceStack.Redis.3.9.43\lib\net35\ServiceStack.Redis.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.ServiceInterface">
-      <HintPath>..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Data.Sqlite">
-      <HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.64\lib\net35\Mono.Data.Sqlite.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.OrmLite">
-      <HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.64\lib\net35\ServiceStack.OrmLite.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.OrmLite.Sqlite">
-      <HintPath>..\packages\ServiceStack.OrmLite.Sqlite.Mono.3.9.64\lib\net35\ServiceStack.OrmLite.Sqlite.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
@@ -268,7 +262,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Localization\Ratings\ca.txt" />
     <Content Include="swagger-ui\css\hightlight.default.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -287,9 +280,6 @@
     <Content Include="swagger-ui\images\wordnik_api.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="swagger-ui\index.html">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="swagger-ui\lib\backbone-min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -323,6 +313,10 @@
     <Content Include="swagger-ui\swagger-ui.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="Localization\Ratings\ca.txt" />
+    <Content Include="swagger-ui\index.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />

+ 4 - 6
MediaBrowser.Server.Implementations/packages.config

@@ -6,13 +6,11 @@
   <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
   <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
-  <package id="ServiceStack" version="3.9.62" targetFramework="net45" />
-  <package id="ServiceStack.Api.Swagger" version="3.9.59" targetFramework="net45" />
-  <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
-  <package id="ServiceStack.OrmLite.Sqlite.Mono" version="3.9.64" targetFramework="net45" />
-  <package id="ServiceStack.OrmLite.Sqlite32" version="3.9.63" targetFramework="net45" />
+  <package id="ServiceStack" version="3.9.70" targetFramework="net45" />
+  <package id="ServiceStack.Api.Swagger" version="3.9.70" targetFramework="net45" />
+  <package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" />
   <package id="ServiceStack.OrmLite.SqlServer" version="3.9.43" targetFramework="net45" />
   <package id="ServiceStack.Redis" version="3.9.43" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
+  <package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
   <package id="System.Data.SQLite.x86" version="1.0.89.0" targetFramework="net45" />
 </packages>

+ 1 - 1
MediaBrowser.Server.Implementations/swagger-ui/index.html

@@ -20,7 +20,7 @@
 	$(function () {
 	    window.swaggerUi = new SwaggerUi({
 	        discoveryUrl: "../resources",
-                apiKey:"special-key",
+	        apiKey: "special-key",
                 dom_id:"swagger-ui-container",
                 supportHeaderParams: false,
                 supportedSubmitMethods: ['get', 'post', 'put'],

+ 2 - 0
MediaBrowser.ServerApplication/ApplicationHost.cs

@@ -609,6 +609,8 @@ namespace MediaBrowser.ServerApplication
                 CompletedInstallations = InstallationManager.CompletedInstallations.ToList(),
                 Id = _systemId,
                 ProgramDataPath = ApplicationPaths.ProgramDataPath,
+                LogPath = ApplicationPaths.LogDirectoryPath,
+                ItemsByNamePath = ApplicationPaths.ItemsByNamePath,
                 MacAddress = GetMacAddress(),
                 HttpServerPortNumber = ServerConfigurationManager.Configuration.HttpServerPortNumber,
                 OperatingSystem = Environment.OSVersion.ToString(),

+ 10 - 10
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj

@@ -131,17 +131,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\MediaBrowser.IsoMounting.3.0.65\lib\net45\pfmclrapi.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.3.9.70\lib\net35\ServiceStack.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Common, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack.Common, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Common.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Interfaces, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack.Interfaces, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.OrmLite.SqlServer">
       <HintPath>..\packages\ServiceStack.OrmLite.SqlServer.3.9.44\lib\ServiceStack.OrmLite.SqlServer.dll</HintPath>
@@ -149,13 +149,13 @@
     <Reference Include="ServiceStack.Redis">
       <HintPath>..\packages\ServiceStack.Redis.3.9.44\lib\net35\ServiceStack.Redis.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.ServiceInterface, Version=3.9.60.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack.ServiceInterface, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.3.9.70\lib\net35\ServiceStack.ServiceInterface.dll</HintPath>
     </Reference>
-    <Reference Include="ServiceStack.Text, Version=3.9.59.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ServiceStack.Text, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll</HintPath>
+      <HintPath>..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll</HintPath>
     </Reference>
     <Reference Include="SimpleInjector, Version=2.3.6.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

+ 3 - 3
MediaBrowser.ServerApplication/packages.config

@@ -3,10 +3,10 @@
   <package id="Hardcodet.Wpf.TaskbarNotification" version="1.0.4.0" targetFramework="net45" />
   <package id="MediaBrowser.IsoMounting" version="3.0.65" targetFramework="net45" />
   <package id="NLog" version="2.1.0" targetFramework="net45" />
-  <package id="ServiceStack" version="3.9.62" targetFramework="net45" />
-  <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
+  <package id="ServiceStack" version="3.9.70" targetFramework="net45" />
+  <package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" />
   <package id="ServiceStack.OrmLite.SqlServer" version="3.9.44" targetFramework="net45" />
   <package id="ServiceStack.Redis" version="3.9.44" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
+  <package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
   <package id="SimpleInjector" version="2.3.6" targetFramework="net45" />
 </packages>

+ 12 - 9
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -37,21 +37,24 @@
     <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ServiceStack.Common, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Interfaces, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Common.3.9.70\lib\net35\ServiceStack.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="ServiceStack.Text, Version=3.9.70.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\ServiceStack.Text.3.9.70\lib\net35\ServiceStack.Text.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="ServiceStack.Common">
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Interfaces">
-      <HintPath>..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="ServiceStack.Text">
-      <HintPath>..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">

+ 2 - 2
MediaBrowser.WebDashboard/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MediaBrowser.ApiClient.Javascript" version="3.0.203" targetFramework="net45" />
-  <package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
-  <package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
+  <package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" />
+  <package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
 </packages>

+ 2 - 2
Nuget/MediaBrowser.Common.Internal.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.254</version>
+        <version>3.0.255</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.254" />
+            <dependency id="MediaBrowser.Common" version="3.0.255" />
             <dependency id="NLog" version="2.1.0" />
             <dependency id="ServiceStack.Text" version="3.9.58" />
             <dependency id="SimpleInjector" version="2.3.6" />

+ 1 - 1
Nuget/MediaBrowser.Common.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.254</version>
+        <version>3.0.255</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>

+ 2 - 2
Nuget/MediaBrowser.Server.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.254</version>
+        <version>3.0.255</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.254" />
+            <dependency id="MediaBrowser.Common" version="3.0.255" />
         </dependencies>
     </metadata>
     <files>