updated nuget

6 files changed, 89 insertions, 16 deletions

diff --git a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
index 29993d675..4203f4cc1 100644
--- a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
@@ -787,12 +787,24 @@ namespace MediaBrowser.Server.Implementations.Drawing
 
                             Directory.CreateDirectory(parentDirectory);
 
-                            using (var newImage = Image.FromStream(newImageStream.Stream, true, false))
+                            // Save as png
+                            if (newImageStream.Format == Model.Drawing.ImageFormat.Png)
                             {
                                 //And then save it in the cache
                                 using (var outputStream = _fileSystem.GetFileStream(enhancedImagePath, FileMode.Create, FileAccess.Write, FileShare.Read, false))
                                 {
-                                    newImage.Save(System.Drawing.Imaging.ImageFormat.Png, outputStream, 100);
+                                    await newImageStream.Stream.CopyToAsync(outputStream).ConfigureAwait(false);
+                                }
+                            }
+                            else
+                            {
+                                using (var newImage = Image.FromStream(newImageStream.Stream, true, false))
+                                {
+                                    //And then save it in the cache
+                                    using (var outputStream = _fileSystem.GetFileStream(enhancedImagePath, FileMode.Create, FileAccess.Write, FileShare.Read, false))
+                                    {
+                                        newImage.Save(System.Drawing.Imaging.ImageFormat.Png, outputStream, 100);
+                                    }
                                 }
                             }
                         }
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index b4393572e..c420ddabb 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1020,7 +1020,10 @@ namespace MediaBrowser.Server.Implementations.Dto
                     dto.AlbumPrimaryImageTag = GetImageCacheTag(albumParent, ImageType.Primary);
                 }
 
-                dto.MediaSourceCount = 1;
+                //if (fields.Contains(ItemFields.MediaSourceCount))
+                //{
+                    // Songs always have one
+                //}
             }
 
             var album = item as MusicAlbum;
@@ -1057,7 +1060,10 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 if (fields.Contains(ItemFields.MediaSourceCount))
                 {
-                    dto.MediaSourceCount = video.MediaSourceCount;
+                    if (video.MediaSourceCount != 1)
+                    {
+                        dto.MediaSourceCount = video.MediaSourceCount;
+                    }
                 }
 
                 if (fields.Contains(ItemFields.Chapters))
@@ -1120,12 +1126,16 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 dto.IndexNumberEnd = episode.IndexNumberEnd;
 
-                dto.DvdSeasonNumber = episode.DvdSeasonNumber;
-                dto.DvdEpisodeNumber = episode.DvdEpisodeNumber;
+                if (fields.Contains(ItemFields.AlternateEpisodeNumbers))
+                {
+                    dto.DvdSeasonNumber = episode.DvdSeasonNumber;
+                    dto.DvdEpisodeNumber = episode.DvdEpisodeNumber;
+                    dto.AbsoluteEpisodeNumber = episode.AbsoluteEpisodeNumber;
+                }
+
                 dto.AirsAfterSeasonNumber = episode.AirsAfterSeasonNumber;
                 dto.AirsBeforeEpisodeNumber = episode.AirsBeforeEpisodeNumber;
                 dto.AirsBeforeSeasonNumber = episode.AirsBeforeSeasonNumber;
-                dto.AbsoluteEpisodeNumber = episode.AbsoluteEpisodeNumber;
 
                 var episodeSeason = episode.Season;
                 if (episodeSeason != null)
@@ -1163,9 +1173,21 @@ namespace MediaBrowser.Server.Implementations.Dto
                     dto.SeriesId = GetDtoId(series);
                     dto.SeriesName = series.Name;
                     dto.AirTime = series.AirTime;
-                    dto.SeriesStudio = series.Studios.FirstOrDefault();
-                    dto.SeriesThumbImageTag = GetImageCacheTag(series, ImageType.Thumb);
-                    dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+
+                    if (options.GetImageLimit(ImageType.Thumb) > 0)
+                    {
+                        dto.SeriesThumbImageTag = GetImageCacheTag(series, ImageType.Thumb);
+                    }
+
+                    if (options.GetImageLimit(ImageType.Primary) > 0)
+                    {
+                        dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+                    }
+
+                    if (fields.Contains(ItemFields.SeriesStudio))
+                    {
+                        dto.SeriesStudio = series.Studios.FirstOrDefault();
+                    }
                 }
             }
 
