Merge pull request #2063 from MediaBrowser/dev

Dev
2025-07-09 03:04:24 -04:00 · 2016-08-16 01:54:40 -04:00 · 2016-08-16 01:54:40 -04:00 · 3e2d74539c
commit 3e2d74539c
parent f66a25db1c 14be817766
20 changed files with 163 additions and 77 deletions
--- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
@ -370,9 +370,9 @@ namespace MediaBrowser.Api.Playback.Progressive
                    outputHeaders[item.Key] = item.Value;
                }

-                Func<Stream, Task> streamWriter = stream => new ProgressiveFileCopier(FileSystem, job, Logger).StreamFile(outputPath, stream, CancellationToken.None);
+                var streamSource = new ProgressiveFileCopier(FileSystem, outputPath, outputHeaders, job, Logger, CancellationToken.None);

-                return ResultFactory.GetAsyncStreamWriter(streamWriter, outputHeaders);
+                return ResultFactory.GetAsyncStreamWriter(streamSource);
            }
            finally
            {
--- a/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
+++ b/MediaBrowser.Api/Playback/Progressive/ProgressiveStreamWriter.cs
@ -4,38 +4,55 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using CommonIO;
+using MediaBrowser.Controller.Net;
+using System.Collections.Generic;
+using ServiceStack.Web;

 namespace MediaBrowser.Api.Playback.Progressive
 {
-    public class ProgressiveFileCopier
+    public class ProgressiveFileCopier : IAsyncStreamSource, IHasOptions
    {
        private readonly IFileSystem _fileSystem;
        private readonly TranscodingJob _job;
        private readonly ILogger _logger;
+        private readonly string _path;
+        private readonly CancellationToken _cancellationToken;
+        private readonly Dictionary<string, string> _outputHeaders;

        // 256k
        private const int BufferSize = 81920;

        private long _bytesWritten = 0;

-        public ProgressiveFileCopier(IFileSystem fileSystem, TranscodingJob job, ILogger logger)
+        public ProgressiveFileCopier(IFileSystem fileSystem, string path, Dictionary<string, string> outputHeaders, TranscodingJob job, ILogger logger, CancellationToken cancellationToken)
        {
            _fileSystem = fileSystem;
+            _path = path;
+            _outputHeaders = outputHeaders;
            _job = job;
            _logger = logger;
+            _cancellationToken = cancellationToken;
        }

-        public async Task StreamFile(string path, Stream outputStream, CancellationToken cancellationToken)
+        public IDictionary<string, string> Options
+        {
+            get
+            {
+                return _outputHeaders;
+            }
+        }
+
+        public async Task WriteToAsync(Stream outputStream)
        {
            try
            {
                var eofCount = 0;

-                using (var fs = _fileSystem.GetFileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
+                using (var fs = _fileSystem.GetFileStream(_path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
                {
                    while (eofCount < 15)
                    {
-                        var bytesRead = await CopyToAsyncInternal(fs, outputStream, BufferSize, cancellationToken).ConfigureAwait(false);
+                        var bytesRead = await CopyToAsyncInternal(fs, outputStream, BufferSize, _cancellationToken).ConfigureAwait(false);

                        //var position = fs.Position;
                        //_logger.Debug("Streamed {0} bytes to position {1} from file {2}", bytesRead, position, path);
@ -46,7 +63,7 @@ namespace MediaBrowser.Api.Playback.Progressive
                            {
                                eofCount++;
                            }
-                            await Task.Delay(100, cancellationToken).ConfigureAwait(false);
+                            await Task.Delay(100, _cancellationToken).ConfigureAwait(false);
                        }
                        else
                        {
--- a/MediaBrowser.Api/Sync/SyncService.cs
+++ b/MediaBrowser.Api/Sync/SyncService.cs
@ -66,6 +66,7 @@ namespace MediaBrowser.Api.Sync
        public string Id { get; set; }
    }

+    [Route("/Sync/Items/Cancel", "POST", Summary = "Cancels items from a sync target")]
    [Route("/Sync/{TargetId}/Items", "DELETE", Summary = "Cancels items from a sync target")]
    public class CancelItems : IReturnVoid
    {
@ -211,7 +212,7 @@ namespace MediaBrowser.Api.Sync
            return ToOptimizedResult(result);
        }

-        public void Delete(CancelItems request)
+        public void Any(CancelItems request)
        {
            var itemIds = request.ItemIds.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);

--- a/MediaBrowser.Controller/Entities/AggregateFolder.cs
+++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs
@ -5,6 +5,8 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.Serialization;
+using System.Threading;
+using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Controller.Providers;

@ -84,7 +86,7 @@ namespace MediaBrowser.Controller.Entities
            }
        }

-        private void ResetCachedChildren()
+        private void ClearCache()
        {
            lock (_childIdsLock)
            {
@ -114,7 +116,7 @@ namespace MediaBrowser.Controller.Entities

        public override bool BeforeMetadataRefresh()
        {
-            ResetCachedChildren();
+            ClearCache();

            var changed = base.BeforeMetadataRefresh() || _requiresRefresh;
            _requiresRefresh = false;
@ -123,7 +125,7 @@ namespace MediaBrowser.Controller.Entities

        private ItemResolveArgs CreateResolveArgs(IDirectoryService directoryService, bool setPhysicalLocations)
        {
-            ResetCachedChildren();
+            ClearCache();

            var path = ContainingFolderPath;

@ -165,6 +167,21 @@ namespace MediaBrowser.Controller.Entities
            return args;
        }

+        protected override IEnumerable<BaseItem> GetNonCachedChildren(IDirectoryService directoryService)
+        {
+            return base.GetNonCachedChildren(directoryService).Concat(_virtualChildren);
+        }
+
+        protected override async Task ValidateChildrenInternal(IProgress<double> progress, CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService)
+        {
+            ClearCache();
+
+            await base.ValidateChildrenInternal(progress, cancellationToken, recursive, refreshChildMetadata, refreshOptions, directoryService)
+                .ConfigureAwait(false);
+
+            ClearCache();
+        }
+
        /// <summary>
        /// Adds the virtual child.
        /// </summary>
@ -180,15 +197,6 @@ namespace MediaBrowser.Controller.Entities
            _virtualChildren.Add(child);
        }

-        /// <summary>
-        /// Get the children of this folder from the actual file system
-        /// </summary>
-        /// <returns>IEnumerable{BaseItem}.</returns>
-        protected override IEnumerable<BaseItem> GetNonCachedChildren(IDirectoryService directoryService)
-        {
-            return base.GetNonCachedChildren(directoryService).Concat(_virtualChildren);
-        }
-
        /// <summary>
        /// Finds the virtual child.
        /// </summary>
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Entities
            }
        }

-        private void ResetCachedChildren()
+        private void ClearCache()
        {
            lock (_childIdsLock)
            {
@ -94,7 +94,7 @@ namespace MediaBrowser.Controller.Entities

        public override bool BeforeMetadataRefresh()
        {
-            ResetCachedChildren();
+            ClearCache();

            var hasChanges = base.BeforeMetadataRefresh();

@ -107,13 +107,22 @@ namespace MediaBrowser.Controller.Entities
            return hasChanges;
        }

+        protected override IEnumerable<BaseItem> GetNonCachedChildren(IDirectoryService directoryService)
+        {
+            ClearCache();
+
+            return base.GetNonCachedChildren(directoryService);
+        }
+
        protected override async Task ValidateChildrenInternal(IProgress<double> progress, CancellationToken cancellationToken, bool recursive, bool refreshChildMetadata, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService)
        {
-            ResetCachedChildren();
+            ClearCache();

            await base.ValidateChildrenInternal(progress, cancellationToken, recursive, refreshChildMetadata, refreshOptions, directoryService)
                .ConfigureAwait(false);

+            ClearCache();
+
            // Not the best way to handle this, but it solves an issue
            // CollectionFolders aren't always getting saved after changes
            // This means that grabbing the item by Id may end up returning the old one
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@ -236,6 +236,7 @@
    <Compile Include="Net\IAuthorizationContext.cs" />
    <Compile Include="Net\IAuthService.cs" />
    <Compile Include="Net\IHasAuthorization.cs" />
+    <Compile Include="Net\IAsyncStreamSource.cs" />
    <Compile Include="Net\IHasResultFactory.cs" />
    <Compile Include="Net\IHasSession.cs" />
    <Compile Include="Net\IHttpResultFactory.cs" />
--- a/MediaBrowser.Controller/Net/IAsyncStreamSource.cs
+++ b/MediaBrowser.Controller/Net/IAsyncStreamSource.cs
@ -0,0 +1,18 @@
+using ServiceStack.Web;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Controller.Net
+{
+    /// <summary>
+    /// Interface IAsyncStreamSource
+    /// Enables asynchronous writing to http resonse streams
+    /// </summary>
+    public interface IAsyncStreamSource
+    {
+        /// <summary>
+        /// Asynchronously write to the response stream.
+        /// </summary>
+        Task WriteToAsync(Stream responseStream);
+    }
+}
--- a/MediaBrowser.Controller/Net/IHttpResultFactory.cs
+++ b/MediaBrowser.Controller/Net/IHttpResultFactory.cs
@ -28,7 +28,7 @@ namespace MediaBrowser.Controller.Net
        /// <returns>System.Object.</returns>
        object GetResult(object content, string contentType, IDictionary<string,string> responseHeaders = null);

-        object GetAsyncStreamWriter(Func<Stream,Task> streamWriter, IDictionary<string, string> responseHeaders = null);
+        object GetAsyncStreamWriter(IAsyncStreamSource streamSource);

        /// <summary>
        /// Gets the optimized result.
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@ -570,7 +570,7 @@ namespace MediaBrowser.Model.Dlna
                    playlistItem.MaxAudioChannels = Math.Min(options.MaxAudioChannels.Value, currentValue);
                }

-                int audioBitrate = GetAudioBitrate(options.GetMaxBitrate(), playlistItem.TargetAudioChannels, playlistItem.TargetAudioCodec, audioStream);
+                int audioBitrate = GetAudioBitrate(playlistItem.SubProtocol, options.GetMaxBitrate(), playlistItem.TargetAudioChannels, playlistItem.TargetAudioCodec, audioStream);
                playlistItem.AudioBitrate = Math.Min(playlistItem.AudioBitrate ?? audioBitrate, audioBitrate);

                int? maxBitrateSetting = options.GetMaxBitrate();
@ -593,7 +593,7 @@ namespace MediaBrowser.Model.Dlna
            return playlistItem;
        }

-        private int GetAudioBitrate(int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream)
+        private int GetAudioBitrate(string subProtocol, int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream)
        {
            var defaultBitrate = 128000;
            if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
@ -611,7 +611,14 @@ namespace MediaBrowser.Model.Dlna
                {
                    if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
                    {
-                        defaultBitrate = Math.Max(448000, defaultBitrate);
+                        if (string.Equals(subProtocol, "hls", StringComparison.OrdinalIgnoreCase))
+                        {
+                            defaultBitrate = Math.Max(384000, defaultBitrate);
+                        }
+                        else
+                        {
+                            defaultBitrate = Math.Max(448000, defaultBitrate);
+                        }
                    }
                    else
                    {
--- a/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterFunc.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/AsyncStreamWriterFunc.cs
@ -4,38 +4,41 @@ using System.IO;
 using System.Threading.Tasks;
 using ServiceStack;
 using ServiceStack.Web;
+using MediaBrowser.Controller.Net;

 namespace MediaBrowser.Server.Implementations.HttpServer
 {
-    public class AsyncStreamWriterFunc : IStreamWriter, IAsyncStreamWriter, IHasOptions
+    public class AsyncStreamWriter : IStreamWriter, IAsyncStreamWriter, IHasOptions
    {
        /// <summary>
        /// Gets or sets the source stream.
        /// </summary>
        /// <value>The source stream.</value>
-        private Func<Stream, Task> Writer { get; set; }
-
-        /// <summary>
-        /// Gets the options.
-        /// </summary>
-        /// <value>The options.</value>
-        public IDictionary<string, string> Options { get; private set; }
+        private IAsyncStreamSource _source;

        public Action OnComplete { get; set; }
        public Action OnError { get; set; }

        /// <summary>
-        /// Initializes a new instance of the <see cref="StreamWriter" /> class.
+        /// Initializes a new instance of the <see cref="AsyncStreamWriter" /> class.
        /// </summary>
-        public AsyncStreamWriterFunc(Func<Stream, Task> writer, IDictionary<string, string> headers)
+        public AsyncStreamWriter(IAsyncStreamSource source)
        {
-            Writer = writer;
+            _source = source;
+        }

-            if (headers == null)
+        public IDictionary<string, string> Options
+        {
+            get
            {
-                headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+                var hasOptions = _source as IHasOptions;
+                if (hasOptions != null)
+                {
+                    return hasOptions.Options;
+                }
+
+                return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
            }
-            Options = headers;
        }

        /// <summary>
@ -44,13 +47,13 @@ namespace MediaBrowser.Server.Implementations.HttpServer
        /// <param name="responseStream">The response stream.</param>
        public void WriteTo(Stream responseStream)
        {
-            var task = Writer(responseStream);
+            var task = _source.WriteToAsync(responseStream);
            Task.WaitAll(task);
        }

        public async Task WriteToAsync(Stream responseStream)
        {
-            await Writer(responseStream).ConfigureAwait(false);
+            await _source.WriteToAsync(responseStream).ConfigureAwait(false);
        }
    }
 }
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/HttpResultFactory.cs
@ -704,9 +704,9 @@ namespace MediaBrowser.Server.Implementations.HttpServer
            throw error;
        }

-        public object GetAsyncStreamWriter(Func<Stream, Task> streamWriter, IDictionary<string, string> responseHeaders = null)
+        public object GetAsyncStreamWriter(IAsyncStreamSource streamSource)
        {
-            return new AsyncStreamWriterFunc(streamWriter, responseHeaders);
+            return new AsyncStreamWriter(streamSource);
        }
    }
 }
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@ -156,7 +156,7 @@
    <Compile Include="EntryPoints\ServerEventNotifier.cs" />
    <Compile Include="EntryPoints\UserDataChangeNotifier.cs" />
    <Compile Include="FileOrganization\OrganizerScheduledTask.cs" />
-    <Compile Include="HttpServer\AsyncStreamWriterFunc.cs" />
+    <Compile Include="HttpServer\AsyncStreamWriter.cs" />
    <Compile Include="HttpServer\IHttpListener.cs" />
    <Compile Include="HttpServer\Security\AuthorizationContext.cs" />
    <Compile Include="HttpServer\ContainerAdapter.cs" />
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@ -2152,7 +2152,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                {
                    if (query.User != null)
                    {
-                        query.SortBy = new[] { ItemSortBy.IsPlayed, "SimilarityScore", ItemSortBy.Random };
+                        query.SortBy = new[] { "SimilarityScore", ItemSortBy.Random };
                    }
                    else
                    {
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@ -639,6 +639,18 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\syncsettings.html">
      <Link>Resources\dashboard-ui\syncsettings.html</Link>
    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\touchicon.png">
+      <Link>Resources\dashboard-ui\touchicon.png</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\touchicon114.png">
+      <Link>Resources\dashboard-ui\touchicon114.png</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\touchicon144.png">
+      <Link>Resources\dashboard-ui\touchicon144.png</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\touchicon72.png">
+      <Link>Resources\dashboard-ui\touchicon72.png</Link>
+    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\tv.html">
      <Link>Resources\dashboard-ui\tv.html</Link>
    </BundleResource>
@ -1005,8 +1017,11 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\apiclient.js">
      <Link>Resources\dashboard-ui\bower_components\emby-apiclient\apiclient.js</Link>
    </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\appstorage.js">
-      <Link>Resources\dashboard-ui\bower_components\emby-apiclient\appstorage.js</Link>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\appstorage-localstorage.js">
+      <Link>Resources\dashboard-ui\bower_components\emby-apiclient\appstorage-localstorage.js</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\appstorage-memory.js">
+      <Link>Resources\dashboard-ui\bower_components\emby-apiclient\appstorage-memory.js</Link>
    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\bower.json">
      <Link>Resources\dashboard-ui\bower_components\emby-apiclient\bower.json</Link>
@ -1050,9 +1065,6 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-apiclient\sync\serversync.js">
      <Link>Resources\dashboard-ui\bower_components\emby-apiclient\sync\serversync.js</Link>
    </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-icons\emby-icons.html">
-      <Link>Resources\dashboard-ui\bower_components\emby-icons\emby-icons.html</Link>
-    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\.bower.json">
      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\.bower.json</Link>
    </BundleResource>
@ -1251,6 +1263,12 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\emby-slider\emby-slider.js">
      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\emby-slider\emby-slider.js</Link>
    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\emby-tabs\emby-tabs.css">
+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\emby-tabs\emby-tabs.css</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\emby-tabs\emby-tabs.js">
+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\emby-tabs\emby-tabs.js</Link>
+    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\emby-textarea\emby-textarea.css">
      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\emby-textarea\emby-textarea.css</Link>
    </BundleResource>
@ -3603,6 +3621,12 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\viewcontainer-lite.js">
      <Link>Resources\dashboard-ui\components\viewcontainer-lite.js</Link>
    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\appfooter\appfooter.css">
+      <Link>Resources\dashboard-ui\components\appfooter\appfooter.css</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\appfooter\appfooter.js">
+      <Link>Resources\dashboard-ui\components\appfooter\appfooter.js</Link>
+    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\channelmapper\channelmapper.js">
      <Link>Resources\dashboard-ui\components\channelmapper\channelmapper.js</Link>
    </BundleResource>
@ -3612,6 +3636,12 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\directorybrowser\directorybrowser.js">
      <Link>Resources\dashboard-ui\components\directorybrowser\directorybrowser.js</Link>
    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\dockedtabs\dockedtabs.css">
+      <Link>Resources\dashboard-ui\components\dockedtabs\dockedtabs.css</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\dockedtabs\dockedtabs.js">
+      <Link>Resources\dashboard-ui\components\dockedtabs\dockedtabs.js</Link>
+    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\fileorganizer\fileorganizer.js">
      <Link>Resources\dashboard-ui\components\fileorganizer\fileorganizer.js</Link>
    </BundleResource>
@ -3657,6 +3687,12 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\imageuploader\imageuploader.template.html">
      <Link>Resources\dashboard-ui\components\imageuploader\imageuploader.template.html</Link>
    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.js">
+      <Link>Resources\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.js</Link>
+    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.template.html">
+      <Link>Resources\dashboard-ui\components\libraryoptionseditor\libraryoptionseditor.template.html</Link>
+    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\components\medialibrarycreator\medialibrarycreator.js">
      <Link>Resources\dashboard-ui\components\medialibrarycreator\medialibrarycreator.js</Link>
    </BundleResource>
@ -3750,9 +3786,6 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\logo.png">
      <Link>Resources\dashboard-ui\css\images\logo.png</Link>
    </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\logo536.png">
-      <Link>Resources\dashboard-ui\css\images\logo536.png</Link>
-    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\mblogoicon.png">
      <Link>Resources\dashboard-ui\css\images\mblogoicon.png</Link>
    </BundleResource>
@ -3762,18 +3795,6 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\rotten.png">
      <Link>Resources\dashboard-ui\css\images\rotten.png</Link>
    </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\touchicon.png">
-      <Link>Resources\dashboard-ui\css\images\touchicon.png</Link>
-    </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\touchicon114.png">
-      <Link>Resources\dashboard-ui\css\images\touchicon114.png</Link>
-    </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\touchicon144.png">
-      <Link>Resources\dashboard-ui\css\images\touchicon144.png</Link>
-    </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\touchicon72.png">
-      <Link>Resources\dashboard-ui\css\images\touchicon72.png</Link>
-    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\userflyoutdefault.png">
      <Link>Resources\dashboard-ui\css\images\userflyoutdefault.png</Link>
    </BundleResource>
@ -4434,6 +4455,9 @@
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\ar.json">
      <Link>Resources\dashboard-ui\strings\ar.json</Link>
    </BundleResource>
+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\be-BY.json">
+      <Link>Resources\dashboard-ui\strings\be-BY.json</Link>
+    </BundleResource>
    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\strings\bg-BG.json">
      <Link>Resources\dashboard-ui\strings\bg-BG.json</Link>
    </BundleResource>
--- a/MediaBrowser.ServerApplication/App.config
+++ b/MediaBrowser.ServerApplication/App.config
@ -17,7 +17,7 @@
    <add key="ClientSettingsProvider.ServiceUri" value=""/>
  </appSettings>
  <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
  </startup>
  <runtime>
    <gcAllowVeryLargeObjects enabled="true"/>
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@ -9,7 +9,7 @@
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>MediaBrowser.ServerApplication</RootNamespace>
    <AssemblyName>MediaBrowser.ServerApplication</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    <TargetFrameworkProfile />
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@ -17,7 +17,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using CommonIO;
-using WebMarkupMin.Core.Minifiers;
+using WebMarkupMin.Core;

 namespace MediaBrowser.WebDashboard.Api
 {
--- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs
+++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs
@ -11,8 +11,6 @@ using System.Threading.Tasks;
 using CommonIO;
 using MediaBrowser.Controller.Net;
 using WebMarkupMin.Core;
-using WebMarkupMin.Core.Minifiers;
-using WebMarkupMin.Core.Settings;

 namespace MediaBrowser.WebDashboard.Api
 {
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@ -63,9 +63,9 @@
    <Reference Include="ServiceStack.Interfaces">
      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath>
    </Reference>
-    <Reference Include="WebMarkupMin.Core, Version=1.0.1.0, Culture=neutral, PublicKeyToken=99472178d266584b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\WebMarkupMin.Core.1.0.1\lib\net40\WebMarkupMin.Core.dll</HintPath>
+    <Reference Include="WebMarkupMin.Core, Version=2.1.0.0, Culture=neutral, PublicKeyToken=99472178d266584b, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebMarkupMin.Core.2.1.0\lib\net40-client\WebMarkupMin.Core.dll</HintPath>
+      <Private>True</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@ -2,5 +2,5 @@
 <packages>
  <package id="CommonIO" version="1.0.0.9" targetFramework="net45" />
  <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
-  <package id="WebMarkupMin.Core" version="1.0.1" targetFramework="net45" />
+  <package id="WebMarkupMin.Core" version="2.1.0" targetFramework="net45" />
 </packages>