@@ -1183,7 +1205,10 @@ namespace MediaBrowser.Server.Implementations.Dto
                     dto.AirTime = series.AirTime;
                     dto.SeriesStudio = series.Studios.FirstOrDefault();
 
-                    dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+                    if (options.GetImageLimit(ImageType.Primary) > 0)
+                    {
+                        dto.SeriesPrimaryImageTag = GetImageCacheTag(series, ImageType.Primary);
+                    }
                 }
             }
 
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs b/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
index 85410faf2..36ba55828 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
@@ -12,6 +12,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         private readonly IApplicationHost _applicationHost;
         private readonly INetworkManager _networkManager;
         private readonly IHttpClient _httpClient;
+        private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
 
         public UsageReporter(IApplicationHost applicationHost, INetworkManager networkManager, IHttpClient httpClient)
         {
@@ -37,7 +38,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                 { "isservice", _applicationHost.IsRunningAsService.ToString().ToLower()}
             };
 
-            return _httpClient.Post(Common.Constants.Constants.MbAdminUrl + "service/registration/ping", data, cancellationToken);
+            return _httpClient.Post(MbAdminUrl + "service/registration/ping", data, cancellationToken);
         }
 
         public Task ReportAppUsage(ClientInfo app, CancellationToken cancellationToken)
@@ -59,7 +60,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                 { "platform", app.DeviceName }, 
             };
 
-            return _httpClient.Post(Common.Constants.Constants.MbAdminUrl + "service/registration/ping", data, cancellationToken);
+            return _httpClient.Post(MbAdminUrl + "service/registration/ping", data, cancellationToken);
         }
     }
 
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
index c41aebb69..cf120f147 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
@@ -3,8 +3,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.FileOrganization;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
-using MediaBrowser.Controller.Resolvers;
-using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.FileOrganization;
 using MediaBrowser.Model.Logging;
 using System;
@@ -13,7 +11,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Server.Implementations.Library;
 
 namespace MediaBrowser.Server.Implementations.FileOrganization
 {
diff --git a/MediaBrowser.Server.Implementations/Library/PathExtensions.cs b/MediaBrowser.Server.Implementations/Library/PathExtensions.cs
new file mode 100644
index 000000000..00bd65125
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Library/PathExtensions.cs
@@ -0,0 +1,37 @@
+using System;
+
+namespace MediaBrowser.Server.Implementations.Library
+{
+    public static class PathExtensions
+    {
+        /// <summary>
+        /// Gets the attribute value.
+        /// </summary>
+        /// <param name="str">The STR.</param>
+        /// <param name="attrib">The attrib.</param>
+        /// <returns>System.String.</returns>
+        /// <exception cref="System.ArgumentNullException">attrib</exception>
+        public static string GetAttributeValue(this string str, string attrib)
+        {
+            if (string.IsNullOrEmpty(str))
+            {
+                throw new ArgumentNullException("str");
+            }
+
+            if (string.IsNullOrEmpty(attrib))
+            {
+                throw new ArgumentNullException("attrib");
+            }
+
+            string srch = "[" + attrib + "=";
+            int start = str.IndexOf(srch, StringComparison.OrdinalIgnoreCase);
+            if (start > -1)
+            {
+                start += srch.Length;
+                int end = str.IndexOf(']', start);
+                return str.Substring(start, end - start);
+            }
+            return null;
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 48523d68e..0172a94f7 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -182,6 +182,7 @@
     <Compile Include="Library\EntityResolutionHelper.cs" />
     <Compile Include="Library\LibraryManager.cs" />
     <Compile Include="Library\MusicManager.cs" />
+    <Compile Include="Library\PathExtensions.cs" />
     <Compile Include="Library\Resolvers\BaseVideoResolver.cs" />
     <Compile Include="Library\Resolvers\PhotoAlbumResolver.cs" />
     <Compile Include="Library\Resolvers\PhotoResolver.cs" />