From 9f5101dee2641f99a7a4945475ebb0aa49fb1913 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 29 Mar 2014 14:20:42 -0400
Subject: add shuffle and instant mix commands

---
 .../Session/SessionManager.cs                      | 45 ++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Session/SessionManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 9d405a175..4f748a6a8 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -3,6 +3,8 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Session;
@@ -564,7 +566,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
             return playedToCompletion;
         }
-        
+
         /// <summary>
         /// Updates playstate position for an item but does not save
         /// </summary>
@@ -666,7 +668,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
             var controllingSession = GetSession(controllingSessionId);
             AssertCanControl(session, controllingSession);
-            
+
             return session.SessionController.SendSystemCommand(command, cancellationToken);
         }
 
@@ -676,7 +678,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
             var controllingSession = GetSession(controllingSessionId);
             AssertCanControl(session, controllingSession);
-            
+
             return session.SessionController.SendMessageCommand(command, cancellationToken);
         }
 
@@ -684,14 +686,22 @@ namespace MediaBrowser.Server.Implementations.Session
         {
             var session = GetSessionForRemoteControl(sessionId);
 
-            var items = command.ItemIds.Select(i => _libraryManager.GetItemById(new Guid(i)))
+            var user = session.UserId.HasValue ? _userManager.GetUserById(session.UserId.Value) : null;
+
+            var items = command.ItemIds.SelectMany(i => TranslateItemForPlayback(i, user))
                 .Where(i => i.LocationType != LocationType.Virtual)
                 .ToList();
 
-            if (session.UserId.HasValue)
+            if (command.PlayCommand == PlayCommand.PlayShuffle)
             {
-                var user = _userManager.GetUserById(session.UserId.Value);
+                items = items.OrderBy(i => Guid.NewGuid()).ToList();
+                command.PlayCommand = PlayCommand.PlayNow;
+            }
+
+            command.ItemIds = items.Select(i => i.Id.ToString("N")).ToArray();
 
+            if (user != null)
+            {
                 if (items.Any(i => i.GetPlayAccess(user) != PlayAccess.Full))
                 {
                     throw new ArgumentException(string.Format("{0} is not allowed to play media.", user.Name));
@@ -723,13 +733,34 @@ namespace MediaBrowser.Server.Implementations.Session
             return session.SessionController.SendPlayCommand(command, cancellationToken);
         }
 
+        private IEnumerable<BaseItem> TranslateItemForPlayback(string id, User user)
+        {
+            var item = _libraryManager.GetItemById(new Guid(id));
+
+            if (item.IsFolder)
+            {
+                var folder = (Folder)item;
+
+                var items = user == null ? folder.RecursiveChildren:
+                    folder.GetRecursiveChildren(user);
+
+                items = items.Where(i => !i.IsFolder);
+
+                items = items.OrderBy(i => i.SortName);
+
+                return items;
+            }
+
+            return new[] { item };
+        }
+
         public Task SendBrowseCommand(Guid controllingSessionId, Guid sessionId, BrowseRequest command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
             var controllingSession = GetSession(controllingSessionId);
             AssertCanControl(session, controllingSession);
-            
+
             return session.SessionController.SendBrowseCommand(command, cancellationToken);
         }
 
-- 
cgit v1.2.3


From f756e39b9d5b461e6bcaa4e71006038983d28213 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 30 Mar 2014 12:49:40 -0400
Subject: restored live tv playback in the web client

---
 MediaBrowser.Api/MediaBrowser.Api.csproj           |   1 +
 MediaBrowser.Api/Music/InstantMixService.cs        |  75 ++---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |  50 +---
 .../Playback/ProgressiveStreamService.cs           |  73 +++++
 MediaBrowser.Api/Playback/StreamRequest.cs         |   5 -
 MediaBrowser.Api/Playback/StreamState.cs           |   2 -
 MediaBrowser.Controller/Dto/IDtoService.cs         |   7 +
 MediaBrowser.Controller/Library/IMusicManager.cs   |  38 +++
 MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs |   4 +-
 .../MediaBrowser.Controller.csproj                 |   4 +
 .../MediaEncoding/EncodingOptions.cs               |  79 +++++
 .../MediaEncoding/EncodingResult.cs                |  13 +
 .../MediaEncoding/VideoEncodingOptions.cs          |  26 ++
 MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs |  91 ++++++
 .../Encoder/EncodingUtils.cs                       | 233 +++++++++++++++
 .../Encoder/FFMpegProcess.cs                       | 168 +++++++++++
 .../Encoder/InternalEncodingTask.cs                |  95 ++++++
 .../Encoder/InternalEncodingTaskFactory.cs         | 323 +++++++++++++++++++++
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  64 +---
 .../MediaBrowser.MediaEncoding.csproj              |   5 +
 MediaBrowser.Model/LiveTv/ChannelInfoDto.cs        |   3 +
 MediaBrowser.Model/LiveTv/RecordingInfoDto.cs      |  11 +-
 .../Dto/DtoService.cs                              |  48 ++-
 .../Library/MusicManager.cs                        |  67 +++++
 .../Library/Resolvers/Audio/AudioResolver.cs       |   3 +-
 .../LiveTv/LiveTvDtoService.cs                     |  11 +-
 .../MediaBrowser.Server.Implementations.csproj     |   1 +
 .../Session/SessionManager.cs                      |  59 +++-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |   2 +
 MediaBrowser.WebDashboard/ApiClient.js             |   2 +-
 MediaBrowser.WebDashboard/packages.config          |   2 +-
 31 files changed, 1373 insertions(+), 192 deletions(-)
 create mode 100644 MediaBrowser.Api/Playback/ProgressiveStreamService.cs
 create mode 100644 MediaBrowser.Controller/Library/IMusicManager.cs
 create mode 100644 MediaBrowser.Controller/MediaEncoding/EncodingOptions.cs
 create mode 100644 MediaBrowser.Controller/MediaEncoding/EncodingResult.cs
 create mode 100644 MediaBrowser.Controller/MediaEncoding/VideoEncodingOptions.cs
 create mode 100644 MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
 create mode 100644 MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
 create mode 100644 MediaBrowser.MediaEncoding/Encoder/FFMpegProcess.cs
 create mode 100644 MediaBrowser.MediaEncoding/Encoder/InternalEncodingTask.cs
 create mode 100644 MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs
 create mode 100644 MediaBrowser.Server.Implementations/Library/MusicManager.cs

(limited to 'MediaBrowser.Server.Implementations/Session/SessionManager.cs')

diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 18559a68d..c03eddf99 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -103,6 +103,7 @@
     <Compile Include="Playback\Hls\DynamicHlsService.cs" />
     <Compile Include="Playback\Hls\HlsSegmentService.cs" />
     <Compile Include="Playback\Hls\VideoHlsService.cs" />
+    <Compile Include="Playback\ProgressiveStreamService.cs" />
     <Compile Include="Playback\Progressive\AudioService.cs" />
     <Compile Include="Playback\Progressive\BaseProgressiveStreamingService.cs" />
     <Compile Include="Playback\BaseStreamingService.cs" />
diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index 9b9df3a92..c39811bb6 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -1,9 +1,9 @@
 using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Querying;
 using ServiceStack;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -36,103 +36,74 @@ namespace MediaBrowser.Api.Music
     public class InstantMixService : BaseApiService
     {
         private readonly IUserManager _userManager;
-        private readonly ILibraryManager _libraryManager;
 
         private readonly IDtoService _dtoService;
+        private readonly IMusicManager _musicManager;
 
-        public InstantMixService(IUserManager userManager, ILibraryManager libraryManager, IDtoService dtoService)
+        public InstantMixService(IUserManager userManager, IDtoService dtoService, IMusicManager musicManager)
         {
             _userManager = userManager;
-            _libraryManager = libraryManager;
             _dtoService = dtoService;
+            _musicManager = musicManager;
         }
 
         public object Get(GetInstantMixFromSong request)
         {
-            var item = _dtoService.GetItemByDtoId(request.Id);
+            var item = (Audio)_dtoService.GetItemByDtoId(request.Id);
 
-            var result = GetInstantMixResult(request, item.Genres);
+            var user = _userManager.GetUserById(request.UserId.Value);
 
-            return ToOptimizedSerializedResultUsingCache(result);
+            var items = _musicManager.GetInstantMixFromSong(item, user);
+
+            return GetResult(items, user, request);
         }
 
         public object Get(GetInstantMixFromAlbum request)
         {
             var album = (MusicAlbum)_dtoService.GetItemByDtoId(request.Id);
 
-            var genres = album
-               .RecursiveChildren
-               .OfType<Audio>()
-               .SelectMany(i => i.Genres)
-               .Concat(album.Genres)
-               .Distinct(StringComparer.OrdinalIgnoreCase);
+            var user = _userManager.GetUserById(request.UserId.Value);
 
-            var result = GetInstantMixResult(request, genres);
+            var items = _musicManager.GetInstantMixFromAlbum(album, user);
 
-            return ToOptimizedSerializedResultUsingCache(result);
+            return GetResult(items, user, request);
         }
 
         public object Get(GetInstantMixFromMusicGenre request)
         {
-            var genre = GetMusicGenre(request.Name, _libraryManager);
+            var user = _userManager.GetUserById(request.UserId.Value);
 
-            var result = GetInstantMixResult(request, new[] { genre.Name });
+            var items = _musicManager.GetInstantMixFromGenres(new[] { request.Name }, user);
 
-            return ToOptimizedSerializedResultUsingCache(result);
+            return GetResult(items, user, request);
         }
 
         public object Get(GetInstantMixFromArtist request)
         {
-            var artist = GetArtist(request.Name, _libraryManager);
-
-            var genres = _libraryManager.RootFolder
-                .RecursiveChildren
-                .OfType<Audio>()
-                .Where(i => i.HasArtist(artist.Name))
-                .SelectMany(i => i.Genres)
-                .Concat(artist.Genres)
-                .Distinct(StringComparer.OrdinalIgnoreCase);
+            var user = _userManager.GetUserById(request.UserId.Value);
 
-            var result = GetInstantMixResult(request, genres);
+            var items = _musicManager.GetInstantMixFromArtist(request.Name, user);
 
-            return ToOptimizedSerializedResultUsingCache(result);
+            return GetResult(items, user, request);
         }
 
-        private ItemsResult GetInstantMixResult(BaseGetSimilarItems request, IEnumerable<string> genres)
+        private object GetResult(IEnumerable<Audio> items, User user, BaseGetSimilarItems request)
         {
-            var user = request.UserId.HasValue ? _userManager.GetUserById(request.UserId.Value) : null;
-
             var fields = request.GetItemFields().ToList();
 
-            var inputItems = user == null
-                                 ? _libraryManager.RootFolder.RecursiveChildren
-                                 : user.RootFolder.GetRecursiveChildren(user);
-
-            var genresDictionary = genres.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
-
-            var limit = request.Limit.HasValue ? request.Limit.Value * 2 : 100;
-
-            var items = inputItems
-                .OfType<Audio>()
-                .Select(i => new Tuple<Audio, int>(i, i.Genres.Count(genresDictionary.ContainsKey)))
-                .OrderByDescending(i => i.Item2)
-                .ThenBy(i => Guid.NewGuid())
-                .Select(i => i.Item1)
-                .Take(limit)
-                .OrderBy(i => Guid.NewGuid())
-                .ToList();
+            var list = items.ToList();
 
             var result = new ItemsResult
             {
-                TotalRecordCount = items.Count
+                TotalRecordCount = list.Count
             };
 
-            var dtos = items.Take(request.Limit ?? items.Count)
+            var dtos = list.Take(request.Limit ?? list.Count)
                 .Select(i => _dtoService.GetBaseItemDto(i, fields, user));
 
             result.Items = dtos.ToArray();
 
-            return result;
+            return ToOptimizedResult(result);
         }
 
     }
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 519ff7947..9b126420a 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -835,11 +835,6 @@ namespace MediaBrowser.Api.Playback
         /// <returns>System.String.</returns>
         protected string GetInputArgument(StreamState state)
         {
-            if (state.SendInputOverStandardInput)
-            {
-                return "-";
-            }
-
             var type = InputType.File;
 
             var inputPath = new[] { state.MediaPath };
@@ -898,9 +893,7 @@ namespace MediaBrowser.Api.Playback
                     Arguments = commandLineArgs,
 
                     WindowStyle = ProcessWindowStyle.Hidden,
-                    ErrorDialog = false,
-
-                    RedirectStandardInput = state.SendInputOverStandardInput
+                    ErrorDialog = false
                 },
 
                 EnableRaisingEvents = true
@@ -933,11 +926,6 @@ namespace MediaBrowser.Api.Playback
                 throw;
             }
 
-            if (state.SendInputOverStandardInput)
-            {
-                StreamToStandardInput(process, state);
-            }
-
             // MUST read both stdout and stderr asynchronously or a deadlock may occurr
             process.BeginOutputReadLine();
 
@@ -965,32 +953,6 @@ namespace MediaBrowser.Api.Playback
             }
         }
 
-        private async void StreamToStandardInput(Process process, StreamState state)
-        {
-            try
-            {
-                await StreamToStandardInputInternal(process, state).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException)
-            {
-                Logger.Debug("Stream to standard input closed normally.");
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error writing to standard input", ex);
-            }
-        }
-
-        private async Task StreamToStandardInputInternal(Process process, StreamState state)
-        {
-            state.StandardInputCancellationTokenSource = new CancellationTokenSource();
-
-            using (var fileStream = FileSystem.GetFileStream(state.MediaPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
-            {
-                await new EndlessStreamCopy().CopyStream(fileStream, process.StandardInput.BaseStream, state.StandardInputCancellationTokenSource.Token).ConfigureAwait(false);
-            }
-        }
-
         protected int? GetVideoBitrateParamValue(StreamState state)
         {
             var bitrate = state.VideoRequest.VideoBitRate;
@@ -1315,11 +1277,6 @@ namespace MediaBrowser.Api.Playback
                 ParseParams(request);
             }
 
-            if (request.ThrowDebugError)
-            {
-                throw new InvalidOperationException("You asked for a debug error, you got one.");
-            }
-
             var user = AuthorizationRequestFilterAttribute.GetCurrentUser(Request, UserManager);
 
             var url = Request.PathInfo;
@@ -1369,8 +1326,6 @@ namespace MediaBrowser.Api.Playback
                 {
                     state.MediaPath = path;
                     state.IsRemote = false;
-
-                    state.SendInputOverStandardInput = recording.RecordingInfo.Status == RecordingStatus.InProgress;
                 }
                 else if (!string.IsNullOrEmpty(mediaUrl))
                 {
@@ -1378,7 +1333,8 @@ namespace MediaBrowser.Api.Playback
                     state.IsRemote = true;
                 }
 
-                //state.RunTimeTicks = recording.RunTimeTicks;
+                state.RunTimeTicks = recording.RunTimeTicks;
+
                 if (recording.RecordingInfo.Status == RecordingStatus.InProgress && !state.IsRemote)
                 {
                     await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
diff --git a/MediaBrowser.Api/Playback/ProgressiveStreamService.cs b/MediaBrowser.Api/Playback/ProgressiveStreamService.cs
new file mode 100644
index 000000000..531f79a22
--- /dev/null
+++ b/MediaBrowser.Api/Playback/ProgressiveStreamService.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Api.Playback.Progressive;
+
+namespace MediaBrowser.Api.Playback
+{
+    //public class GetProgressiveAudioStream : StreamRequest
+    //{
+
+    //}
+    
+    //public class ProgressiveStreamService : BaseApiService
+    //{
+    //    public object Get(GetProgressiveAudioStream request)
+    //    {
+    //        return ProcessRequest(request, false);
+    //    }
+
+    //    /// <summary>
+    //    /// Gets the specified request.
+    //    /// </summary>
+    //    /// <param name="request">The request.</param>
+    //    /// <returns>System.Object.</returns>
+    //    public object Head(GetProgressiveAudioStream request)
+    //    {
+    //        return ProcessRequest(request, true);
+    //    }
+
+    //    protected object ProcessRequest(StreamRequest request, bool isHeadRequest)
+    //    {
+    //        var state = GetState(request, CancellationToken.None).Result;
+
+    //        var responseHeaders = new Dictionary<string, string>();
+
+    //        if (request.Static && state.IsRemote)
+    //        {
+    //            AddDlnaHeaders(state, responseHeaders, true);
+
+    //            return GetStaticRemoteStreamResult(state.MediaPath, responseHeaders, isHeadRequest).Result;
+    //        }
+
+    //        var outputPath = GetOutputFilePath(state);
+    //        var outputPathExists = File.Exists(outputPath);
+
+    //        var isStatic = request.Static ||
+    //                       (outputPathExists && !ApiEntryPoint.Instance.HasActiveTranscodingJob(outputPath, TranscodingJobType.Progressive));
+
+    //        AddDlnaHeaders(state, responseHeaders, isStatic);
+
+    //        if (request.Static)
+    //        {
+    //            var contentType = state.GetMimeType(state.MediaPath);
+
+    //            return ResultFactory.GetStaticFileResult(Request, state.MediaPath, contentType, FileShare.Read, responseHeaders, isHeadRequest);
+    //        }
+
+    //        if (outputPathExists && !ApiEntryPoint.Instance.HasActiveTranscodingJob(outputPath, TranscodingJobType.Progressive))
+    //        {
+    //            var contentType = state.GetMimeType(outputPath);
+
+    //            return ResultFactory.GetStaticFileResult(Request, outputPath, contentType, FileShare.Read, responseHeaders, isHeadRequest);
+    //        }
+
+    //        return GetStreamResult(state, responseHeaders, isHeadRequest).Result;
+    //    }
+
+    //}
+}
diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs
index 0eb2984fb..add517b5d 100644
--- a/MediaBrowser.Api/Playback/StreamRequest.cs
+++ b/MediaBrowser.Api/Playback/StreamRequest.cs
@@ -67,11 +67,6 @@ namespace MediaBrowser.Api.Playback
 
         [ApiMember(Name = "DeviceProfileId", Description = "Optional. The dlna device profile id to utilize.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
         public string DeviceProfileId { get; set; }
-        
-        /// <summary>
-        /// For testing purposes
-        /// </summary>
-        public bool ThrowDebugError { get; set; }
 
         public string Params { get; set; }
     }
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index 504d7d921..48285a4b1 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -51,8 +51,6 @@ namespace MediaBrowser.Api.Playback
 
         public bool HasMediaStreams { get; set; }
 
-        public bool SendInputOverStandardInput { get; set; }
-
         public CancellationTokenSource StandardInputCancellationTokenSource { get; set; }
 
         public string LiveTvStreamId { get; set; }
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index a02851a9f..2704959e4 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -85,6 +85,13 @@ namespace MediaBrowser.Controller.Dto
         /// <returns>ChapterInfoDto.</returns>
         ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item);
 
+        /// <summary>
+        /// Gets the media sources.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns>List{MediaSourceInfo}.</returns>
+        List<MediaSourceInfo> GetMediaSources(BaseItem item);
+
         /// <summary>
         /// Gets the item by name dto.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/IMusicManager.cs b/MediaBrowser.Controller/Library/IMusicManager.cs
new file mode 100644
index 000000000..192ce2e83
--- /dev/null
+++ b/MediaBrowser.Controller/Library/IMusicManager.cs
@@ -0,0 +1,38 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Library
+{
+    public interface IMusicManager
+    {
+        /// <summary>
+        /// Gets the instant mix from song.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Audio}.</returns>
+        IEnumerable<Audio> GetInstantMixFromSong(Audio item, User user);
+        /// <summary>
+        /// Gets the instant mix from artist.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Audio}.</returns>
+        IEnumerable<Audio> GetInstantMixFromArtist(string name, User user);
+        /// <summary>
+        /// Gets the instant mix from album.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Audio}.</returns>
+        IEnumerable<Audio> GetInstantMixFromAlbum(MusicAlbum item, User user);
+        /// <summary>
+        /// Gets the instant mix from genre.
+        /// </summary>
+        /// <param name="genres">The genres.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{Audio}.</returns>
+        IEnumerable<Audio> GetInstantMixFromGenres(IEnumerable<string> genres, User user);
+    }
+}
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
index edf86cae8..f8cdc6eee 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs
@@ -1,8 +1,8 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Library;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Library;
 
 namespace MediaBrowser.Controller.LiveTv
 {
@@ -14,6 +14,8 @@ namespace MediaBrowser.Controller.LiveTv
 
         RecordingInfo RecordingInfo { get; set; }
 
+        long? RunTimeTicks { get; set; }
+
         string GetClientTypeName();
 
         string GetUserDataKey();
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 9915ac044..16834a945 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -134,6 +134,7 @@
     <Compile Include="Library\DeleteOptions.cs" />
     <Compile Include="Library\ILibraryPostScanTask.cs" />
     <Compile Include="Library\IMetadataSaver.cs" />
+    <Compile Include="Library\IMusicManager.cs" />
     <Compile Include="Library\ItemUpdateType.cs" />
     <Compile Include="Library\IUserDataManager.cs" />
     <Compile Include="Library\UserDataSaveEventArgs.cs" />
@@ -155,11 +156,14 @@
     <Compile Include="LiveTv\SeriesTimerInfo.cs" />
     <Compile Include="LiveTv\TimerInfo.cs" />
     <Compile Include="Localization\ILocalizationManager.cs" />
+    <Compile Include="MediaEncoding\EncodingOptions.cs" />
     <Compile Include="MediaEncoding\ChapterImageRefreshOptions.cs" />
+    <Compile Include="MediaEncoding\EncodingResult.cs" />
     <Compile Include="MediaEncoding\IEncodingManager.cs" />
     <Compile Include="MediaEncoding\ImageEncodingOptions.cs" />
     <Compile Include="MediaEncoding\IMediaEncoder.cs" />
     <Compile Include="MediaEncoding\InternalMediaInfoResult.cs" />
+    <Compile Include="MediaEncoding\VideoEncodingOptions.cs" />
     <Compile Include="Net\IHasResultFactory.cs" />
     <Compile Include="Net\IHttpResultFactory.cs" />
     <Compile Include="Net\IHttpServer.cs" />
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingOptions.cs
new file mode 100644
index 000000000..74235becd
--- /dev/null
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingOptions.cs
@@ -0,0 +1,79 @@
+using MediaBrowser.Controller.Dlna;
+
+namespace MediaBrowser.Controller.MediaEncoding
+{
+    public class EncodingOptions
+    {
+        /// <summary>
+        /// Gets or sets the item identifier.
+        /// </summary>
+        /// <value>The item identifier.</value>
+        public string ItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media source identifier.
+        /// </summary>
+        /// <value>The media source identifier.</value>
+        public string MediaSourceId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the device profile.
+        /// </summary>
+        /// <value>The device profile.</value>
+        public DeviceProfile DeviceProfile { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the output path.
+        /// </summary>
+        /// <value>The output path.</value>
+        public string OutputPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the container.
+        /// </summary>
+        /// <value>The container.</value>
+        public string Container { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the audio codec.
+        /// </summary>
+        /// <value>The audio codec.</value>
+        public string AudioCodec { get; set; }
+        
+        /// <summary>
+        /// Gets or sets the start time ticks.
+        /// </summary>
+        /// <value>The start time ticks.</value>
+        public long? StartTimeTicks { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum channels.
+        /// </summary>
+        /// <value>The maximum channels.</value>
+        public int? MaxAudioChannels { get; set; }
+
+        /// <summary>
+        /// Gets or sets the channels.
+        /// </summary>
+        /// <value>The channels.</value>
+        public int? AudioChannels { get; set; }
+
+        /// <summary>
+        /// Gets or sets the sample rate.
+        /// </summary>
+        /// <value>The sample rate.</value>
+        public int? AudioSampleRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the bit rate.
+        /// </summary>
+        /// <value>The bit rate.</value>
+        public int? AudioBitRate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum audio bit rate.
+        /// </summary>
+        /// <value>The maximum audio bit rate.</value>
+        public int? MaxAudioBitRate { get; set; }
+    }
+}
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingResult.cs b/MediaBrowser.Controller/MediaEncoding/EncodingResult.cs
new file mode 100644
index 000000000..75ee90e42
--- /dev/null
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingResult.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Controller.MediaEncoding
+{
+    public class EncodingResult
+    {
+        public string OutputPath { get; set; }
+    }
+}
diff --git a/MediaBrowser.Controller/MediaEncoding/VideoEncodingOptions.cs b/MediaBrowser.Controller/MediaEncoding/VideoEncodingOptions.cs
new file mode 100644
index 000000000..773f0ea46
--- /dev/null
+++ b/MediaBrowser.Controller/MediaEncoding/VideoEncodingOptions.cs
@@ -0,0 +1,26 @@
+
+namespace MediaBrowser.Controller.MediaEncoding
+{
+    public class VideoEncodingOptions : EncodingOptions
+    {
+        public string VideoCodec { get; set; }
+
+        public string VideoProfile { get; set; }
+
+        public double? VideoLevel { get; set; }
+        
+        public int? VideoStreamIndex { get; set; }
+
+        public int? AudioStreamIndex { get; set; }
+
+        public int? SubtitleStreamIndex { get; set; }
+
+        public int? MaxWidth { get; set; }
+
+        public int? MaxHeight { get; set; }
+
+        public int? Height { get; set; }
+
+        public int? Width { get; set; }
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
new file mode 100644
index 000000000..08b7fbe49
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Encoder/AudioEncoder.cs
@@ -0,0 +1,91 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class AudioEncoder
+    {
+        private readonly string _ffmpegPath;
+        private readonly ILogger _logger;
+        private readonly IFileSystem _fileSystem;
+        private readonly IApplicationPaths _appPaths;
+        private readonly IIsoManager _isoManager;
+        private readonly ILiveTvManager _liveTvManager;
+
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
+        public AudioEncoder(string ffmpegPath, ILogger logger, IFileSystem fileSystem, IApplicationPaths appPaths, IIsoManager isoManager, ILiveTvManager liveTvManager)
+        {
+            _ffmpegPath = ffmpegPath;
+            _logger = logger;
+            _fileSystem = fileSystem;
+            _appPaths = appPaths;
+            _isoManager = isoManager;
+            _liveTvManager = liveTvManager;
+        }
+
+        public Task BeginEncoding(InternalEncodingTask task)
+        {
+            return new FFMpegProcess(_ffmpegPath, _logger, _fileSystem, _appPaths, _isoManager, _liveTvManager).Start(task, GetArguments);
+        }
+
+        private string GetArguments(InternalEncodingTask task, string mountedPath)
+        {
+            var options = task.Request;
+
+            return string.Format("{0} -i {1} {2} -id3v2_version 3 -write_id3v1 1 \"{3}\"",
+                GetInputModifier(task),
+                GetInputArgument(task),
+                GetOutputModifier(task),
+                options.OutputPath).Trim();
+        }
+
+        private string GetInputModifier(InternalEncodingTask task)
+        {
+            return EncodingUtils.GetInputModifier(task);
+        }
+
+        private string GetInputArgument(InternalEncodingTask task)
+        {
+            return EncodingUtils.GetInputArgument(new List<string> { task.MediaPath }, task.IsInputRemote);
+        }
+
+        private string GetOutputModifier(InternalEncodingTask task)
+        {
+            var options = task.Request;
+
+            var audioTranscodeParams = new List<string>
+            {
+                "-threads " + EncodingUtils.GetNumberOfThreads(task, false).ToString(_usCulture),
+                "-vn"
+            };
+
+            var bitrate = EncodingUtils.GetAudioBitrateParam(task);
+
+            if (bitrate.HasValue)
+            {
+                audioTranscodeParams.Add("-ab " + bitrate.Value.ToString(_usCulture));
+            }
+
+            var channels = EncodingUtils.GetNumAudioChannelsParam(options, task.AudioStream);
+
+            if (channels.HasValue)
+            {
+                audioTranscodeParams.Add("-ac " + channels.Value);
+            }
+
+            if (options.AudioSampleRate.HasValue)
+            {
+                audioTranscodeParams.Add("-ar " + options.AudioSampleRate.Value);
+            }
+
+            return string.Join(" ", audioTranscodeParams.ToArray());
+        }
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
new file mode 100644
index 000000000..79d512dc1
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
@@ -0,0 +1,233 @@
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public static class EncodingUtils
+    {
+        private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+        
+        public static string GetInputArgument(List<string> inputFiles, bool isRemote)
+        {
+            if (isRemote)
+            {
+                return GetHttpInputArgument(inputFiles);
+            }
+
+            return GetConcatInputArgument(inputFiles);
+        }
+
+        /// <summary>
+        /// Gets the concat input argument.
+        /// </summary>
+        /// <param name="inputFiles">The input files.</param>
+        /// <returns>System.String.</returns>
+        private static string GetConcatInputArgument(List<string> inputFiles)
+        {
+            // Get all streams
+            // If there's more than one we'll need to use the concat command
+            if (inputFiles.Count > 1)
+            {
+                var files = string.Join("|", inputFiles);
+
+                return string.Format("concat:\"{0}\"", files);
+            }
+
+            // Determine the input path for video files
+            return GetFileInputArgument(inputFiles[0]);
+        }
+
+        /// <summary>
+        /// Gets the file input argument.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>System.String.</returns>
+        private static string GetFileInputArgument(string path)
+        {
+            return string.Format("file:\"{0}\"", path);
+        }
+
+        /// <summary>
+        /// Gets the HTTP input argument.
+        /// </summary>
+        /// <param name="inputFiles">The input files.</param>
+        /// <returns>System.String.</returns>
+        private static string GetHttpInputArgument(IEnumerable<string> inputFiles)
+        {
+            var url = inputFiles.First();
+
+            return string.Format("\"{0}\"", url);
+        }
+
+        public static string GetAudioInputModifier(InternalEncodingTask options)
+        {
+            return GetCommonInputModifier(options);
+        }
+
+        public static string GetInputModifier(InternalEncodingTask options)
+        {
+            var inputModifier = GetCommonInputModifier(options);
+
+            //if (state.VideoRequest != null)
+            //{
+            //    inputModifier += " -fflags genpts";
+            //}
+
+            //if (!string.IsNullOrEmpty(state.InputVideoCodec))
+            //{
+            //    inputModifier += " -vcodec " + state.InputVideoCodec;
+            //}
+
+            //if (!string.IsNullOrEmpty(state.InputVideoSync))
+            //{
+            //    inputModifier += " -vsync " + state.InputVideoSync;
+            //}
+
+            return inputModifier;
+        }
+
+        private static string GetCommonInputModifier(InternalEncodingTask options)
+        {
+            var inputModifier = string.Empty;
+
+            if (options.EnableDebugLogging)
+            {
+                inputModifier += "-loglevel debug";
+            }
+
+            var probeSize = GetProbeSizeArgument(options.InputVideoType.HasValue && options.InputVideoType.Value == VideoType.Dvd);
+            inputModifier += " " + probeSize;
+            inputModifier = inputModifier.Trim();
+
+            if (!string.IsNullOrWhiteSpace(options.UserAgent))
+            {
+                inputModifier += " -user-agent \"" + options.UserAgent + "\"";
+            }
+
+            inputModifier += " " + GetFastSeekValue(options.Request);
+            inputModifier = inputModifier.Trim();
+
+            if (!string.IsNullOrEmpty(options.InputFormat))
+            {
+                inputModifier += " -f " + options.InputFormat;
+            }
+
+            if (!string.IsNullOrEmpty(options.InputAudioCodec))
+            {
+                inputModifier += " -acodec " + options.InputAudioCodec;
+            }
+
+            if (!string.IsNullOrEmpty(options.InputAudioSync))
+            {
+                inputModifier += " -async " + options.InputAudioSync;
+            }
+
+            if (options.ReadInputAtNativeFramerate)
+            {
+                inputModifier += " -re";
+            }
+
+            return inputModifier;
+        }
+
+        private static string GetFastSeekValue(EncodingOptions options)
+        {
+            var time = options.StartTimeTicks;
+
+            if (time.HasValue)
+            {
+                var seconds = TimeSpan.FromTicks(time.Value).TotalSeconds;
+
+                if (seconds > 0)
+                {
+                    return string.Format("-ss {0}", seconds.ToString(UsCulture));
+                }
+            }
+
+            return string.Empty;
+        }
+
+        public static string GetProbeSizeArgument(bool isDvd)
+        {
+            return isDvd ? "-probesize 1G -analyzeduration 200M" : string.Empty;
+        }
+
+        public static int? GetAudioBitrateParam(InternalEncodingTask task)
+        {
+            if (task.Request.AudioBitRate.HasValue)
+            {
+                // Make sure we don't request a bitrate higher than the source
+                var currentBitrate = task.AudioStream == null ? task.Request.AudioBitRate.Value : task.AudioStream.BitRate ?? task.Request.AudioBitRate.Value;
+
+                return Math.Min(currentBitrate, task.Request.AudioBitRate.Value);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the number of audio channels to specify on the command line
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="audioStream">The audio stream.</param>
+        /// <returns>System.Nullable{System.Int32}.</returns>
+        public static int? GetNumAudioChannelsParam(EncodingOptions request, MediaStream audioStream)
+        {
+            if (audioStream != null)
+            {
+                if (audioStream.Channels > 2 && string.Equals(request.AudioCodec, "wma", StringComparison.OrdinalIgnoreCase))
+                {
+                    // wmav2 currently only supports two channel output
+                    return 2;
+                }
+            }
+
+            if (request.MaxAudioChannels.HasValue)
+            {
+                if (audioStream != null && audioStream.Channels.HasValue)
+                {
+                    return Math.Min(request.MaxAudioChannels.Value, audioStream.Channels.Value);
+                }
+
+                return request.MaxAudioChannels.Value;
+            }
+
+            return request.AudioChannels;
+        }
+
+        public static int GetNumberOfThreads(InternalEncodingTask state, bool isWebm)
+        {
+            // Use more when this is true. -re will keep cpu usage under control
+            if (state.ReadInputAtNativeFramerate)
+            {
+                if (isWebm)
+                {
+                    return Math.Max(Environment.ProcessorCount - 1, 1);
+                }
+
+                return 0;
+            }
+
+            // Webm: http://www.webmproject.org/docs/encoder-parameters/
+            // The decoder will usually automatically use an appropriate number of threads according to how many cores are available but it can only use multiple threads 
+            // for the coefficient data if the encoder selected --token-parts > 0 at encode time.
+
+            switch (state.QualitySetting)
+            {
+                case EncodingQuality.HighSpeed:
+                    return 2;
+                case EncodingQuality.HighQuality:
+                    return 2;
+                case EncodingQuality.MaxQuality:
+                    return isWebm ? 2 : 0;
+                default:
+                    throw new Exception("Unrecognized MediaEncodingQuality value.");
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/Encoder/FFMpegProcess.cs b/MediaBrowser.MediaEncoding/Encoder/FFMpegProcess.cs
new file mode 100644
index 000000000..05733aef0
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Encoder/FFMpegProcess.cs
@@ -0,0 +1,168 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Logging;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class FFMpegProcess : IDisposable
+    {
+        private readonly string _ffmpegPath;
+        private readonly ILogger _logger;
+        private readonly IFileSystem _fileSystem;
+        private readonly IApplicationPaths _appPaths;
+        private readonly IIsoManager _isoManager;
+        private readonly ILiveTvManager _liveTvManager;
+
+        private Stream _logFileStream;
+        private InternalEncodingTask _task;
+        private IIsoMount _isoMount;
+
+        public FFMpegProcess(string ffmpegPath, ILogger logger, IFileSystem fileSystem, IApplicationPaths appPaths, IIsoManager isoManager, ILiveTvManager liveTvManager)
+        {
+            _ffmpegPath = ffmpegPath;
+            _logger = logger;
+            _fileSystem = fileSystem;
+            _appPaths = appPaths;
+            _isoManager = isoManager;
+            _liveTvManager = liveTvManager;
+        }
+
+        public async Task Start(InternalEncodingTask task, Func<InternalEncodingTask,string,string> argumentsFactory)
+        {
+            _task = task;
+            if (!File.Exists(_ffmpegPath))
+            {
+                throw new InvalidOperationException("ffmpeg was not found at " + _ffmpegPath);
+            }
+
+            Directory.CreateDirectory(Path.GetDirectoryName(task.Request.OutputPath));
+
+            string mountedPath = null;
+            if (task.InputVideoType.HasValue && task.InputVideoType == VideoType.Iso && task.IsoType.HasValue)
+            {
+                if (_isoManager.CanMount(task.MediaPath))
+                {
+                    _isoMount = await _isoManager.Mount(task.MediaPath, CancellationToken.None).ConfigureAwait(false);
+                    mountedPath = _isoMount.MountedPath;
+                }
+            }
+            
+            var process = new Process
+            {
+                StartInfo = new ProcessStartInfo
+                {
+                    CreateNoWindow = true,
+                    UseShellExecute = false,
+
+                    // Must consume both stdout and stderr or deadlocks may occur
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+
+                    FileName = _ffmpegPath,
+                    WorkingDirectory = Path.GetDirectoryName(_ffmpegPath),
+                    Arguments = argumentsFactory(task, mountedPath),
+
+                    WindowStyle = ProcessWindowStyle.Hidden,
+                    ErrorDialog = false
+                },
+
+                EnableRaisingEvents = true
+            };
+
+            _logger.Info(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
+
+            var logFilePath = Path.Combine(_appPaths.LogDirectoryPath, "ffmpeg-" + task.Id + ".txt");
+            Directory.CreateDirectory(Path.GetDirectoryName(logFilePath));
+
+            // FFMpeg writes debug/error info to stderr. This is useful when debugging so let's put it in the log directory.
+            _logFileStream = _fileSystem.GetFileStream(logFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, true);
+
+            process.Exited += process_Exited;
+
+            try
+            {
+                process.Start();
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error starting ffmpeg", ex);
+
+                task.OnError();
+
+                DisposeLogFileStream();
+
+                process.Dispose();
+
+                throw;
+            }
+
+            task.OnBegin();
+
+            // MUST read both stdout and stderr asynchronously or a deadlock may occurr
+            process.BeginOutputReadLine();
+
+#pragma warning disable 4014
+            // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
+            process.StandardError.BaseStream.CopyToAsync(_logFileStream);
+#pragma warning restore 4014
+        }
+
+        async void process_Exited(object sender, EventArgs e)
+        {
+            var process = (Process)sender;
+
+            if (_isoMount != null)
+            {
+                _isoMount.Dispose();
+                _isoMount = null;
+            }
+
+            DisposeLogFileStream();
+
+            try
+            {
+                _logger.Info("FFMpeg exited with code {0} for {1}", process.ExitCode, _task.Request.OutputPath);
+            }
+            catch
+            {
+                _logger.Info("FFMpeg exited with an error for {0}", _task.Request.OutputPath);
+            }
+
+            _task.OnCompleted();
+            
+            if (!string.IsNullOrEmpty(_task.LiveTvStreamId))
+            {
+                try
+                {
+                    await _liveTvManager.CloseLiveStream(_task.LiveTvStreamId, CancellationToken.None).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error closing live tv stream", ex);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            DisposeLogFileStream();
+        }
+
+        private void DisposeLogFileStream()
+        {
+            if (_logFileStream != null)
+            {
+                _logFileStream.Dispose();
+                _logFileStream = null;
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTask.cs b/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTask.cs
new file mode 100644
index 000000000..826525aef
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTask.cs
@@ -0,0 +1,95 @@
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class InternalEncodingTask
+    {
+        public string Id { get; set; }
+
+        public CancellationTokenSource CancellationTokenSource { get; set; }
+
+        public double ProgressPercentage { get; set; }
+
+        public EncodingOptions Request { get; set; }
+
+        public VideoEncodingOptions VideoRequest
+        {
+            get { return Request as VideoEncodingOptions; }
+        }
+
+        public string MediaPath { get; set; }
+        public List<string> StreamFileNames { get; set; }
+        public bool IsInputRemote { get; set; }
+
+        public VideoType? InputVideoType { get; set; }
+        public IsoType? IsoType { get; set; }
+        public long? InputRunTimeTicks;
+
+        public string AudioSync = "1";
+        public string VideoSync = "vfr";
+
+        public string InputAudioSync { get; set; }
+        public string InputVideoSync { get; set; }
+
+        public bool DeInterlace { get; set; }
+
+        public bool ReadInputAtNativeFramerate { get; set; }
+
+        public string InputFormat { get; set; }
+
+        public string InputVideoCodec { get; set; }
+
+        public string InputAudioCodec { get; set; }
+
+        public string LiveTvStreamId { get; set; }
+
+        public MediaStream AudioStream { get; set; }
+        public MediaStream VideoStream { get; set; }
+        public MediaStream SubtitleStream { get; set; }
+        public bool HasMediaStreams { get; set; }
+
+        public int SegmentLength = 10;
+        public int HlsListSize;
+
+        public string MimeType { get; set; }
+        public string OrgPn { get; set; }
+        public bool EnableMpegtsM2TsMode { get; set; }
+
+        /// <summary>
+        /// Gets or sets the user agent.
+        /// </summary>
+        /// <value>The user agent.</value>
+        public string UserAgent { get; set; }
+
+        public EncodingQuality QualitySetting { get; set; }
+
+        public InternalEncodingTask()
+        {
+            Id = Guid.NewGuid().ToString("N");
+            CancellationTokenSource = new CancellationTokenSource();
+            StreamFileNames = new List<string>();
+        }
+
+        public bool EnableDebugLogging { get; set; }
+
+        internal void OnBegin()
+        {
+            
+        }
+
+        internal void OnCompleted()
+        {
+            
+        }
+
+        internal void OnError()
+        {
+            
+        }
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs b/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs
new file mode 100644
index 000000000..fa9b87906
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs
@@ -0,0 +1,323 @@
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.LiveTv;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.MediaEncoding.Encoder
+{
+    public class InternalEncodingTaskFactory
+    {
+        private readonly ILibraryManager _libraryManager;
+        private readonly ILiveTvManager _liveTvManager;
+        private readonly IItemRepository _itemRepo;
+        private readonly IServerConfigurationManager _config;
+
+        public InternalEncodingTaskFactory(ILibraryManager libraryManager, ILiveTvManager liveTvManager, IItemRepository itemRepo, IServerConfigurationManager config)
+        {
+            _libraryManager = libraryManager;
+            _liveTvManager = liveTvManager;
+            _itemRepo = itemRepo;
+            _config = config;
+        }
+
+        public async Task<InternalEncodingTask> Create(EncodingOptions request, CancellationToken cancellationToken)
+        {
+            ValidateInput(request);
+
+            var state = new InternalEncodingTask
+            {
+                Request = request
+            };
+
+            var item = string.IsNullOrEmpty(request.MediaSourceId) ?
+                _libraryManager.GetItemById(new Guid(request.ItemId)) :
+                _libraryManager.GetItemById(new Guid(request.MediaSourceId));
+
+            if (item is ILiveTvRecording)
+            {
+                var recording = await _liveTvManager.GetInternalRecording(request.ItemId, cancellationToken).ConfigureAwait(false);
+
+                if (string.Equals(recording.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase))
+                {
+                    state.InputVideoType = VideoType.VideoFile;
+                }
+
+                var path = recording.RecordingInfo.Path;
+                var mediaUrl = recording.RecordingInfo.Url;
+
+                if (string.IsNullOrWhiteSpace(path) && string.IsNullOrWhiteSpace(mediaUrl))
+                {
+                    var streamInfo = await _liveTvManager.GetRecordingStream(request.ItemId, cancellationToken).ConfigureAwait(false);
+
+                    state.LiveTvStreamId = streamInfo.Id;
+
+                    path = streamInfo.Path;
+                    mediaUrl = streamInfo.Url;
+                }
+
+                if (!string.IsNullOrEmpty(path) && File.Exists(path))
+                {
+                    state.MediaPath = path;
+                    state.IsInputRemote = false;
+                }
+                else if (!string.IsNullOrEmpty(mediaUrl))
+                {
+                    state.MediaPath = mediaUrl;
+                    state.IsInputRemote = true;
+                }
+
+                state.InputRunTimeTicks = recording.RunTimeTicks;
+                if (recording.RecordingInfo.Status == RecordingStatus.InProgress && !state.IsInputRemote)
+                {
+                    await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
+                }
+
+                state.ReadInputAtNativeFramerate = recording.RecordingInfo.Status == RecordingStatus.InProgress;
+                state.AudioSync = "1000";
+                state.DeInterlace = true;
+                state.InputVideoSync = "-1";
+                state.InputAudioSync = "1";
+            }
+            else if (item is LiveTvChannel)
+            {
+                var channel = _liveTvManager.GetInternalChannel(request.ItemId);
+
+                if (string.Equals(channel.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase))
+                {
+                    state.InputVideoType = VideoType.VideoFile;
+                }
+
+                var streamInfo = await _liveTvManager.GetChannelStream(request.ItemId, cancellationToken).ConfigureAwait(false);
+
+                state.LiveTvStreamId = streamInfo.Id;
+
+                if (!string.IsNullOrEmpty(streamInfo.Path) && File.Exists(streamInfo.Path))
+                {
+                    state.MediaPath = streamInfo.Path;
+                    state.IsInputRemote = false;
+
+                    await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
+                }
+                else if (!string.IsNullOrEmpty(streamInfo.Url))
+                {
+                    state.MediaPath = streamInfo.Url;
+                    state.IsInputRemote = true;
+                }
+
+                state.ReadInputAtNativeFramerate = true;
+                state.AudioSync = "1000";
+                state.DeInterlace = true;
+                state.InputVideoSync = "-1";
+                state.InputAudioSync = "1";
+            }
+            else
+            {
+                state.MediaPath = item.Path;
+                state.IsInputRemote = item.LocationType == LocationType.Remote;
+
+                var video = item as Video;
+
+                if (video != null)
+                {
+                    state.InputVideoType = video.VideoType;
+                    state.IsoType = video.IsoType;
+
+                    state.StreamFileNames = video.PlayableStreamFileNames.ToList();
+                }
+
+                state.InputRunTimeTicks = item.RunTimeTicks;
+            }
+
+            var videoRequest = request as VideoEncodingOptions;
+
+            var mediaStreams = _itemRepo.GetMediaStreams(new MediaStreamQuery
+            {
+                ItemId = item.Id
+
+            }).ToList();
+
+            if (videoRequest != null)
+            {
+                state.VideoStream = GetMediaStream(mediaStreams, videoRequest.VideoStreamIndex, MediaStreamType.Video);
+                state.SubtitleStream = GetMediaStream(mediaStreams, videoRequest.SubtitleStreamIndex, MediaStreamType.Subtitle, false);
+                state.AudioStream = GetMediaStream(mediaStreams, videoRequest.AudioStreamIndex, MediaStreamType.Audio);
+
+                if (state.VideoStream != null && state.VideoStream.IsInterlaced)
+                {
+                    state.DeInterlace = true;
+                }
+            }
+            else
+            {
+                state.AudioStream = GetMediaStream(mediaStreams, null, MediaStreamType.Audio, true);
+            }
+
+            state.HasMediaStreams = mediaStreams.Count > 0;
+
+            state.SegmentLength = state.ReadInputAtNativeFramerate ? 5 : 10;
+            state.HlsListSize = state.ReadInputAtNativeFramerate ? 100 : 1440;
+
+            state.QualitySetting = GetQualitySetting();
+
+            ApplyDeviceProfileSettings(state);
+
+            return state;
+        }
+
+        private void ValidateInput(EncodingOptions request)
+        {
+            if (string.IsNullOrWhiteSpace(request.ItemId))
+            {
+                throw new ArgumentException("ItemId is required.");
+            }
+            if (string.IsNullOrWhiteSpace(request.OutputPath))
+            {
+                throw new ArgumentException("OutputPath is required.");
+            }
+            if (string.IsNullOrWhiteSpace(request.Container))
+            {
+                throw new ArgumentException("Container is required.");
+            }
+            if (string.IsNullOrWhiteSpace(request.AudioCodec))
+            {
+                throw new ArgumentException("AudioCodec is required.");
+            }
+
+            var videoRequest = request as VideoEncodingOptions;
+
+            if (videoRequest == null)
+            {
+                return;
+            }
+        }
+
+        /// <summary>
+        /// Determines which stream will be used for playback
+        /// </summary>
+        /// <param name="allStream">All stream.</param>
+        /// <param name="desiredIndex">Index of the desired.</param>
+        /// <param name="type">The type.</param>
+        /// <param name="returnFirstIfNoIndex">if set to <c>true</c> [return first if no index].</param>
+        /// <returns>MediaStream.</returns>
+        private MediaStream GetMediaStream(IEnumerable<MediaStream> allStream, int? desiredIndex, MediaStreamType type, bool returnFirstIfNoIndex = true)
+        {
+            var streams = allStream.Where(s => s.Type == type).OrderBy(i => i.Index).ToList();
+
+            if (desiredIndex.HasValue)
+            {
+                var stream = streams.FirstOrDefault(s => s.Index == desiredIndex.Value);
+
+                if (stream != null)
+                {
+                    return stream;
+                }
+            }
+
+            if (returnFirstIfNoIndex && type == MediaStreamType.Audio)
+            {
+                return streams.FirstOrDefault(i => i.Channels.HasValue && i.Channels.Value > 0) ??
+                       streams.FirstOrDefault();
+            }
+
+            // Just return the first one
+            return returnFirstIfNoIndex ? streams.FirstOrDefault() : null;
+        }
+
+        private void ApplyDeviceProfileSettings(InternalEncodingTask state)
+        {
+            var profile = state.Request.DeviceProfile;
+
+            if (profile == null)
+            {
+                // Don't use settings from the default profile. 
+                // Only use a specific profile if it was requested.
+                return;
+            }
+
+            var container = state.Request.Container;
+
+            var audioCodec = state.Request.AudioCodec;
+
+            if (string.Equals(audioCodec, "copy", StringComparison.OrdinalIgnoreCase) && state.AudioStream != null)
+            {
+                audioCodec = state.AudioStream.Codec;
+            }
+
+            var videoCodec = state.VideoRequest == null ? null : state.VideoRequest.VideoCodec;
+
+            if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase) && state.VideoStream != null)
+            {
+                videoCodec = state.VideoStream.Codec;
+            }
+
+            var mediaProfile = state.VideoRequest == null ?
+                profile.GetAudioMediaProfile(container, audioCodec, state.AudioStream) :
+                profile.GetVideoMediaProfile(container, audioCodec, videoCodec, state.AudioStream, state.VideoStream);
+
+            if (mediaProfile != null)
+            {
+                state.MimeType = mediaProfile.MimeType;
+                state.OrgPn = mediaProfile.OrgPn;
+            }
+
+            var transcodingProfile = state.VideoRequest == null ?
+                profile.GetAudioTranscodingProfile(container, audioCodec) :
+                profile.GetVideoTranscodingProfile(container, audioCodec, videoCodec);
+
+            if (transcodingProfile != null)
+            {
+                //state.EstimateContentLength = transcodingProfile.EstimateContentLength;
+                state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
+                //state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
+
+                foreach (var setting in transcodingProfile.Settings)
+                {
+                    switch (setting.Name)
+                    {
+                        case TranscodingSettingType.VideoProfile:
+                            {
+                                if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.VideoProfile))
+                                {
+                                    state.VideoRequest.VideoProfile = setting.Value;
+                                }
+                                break;
+                            }
+                        default:
+                            throw new ArgumentException("Unrecognized TranscodingSettingType");
+                    }
+                }
+            }
+        }
+
+        private EncodingQuality GetQualitySetting()
+        {
+            var quality = _config.Configuration.MediaEncodingQuality;
+
+            if (quality == EncodingQuality.Auto)
+            {
+                var cpuCount = Environment.ProcessorCount;
+
+                if (cpuCount >= 4)
+                {
+                    //return EncodingQuality.HighQuality;
+                }
+
+                return EncodingQuality.HighSpeed;
+            }
+
+            return quality;
+        }
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index fac54ecff..93df0c8b9 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -6,10 +6,10 @@ using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Concurrent;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -122,35 +122,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// <exception cref="System.ArgumentException">Unrecognized InputType</exception>
         public string GetInputArgument(string[] inputFiles, InputType type)
         {
-            string inputPath;
-
-            switch (type)
-            {
-                case InputType.Bluray:
-                case InputType.Dvd:
-                case InputType.File:
-                    inputPath = GetConcatInputArgument(inputFiles);
-                    break;
-                case InputType.Url:
-                    inputPath = GetHttpInputArgument(inputFiles);
-                    break;
-                default:
-                    throw new ArgumentException("Unrecognized InputType");
-            }
-
-            return inputPath;
-        }
-
-        /// <summary>
-        /// Gets the HTTP input argument.
-        /// </summary>
-        /// <param name="inputFiles">The input files.</param>
-        /// <returns>System.String.</returns>
-        private string GetHttpInputArgument(string[] inputFiles)
-        {
-            var url = inputFiles[0];
-
-            return string.Format("\"{0}\"", url);
+            return EncodingUtils.GetInputArgument(inputFiles.ToList(), type == InputType.Url);
         }
 
         /// <summary>
@@ -160,7 +132,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// <returns>System.String.</returns>
         public string GetProbeSizeArgument(InputType type)
         {
-            return type == InputType.Dvd ? "-probesize 1G -analyzeduration 200M" : string.Empty;
+            return EncodingUtils.GetProbeSizeArgument(type == InputType.Dvd);
         }
 
         /// <summary>
@@ -879,36 +851,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
             return memoryStream;
         }
 
-        /// <summary>
-        /// Gets the file input argument.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>System.String.</returns>
-        private string GetFileInputArgument(string path)
-        {
-            return string.Format("file:\"{0}\"", path);
-        }
-
-        /// <summary>
-        /// Gets the concat input argument.
-        /// </summary>
-        /// <param name="playableStreamFiles">The playable stream files.</param>
-        /// <returns>System.String.</returns>
-        private string GetConcatInputArgument(string[] playableStreamFiles)
-        {
-            // Get all streams
-            // If there's more than one we'll need to use the concat command
-            if (playableStreamFiles.Length > 1)
-            {
-                var files = string.Join("|", playableStreamFiles);
-
-                return string.Format("concat:\"{0}\"", files);
-            }
-
-            // Determine the input path for video files
-            return GetFileInputArgument(playableStreamFiles[0]);
-        }
-
         public Task<Stream> EncodeImage(ImageEncodingOptions options, CancellationToken cancellationToken)
         {
             return new ImageEncoder(FFMpegPath, _logger, _fileSystem, _appPaths).EncodeImage(options, cancellationToken);
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index fb1041f89..ee1658ddd 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -48,7 +48,12 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BdInfo\BdInfoExaminer.cs" />
+    <Compile Include="Encoder\AudioEncoder.cs" />
+    <Compile Include="Encoder\EncodingUtils.cs" />
+    <Compile Include="Encoder\FFMpegProcess.cs" />
     <Compile Include="Encoder\ImageEncoder.cs" />
+    <Compile Include="Encoder\InternalEncodingTask.cs" />
+    <Compile Include="Encoder\InternalEncodingTaskFactory.cs" />
     <Compile Include="Encoder\MediaEncoder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index d17e2a7f9..fe6faf363 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -33,6 +33,8 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The external identifier.</value>
         public string ExternalId { get; set; }
 
+        public List<MediaSourceInfo> MediaSources { get; set; }
+        
         /// <summary>
         /// Gets or sets the image tags.
         /// </summary>
@@ -112,6 +114,7 @@ namespace MediaBrowser.Model.LiveTv
         public ChannelInfoDto()
         {
             ImageTags = new Dictionary<ImageType, Guid>();
+            MediaSources = new List<MediaSourceInfo>();
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 40aa5710e..de07382c0 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -1,11 +1,11 @@
-using System.Diagnostics;
-using System.Runtime.Serialization;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Library;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using MediaBrowser.Model.Library;
+using System.Diagnostics;
+using System.Runtime.Serialization;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -248,10 +248,13 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The type.</value>
         public string Type { get; set; }
 
+        public List<MediaSourceInfo> MediaSources { get; set; }
+        
         public RecordingInfoDto()
         {
             Genres = new List<string>();
             ImageTags = new Dictionary<ImageType, Guid>();
+            MediaSources = new List<MediaSourceInfo>();
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 2e0b3cb17..02da776bd 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -8,6 +8,7 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Session;
@@ -1064,7 +1065,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                     dto.AlbumPrimaryImageTag = GetImageCacheTag(albumParent, ImageType.Primary);
                 }
 
-                dto.MediaSources = GetMediaSources(audio);
+                dto.MediaSources = GetAudioMediaSources(audio);
                 dto.MediaSourceCount = 1;
             }
 
@@ -1100,7 +1101,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 if (fields.Contains(ItemFields.MediaSources))
                 {
-                    dto.MediaSources = GetMediaSources(video);
+                    dto.MediaSources = GetVideoMediaSources(video);
                 }
 
                 if (fields.Contains(ItemFields.Chapters))
@@ -1266,9 +1267,48 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 SetBookProperties(dto, book);
             }
+
+            var tvChannel = item as LiveTvChannel;
+
+            if (tvChannel != null)
+            {
+                dto.MediaSources = GetMediaSources(tvChannel);
+            }
+        }
+
+        public List<MediaSourceInfo> GetMediaSources(BaseItem item)
+        {
+            var video = item as Video;
+
+            if (video != null)
+            {
+                return GetVideoMediaSources(video);
+            }
+
+            var audio = item as Audio;
+
+            if (audio != null)
+            {
+                return GetAudioMediaSources(audio);
+            }
+
+            var result = new List<MediaSourceInfo>
+            {
+                new MediaSourceInfo
+                {
+                    Id = item.Id.ToString("N"),
+                    LocationType = item.LocationType,
+                    Name = item.Name,
+                    Path = GetMappedPath(item),
+                    MediaStreams = _itemRepo.GetMediaStreams(new MediaStreamQuery { ItemId = item.Id }).ToList(),
+                    RunTimeTicks = item.RunTimeTicks
+                }            
+            };
+
+            return result;
         }
 
-        private List<MediaSourceInfo> GetMediaSources(Video item)
+        private List<MediaSourceInfo> GetVideoMediaSources(Video item)
         {
             var result = item.GetAlternateVersions().Select(GetVersionInfo).ToList();
 
@@ -1293,7 +1333,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             .ToList();
         }
 
-        private List<MediaSourceInfo> GetMediaSources(Audio item)
+        private List<MediaSourceInfo> GetAudioMediaSources(Audio item)
         {
             var result = new List<MediaSourceInfo>
             {
diff --git a/MediaBrowser.Server.Implementations/Library/MusicManager.cs b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
new file mode 100644
index 000000000..9d5826454
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Library/MusicManager.cs
@@ -0,0 +1,67 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Library;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace MediaBrowser.Server.Implementations.Library
+{
+    public class MusicManager : IMusicManager
+    {
+        private readonly ILibraryManager _libraryManager;
+
+        public MusicManager(ILibraryManager libraryManager)
+        {
+            _libraryManager = libraryManager;
+        }
+
+        public IEnumerable<Audio> GetInstantMixFromSong(Audio item, User user)
+        {
+            return GetInstantMixFromGenres(item.Genres, user);
+        }
+
+        public IEnumerable<Audio> GetInstantMixFromArtist(string name, User user)
+        {
+            var artist = _libraryManager.GetArtist(name);
+
+            var genres = _libraryManager.RootFolder
+                .RecursiveChildren
+                .OfType<Audio>()
+                .Where(i => i.HasArtist(name))
+                .SelectMany(i => i.Genres)
+                .Concat(artist.Genres)
+                .Distinct(StringComparer.OrdinalIgnoreCase);
+
+            return GetInstantMixFromGenres(genres, user);
+        }
+
+        public IEnumerable<Audio> GetInstantMixFromAlbum(MusicAlbum item, User user)
+        {
+            var genres = item
+               .RecursiveChildren
+               .OfType<Audio>()
+               .SelectMany(i => i.Genres)
+               .Concat(item.Genres)
+               .Distinct(StringComparer.OrdinalIgnoreCase);
+
+            return GetInstantMixFromGenres(genres, user);
+        }
+
+        public IEnumerable<Audio> GetInstantMixFromGenres(IEnumerable<string> genres, User user)
+        {
+            var inputItems = user.RootFolder.GetRecursiveChildren(user);
+
+            var genresDictionary = genres.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
+
+            return inputItems
+                .OfType<Audio>()
+                .Select(i => new Tuple<Audio, int>(i, i.Genres.Count(genresDictionary.ContainsKey)))
+                .OrderByDescending(i => i.Item2)
+                .ThenBy(i => Guid.NewGuid())
+                .Select(i => i.Item1)
+                .Take(100)
+                .OrderBy(i => Guid.NewGuid());
+        }
+    }
+}
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index 67c011a1f..b92e82385 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -34,8 +34,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio
                 {
                     var collectionType = args.GetCollectionType();
 
-                    if (string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase) ||
-                        string.IsNullOrEmpty(collectionType))
+                    if (string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase))
                     {
                         return new Controller.Entities.Audio.Audio();
                     }
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 4e1bd860b..cf7358cce 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -222,13 +222,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 RunTimeTicks = (info.EndDate - info.StartDate).Ticks,
                 OriginalAirDate = info.OriginalAirDate,
 
-                MediaStreams = _itemRepo.GetMediaStreams(new MediaStreamQuery
-                {
-                    ItemId = recording.Id
-
-                }).ToList()
+                MediaSources = _dtoService.GetMediaSources((BaseItem)recording)
             };
 
+            dto.MediaStreams = dto.MediaSources.SelectMany(i => i.MediaStreams).ToList();
+
             if (info.Status == RecordingStatus.InProgress)
             {
                 var now = DateTime.UtcNow.Ticks;
@@ -317,7 +315,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 Type = info.GetClientTypeName(),
                 Id = info.Id.ToString("N"),
                 MediaType = info.MediaType,
-                ExternalId = info.ExternalId
+                ExternalId = info.ExternalId,
+                MediaSources = _dtoService.GetMediaSources(info)
             };
 
             if (user != null)
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index ea7ef2ed6..115bc0136 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -141,6 +141,7 @@
     <Compile Include="IO\LibraryMonitor.cs" />
     <Compile Include="Library\CoreResolutionIgnoreRule.cs" />
     <Compile Include="Library\LibraryManager.cs" />
+    <Compile Include="Library\MusicManager.cs" />
     <Compile Include="Library\Resolvers\PhotoResolver.cs" />
     <Compile Include="Library\SearchEngine.cs" />
     <Compile Include="Library\ResolverHelper.cs" />
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 4f748a6a8..00d2aa992 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -3,8 +3,6 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Session;
@@ -43,6 +41,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private readonly ILibraryManager _libraryManager;
         private readonly IUserManager _userManager;
+        private readonly IMusicManager _musicManager;
 
         /// <summary>
         /// Gets or sets the configuration manager.
@@ -688,9 +687,22 @@ namespace MediaBrowser.Server.Implementations.Session
 
             var user = session.UserId.HasValue ? _userManager.GetUserById(session.UserId.Value) : null;
 
-            var items = command.ItemIds.SelectMany(i => TranslateItemForPlayback(i, user))
-                .Where(i => i.LocationType != LocationType.Virtual)
-                .ToList();
+            List<BaseItem> items;
+
+            if (command.PlayCommand == PlayCommand.PlayInstantMix)
+            {
+                items = command.ItemIds.SelectMany(i => TranslateItemForInstantMix(i, user))
+                    .Where(i => i.LocationType != LocationType.Virtual)
+                    .ToList();
+
+                command.PlayCommand = PlayCommand.PlayNow;
+            }
+            else
+            {
+                items = command.ItemIds.SelectMany(i => TranslateItemForPlayback(i, user))
+                   .Where(i => i.LocationType != LocationType.Virtual)
+                   .ToList();
+            }
 
             if (command.PlayCommand == PlayCommand.PlayShuffle)
             {
@@ -741,7 +753,7 @@ namespace MediaBrowser.Server.Implementations.Session
             {
                 var folder = (Folder)item;
 
-                var items = user == null ? folder.RecursiveChildren:
+                var items = user == null ? folder.RecursiveChildren :
                     folder.GetRecursiveChildren(user);
 
                 items = items.Where(i => !i.IsFolder);
@@ -754,6 +766,41 @@ namespace MediaBrowser.Server.Implementations.Session
             return new[] { item };
         }
 
+        private IEnumerable<BaseItem> TranslateItemForInstantMix(string id, User user)
+        {
+            var item = _libraryManager.GetItemById(new Guid(id));
+
+            var audio = item as Audio;
+
+            if (audio != null)
+            {
+                return _musicManager.GetInstantMixFromSong(audio, user);
+            }
+
+            var artist = item as MusicArtist;
+
+            if (artist != null)
+            {
+                return _musicManager.GetInstantMixFromArtist(artist.Name, user);
+            }
+
+            var album = item as MusicAlbum;
+
+            if (album != null)
+            {
+                return _musicManager.GetInstantMixFromAlbum(album, user);
+            }
+
+            var genre = item as MusicGenre;
+
+            if (genre != null)
+            {
+                return _musicManager.GetInstantMixFromGenres(new[] { genre.Name }, user);
+            }
+
+            return new BaseItem[] { };
+        }
+
         public Task SendBrowseCommand(Guid controllingSessionId, Guid sessionId, BrowseRequest command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index d9d5e007e..4c75b6502 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -449,6 +449,8 @@ namespace MediaBrowser.ServerApplication
             LibraryManager = new LibraryManager(Logger, TaskManager, UserManager, ServerConfigurationManager, UserDataManager, () => LibraryMonitor, FileSystemManager, () => ProviderManager);
             RegisterSingleInstance(LibraryManager);
 
+            RegisterSingleInstance<IMusicManager>(new MusicManager(LibraryManager));
+
             LibraryMonitor = new LibraryMonitor(LogManager, TaskManager, LibraryManager, ServerConfigurationManager, FileSystemManager);
             RegisterSingleInstance(LibraryMonitor);
 
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index ea1905bad..f268c44ec 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -4058,7 +4058,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
                 options.ForceTitle = true;
             }
 
-            var url = self.getUrl("Packages/" + packageId + "Reviews", options);
+            var url = self.getUrl("Packages/" + packageId + "/Reviews", options);
 
             return self.ajax({
                 type: "GET",
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index a5074d3c8..a874d5f6f 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.248" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.249" targetFramework="net45" />
 </packages>
\ No newline at end of file
-- 
cgit v1.2.3


From bb5386bb3a8b71406728f8bd2249cf6e02a34ed2 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 31 Mar 2014 17:04:22 -0400
Subject: added more remote control commands

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs  |  4 +-
 MediaBrowser.Api/SessionsService.cs                | 74 +++++++++++++++++++++-
 .../Session/ISessionController.cs                  | 10 +--
 MediaBrowser.Controller/Session/ISessionManager.cs |  8 +--
 MediaBrowser.Dlna/PlayTo/DlnaController.cs         | 44 +++++++------
 .../Encoder/EncodingUtils.cs                       |  4 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  2 +-
 .../MediaBrowser.Model.Portable.csproj             |  7 +-
 .../MediaBrowser.Model.net35.csproj                |  7 +-
 MediaBrowser.Model/ApiClient/IApiClient.cs         | 10 +--
 MediaBrowser.Model/ApiClient/IServerEvents.cs      |  5 +-
 MediaBrowser.Model/ApiClient/ServerEventArgs.cs    |  4 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |  3 +-
 MediaBrowser.Model/Session/GeneralCommand.cs       | 48 ++++++++++++++
 MediaBrowser.Model/Session/GenericCommand.cs       | 48 --------------
 MediaBrowser.Model/Session/SystemCommand.cs        | 14 ----
 MediaBrowser.Model/System/SystemInfo.cs            |  6 ++
 .../Library/Resolvers/Movies/MovieResolver.cs      |  9 +--
 .../Localization/JavaScript/de.json                | 31 +++++++++
 .../Localization/JavaScript/en_US.json             | 12 +++-
 .../Localization/JavaScript/es.json                | 31 +++++++++
 .../Localization/JavaScript/fr.json                | 31 +++++++++
 .../Localization/JavaScript/javascript.json        | 12 +++-
 .../Localization/JavaScript/nl.json                | 31 +++++++++
 .../Localization/JavaScript/pt_PT.json             | 20 ++++--
 .../Localization/JavaScript/ru.json                | 31 +++++++++
 .../Localization/JavaScript/zh_TW.json             | 31 +++++++++
 .../Localization/LocalizationManager.cs            | 11 +++-
 .../Localization/Server/de.json                    | 37 ++++++++++-
 .../Localization/Server/en_US.json                 | 35 +++++++++-
 .../Localization/Server/es.json                    | 50 +++++++++++++++
 .../Localization/Server/fr.json                    | 50 +++++++++++++++
 .../Localization/Server/nl.json                    | 50 +++++++++++++++
 .../Localization/Server/pt_BR.json                 | 50 +++++++++++++++
 .../Localization/Server/pt_PT.json                 | 35 +++++++++-
 .../Localization/Server/ru.json                    | 49 +++++++++++---
 .../Localization/Server/server.json                | 35 +++++++++-
 .../Localization/Server/zh_TW.json                 | 50 +++++++++++++++
 .../MediaBrowser.Server.Implementations.csproj     | 11 ++++
 .../Roku/RokuSessionController.cs                  | 14 +---
 .../Session/SessionManager.cs                      |  8 +--
 .../Session/WebSocketController.cs                 | 18 +-----
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  1 +
 MediaBrowser.WebDashboard/Api/DashboardService.cs  |  2 +-
 44 files changed, 855 insertions(+), 188 deletions(-)
 create mode 100644 MediaBrowser.Model/Session/GeneralCommand.cs
 delete mode 100644 MediaBrowser.Model/Session/GenericCommand.cs
 delete mode 100644 MediaBrowser.Model/Session/SystemCommand.cs
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/es.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/fr.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/nl.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
 create mode 100644 MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json

(limited to 'MediaBrowser.Server.Implementations/Session/SessionManager.cs')

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 5ed77356b..e6ec38846 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -734,7 +734,9 @@ namespace MediaBrowser.Api.Playback
         {
             if (audioStream != null)
             {
-                if (audioStream.Channels > 2 && string.Equals(request.AudioCodec, "wma", StringComparison.OrdinalIgnoreCase))
+                var codec = request.AudioCodec ?? string.Empty;
+
+                if (audioStream.Channels > 2 && codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
                 {
                     // wmav2 currently only supports two channel output
                     return 2;
diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs
index a509c876c..1f3bcf75b 100644
--- a/MediaBrowser.Api/SessionsService.cs
+++ b/MediaBrowser.Api/SessionsService.cs
@@ -146,7 +146,36 @@ namespace MediaBrowser.Api
         /// </summary>
         /// <value>The play command.</value>
         [ApiMember(Name = "Command", Description = "The command to send.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public SystemCommand Command { get; set; }
+        public string Command { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Command/{Command}", "POST", Summary = "Issues a system command to a client")]
+    public class SendGeneralCommand : IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the command.
+        /// </summary>
+        /// <value>The play command.</value>
+        [ApiMember(Name = "Command", Description = "The command to send.", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public string Command { get; set; }
+    }
+
+    [Route("/Sessions/{Id}/Command", "POST", Summary = "Issues a system command to a client")]
+    public class SendFullGeneralCommand : GeneralCommand, IReturnVoid
+    {
+        /// <summary>
+        /// Gets or sets the id.
+        /// </summary>
+        /// <value>The id.</value>
+        [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+        public Guid Id { get; set; }
     }
 
     [Route("/Sessions/{Id}/Message", "POST", Summary = "Issues a command to a client to display a message to the user")]
@@ -301,9 +330,22 @@ namespace MediaBrowser.Api
         /// <param name="request">The request.</param>
         public void Post(SendSystemCommand request)
         {
-            var task = _sessionManager.SendSystemCommand(GetSession().Id, request.Id, request.Command, CancellationToken.None);
+            GeneralCommandType commandType;
 
-            Task.WaitAll(task);
+            if (Enum.TryParse(request.Command, true, out commandType))
+            {
+                var currentSession = GetSession();
+
+                var command = new GeneralCommand
+                {
+                    Name = commandType.ToString(),
+                    ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
+                };
+
+                var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+
+                Task.WaitAll(task);
+            }
         }
 
         /// <summary>
@@ -343,6 +385,32 @@ namespace MediaBrowser.Api
             Task.WaitAll(task);
         }
 
+        public void Post(SendGeneralCommand request)
+        {
+            var currentSession = GetSession();
+
+            var command = new GeneralCommand
+            {
+                Name = request.Command,
+                ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null
+            };
+
+            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, command, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
+        public void Post(SendFullGeneralCommand request)
+        {
+            var currentSession = GetSession();
+
+            request.ControllingUserId = currentSession.UserId.HasValue ? currentSession.UserId.Value.ToString("N") : null;
+
+            var task = _sessionManager.SendGeneralCommand(currentSession.Id, request.Id, request, CancellationToken.None);
+
+            Task.WaitAll(task);
+        }
+
         public void Post(AddUserToSession request)
         {
             _sessionManager.AddAdditionalUser(request.Id, request.UserId);
diff --git a/MediaBrowser.Controller/Session/ISessionController.cs b/MediaBrowser.Controller/Session/ISessionController.cs
index 02cc875bd..cf57f6621 100644
--- a/MediaBrowser.Controller/Session/ISessionController.cs
+++ b/MediaBrowser.Controller/Session/ISessionController.cs
@@ -19,14 +19,6 @@ namespace MediaBrowser.Controller.Session
         /// <value><c>true</c> if this instance is session active; otherwise, <c>false</c>.</value>
         bool IsSessionActive { get; }
 
-        /// <summary>
-        /// Sends the system command.
-        /// </summary>
-        /// <param name="command">The command.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken);
-
         /// <summary>
         /// Sends the message command.
         /// </summary>
@@ -65,7 +57,7 @@ namespace MediaBrowser.Controller.Session
         /// <param name="command">The command.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken);
+        Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken);
         
         /// <summary>
         /// Sends the library update info.
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 459e43d08..434c51336 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -84,15 +84,15 @@ namespace MediaBrowser.Controller.Session
         Task ReportSessionEnded(Guid sessionId);
 
         /// <summary>
-        /// Sends the system command.
+        /// Sends the general command.
         /// </summary>
         /// <param name="controllingSessionId">The controlling session identifier.</param>
-        /// <param name="sessionId">The session id.</param>
+        /// <param name="sessionId">The session identifier.</param>
         /// <param name="command">The command.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        Task SendSystemCommand(Guid controllingSessionId, Guid sessionId, SystemCommand command, CancellationToken cancellationToken);
-
+        Task SendGeneralCommand(Guid controllingSessionId, Guid sessionId, GeneralCommand command, CancellationToken cancellationToken);
+        
         /// <summary>
         /// Sends the message command.
         /// </summary>
diff --git a/MediaBrowser.Dlna/PlayTo/DlnaController.cs b/MediaBrowser.Dlna/PlayTo/DlnaController.cs
index 0c9f292ad..96df8c862 100644
--- a/MediaBrowser.Dlna/PlayTo/DlnaController.cs
+++ b/MediaBrowser.Dlna/PlayTo/DlnaController.cs
@@ -308,25 +308,6 @@ namespace MediaBrowser.Dlna.PlayTo
             return Task.FromResult(true);
         }
 
-        public Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken)
-        {
-            switch (command)
-            {
-                case SystemCommand.VolumeDown:
-                    return _device.VolumeDown();
-                case SystemCommand.VolumeUp:
-                    return _device.VolumeUp();
-                case SystemCommand.Mute:
-                    return _device.VolumeDown(true);
-                case SystemCommand.Unmute:
-                    return _device.VolumeUp(true);
-                case SystemCommand.ToggleMute:
-                    return _device.ToggleMute();
-                default:
-                    return Task.FromResult(true);
-            }
-        }
-
         public Task SendUserDataChangeInfo(UserDataChangeInfo info, CancellationToken cancellationToken)
         {
             return Task.FromResult(true);
@@ -620,9 +601,30 @@ namespace MediaBrowser.Dlna.PlayTo
             }
         }
 
-        public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
+        public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
-            throw new NotImplementedException();
+            GeneralCommandType commandType;
+
+            if (!Enum.TryParse(command.Name, true, out commandType))
+            {
+                switch (commandType)
+                {
+                    case GeneralCommandType.VolumeDown:
+                        return _device.VolumeDown();
+                    case GeneralCommandType.VolumeUp:
+                        return _device.VolumeUp();
+                    case GeneralCommandType.Mute:
+                        return _device.VolumeDown(true);
+                    case GeneralCommandType.Unmute:
+                        return _device.VolumeUp(true);
+                    case GeneralCommandType.ToggleMute:
+                        return _device.ToggleMute();
+                    default:
+                        return Task.FromResult(true);
+                }
+            }
+
+            return Task.FromResult(true);
         }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
index 79d512dc1..4a9023c7f 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
@@ -180,7 +180,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             if (audioStream != null)
             {
-                if (audioStream.Channels > 2 && string.Equals(request.AudioCodec, "wma", StringComparison.OrdinalIgnoreCase))
+                var codec = request.AudioCodec ?? string.Empty;
+
+                if (audioStream.Channels > 2 && codec.IndexOf("wma", StringComparison.OrdinalIgnoreCase) != -1)
                 {
                     // wmav2 currently only supports two channel output
                     return 2;
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 93df0c8b9..675d43be7 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -768,7 +768,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
 
             // Use ffmpeg to sample 100 (we can drop this if required using thumbnail=50 for 50 frames) frames and pick the best thumbnail. Have a fall back just in case.
-            var args = useIFrame ? string.Format("-i {0} -threads 0 -v quiet -vframes 1 -vf \"{2},thumbnail=80\" -f image2 \"{1}\"", inputPath, "-", vf) :
+            var args = useIFrame ? string.Format("-i {0} -threads 0 -v quiet -vframes 1 -vf \"{2},thumbnail=50\" -f image2 \"{1}\"", inputPath, "-", vf) :
                 string.Format("-i {0} -threads 0 -v quiet -vframes 1 -vf \"{2}\" -f image2 \"{1}\"", inputPath, "-", vf);
 
             var probeSize = GetProbeSizeArgument(type);
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 6c4d9d9e2..00fb2131c 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -428,8 +428,8 @@
     <Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs">
       <Link>Session\BrowseRequest.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Session\GenericCommand.cs">
-      <Link>Session\GenericCommand.cs</Link>
+    <Compile Include="..\MediaBrowser.Model\Session\GeneralCommand.cs">
+      <Link>Session\GeneralCommand.cs</Link>
     </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\MessageCommand.cs">
       <Link>Session\MessageCommand.cs</Link>
@@ -449,9 +449,6 @@
     <Compile Include="..\MediaBrowser.Model\Session\SessionInfoDto.cs">
       <Link>Session\SessionInfoDto.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Session\SystemCommand.cs">
-      <Link>Session\SystemCommand.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
       <Link>Session\UserDataChangeInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index b39cecc61..f8bc2a600 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -415,8 +415,8 @@
     <Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs">
       <Link>Session\BrowseRequest.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Session\GenericCommand.cs">
-      <Link>Session\GenericCommand.cs</Link>
+    <Compile Include="..\MediaBrowser.Model\Session\GeneralCommand.cs">
+      <Link>Session\GeneralCommand.cs</Link>
     </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\MessageCommand.cs">
       <Link>Session\MessageCommand.cs</Link>
@@ -436,9 +436,6 @@
     <Compile Include="..\MediaBrowser.Model\Session\SessionInfoDto.cs">
       <Link>Session\SessionInfoDto.cs</Link>
     </Compile>
-    <Compile Include="..\MediaBrowser.Model\Session\SystemCommand.cs">
-      <Link>Session\SystemCommand.cs</Link>
-    </Compile>
     <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs">
       <Link>Session\UserDataChangeInfo.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 28c5822e9..dc5e26be3 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -593,17 +593,9 @@ namespace MediaBrowser.Model.ApiClient
         /// Sends the command asynchronous.
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
-        /// <param name="request">The request.</param>
-        /// <returns>Task.</returns>
-        Task SendCommandAsync(string sessionId, GenericCommand request);
-        
-        /// <summary>
-        /// Sends a system command to the client
-        /// </summary>
-        /// <param name="sessionId">The session id.</param>
         /// <param name="command">The command.</param>
         /// <returns>Task.</returns>
-        Task SendSystemCommandAsync(string sessionId, SystemCommand command);
+        Task SendCommandAsync(string sessionId, GeneralCommand command);
 
         /// <summary>
         /// Instructs the client to display a message to the user
diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs
index 0a38c63ad..63135baa2 100644
--- a/MediaBrowser.Model/ApiClient/IServerEvents.cs
+++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs
@@ -1,4 +1,5 @@
-using System;
+using MediaBrowser.Model.Session;
+using System;
 
 namespace MediaBrowser.Model.ApiClient
 {
@@ -66,7 +67,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <summary>
         /// Occurs when [system command].
         /// </summary>
-        event EventHandler<SystemCommandEventArgs> SystemCommand;
+        event EventHandler<GeneralCommandEventArgs> GeneralCommand;
         /// <summary>
         /// Occurs when [notification added].
         /// </summary>
diff --git a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
index d3212caf4..b7f709e95 100644
--- a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
+++ b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
@@ -152,13 +152,13 @@ namespace MediaBrowser.Model.ApiClient
     /// <summary>
     /// Class SystemCommandEventArgs
     /// </summary>
-    public class SystemCommandEventArgs : EventArgs
+    public class GeneralCommandEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets the command.
         /// </summary>
         /// <value>The command.</value>
-        public SystemCommand Command { get; set; }
+        public GeneralCommand Command { get; set; }
     }
 
     /// <summary>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 207543fe8..0859f6999 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -132,7 +132,7 @@
     <Compile Include="Querying\UserQuery.cs" />
     <Compile Include="Search\SearchQuery.cs" />
     <Compile Include="Session\BrowseRequest.cs" />
-    <Compile Include="Session\GenericCommand.cs" />
+    <Compile Include="Session\GeneralCommand.cs" />
     <Compile Include="Session\MessageCommand.cs" />
     <Compile Include="Session\PlaybackReports.cs" />
     <Compile Include="Session\PlayRequest.cs" />
@@ -171,7 +171,6 @@
     <Compile Include="Serialization\IXmlSerializer.cs" />
     <Compile Include="Session\SessionCapabilities.cs" />
     <Compile Include="Session\SessionInfoDto.cs" />
-    <Compile Include="Session\SystemCommand.cs" />
     <Compile Include="Session\UserDataChangeInfo.cs" />
     <Compile Include="Themes\AppTheme.cs" />
     <Compile Include="Themes\ThemeImage.cs" />
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
new file mode 100644
index 000000000..0de7d6dd8
--- /dev/null
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Session
+{
+    public class GeneralCommand
+    {
+        public string Name { get; set; }
+
+        public string ControllingUserId { get; set; }
+
+        public Dictionary<string, string> Arguments { get; set; }
+
+        public GeneralCommand()
+        {
+            Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+    }
+
+    /// <summary>
+    /// This exists simply to identify a set of known commands.
+    /// </summary>
+    public enum GeneralCommandType
+    {
+        MoveUp = 0,
+        MoveDown = 1,
+        MoveLeft = 2,
+        MoveRight = 3,
+        PageUp = 4,
+        PageDown = 5,
+        PreviousLetter = 6,
+        NextLetter = 7,
+        ToggleOsd = 8,
+        ToggleContextMenu = 9,
+        Select = 10,
+        Back = 11,
+        TakeScreenshot = 12,
+        SendKey = 13,
+        SendString = 14,
+        GoHome = 15,
+        GoToSettings = 16,
+        VolumeUp = 17,
+        VolumeDown = 18,
+        Mute = 19,
+        Unmute = 20,
+        ToggleMute = 21
+    }
+}
diff --git a/MediaBrowser.Model/Session/GenericCommand.cs b/MediaBrowser.Model/Session/GenericCommand.cs
deleted file mode 100644
index f7ea0a84a..000000000
--- a/MediaBrowser.Model/Session/GenericCommand.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Model.Session
-{
-    public class GenericCommand
-    {
-        public string Name { get; set; }
-
-        public string ControllingUserId { get; set; }
-
-        public Dictionary<string, string> Arguments { get; set; }
-
-        public GenericCommand()
-        {
-            Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-        }
-    }
-
-    /// <summary>
-    /// This exists simply to identify a set of known commands.
-    /// </summary>
-    public enum CoreGenericCommand
-    {
-        MoveUp = 0,
-        MoveDown = 1,
-        MoveLeft = 2,
-        MoveRight = 3,
-        PageUp = 4,
-        PageDown = 5,
-        PreviousLetter = 6,
-        NextLetter = 7,
-        ToggleOsd = 8,
-        ToggleContextMenu = 9,
-        Select = 10,
-        Back = 11,
-        TakeScreenshot = 12,
-        SendKey = 13,
-        SendString = 14,
-        GoHome = 15,
-        GoToSettings = 16,
-        VolumeUp = 17,
-        VolumeDown = 18,
-        Mute = 19,
-        Unmute = 20,
-        ToggleMute = 21
-    }
-}
diff --git a/MediaBrowser.Model/Session/SystemCommand.cs b/MediaBrowser.Model/Session/SystemCommand.cs
deleted file mode 100644
index 2fcaef6e3..000000000
--- a/MediaBrowser.Model/Session/SystemCommand.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-namespace MediaBrowser.Model.Session
-{
-    public enum SystemCommand
-    {
-        GoHome,
-        GoToSettings,
-        VolumeUp,
-        VolumeDown,
-        Mute,
-        Unmute,
-        ToggleMute
-    }
-}
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index ec31c5529..5b1e7d6bb 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -116,6 +116,12 @@ namespace MediaBrowser.Model.System
         /// <value>The log path.</value>
         public string LogPath { get; set; }
 
+        /// <summary>
+        /// Gets or sets the internal metadata path.
+        /// </summary>
+        /// <value>The internal metadata path.</value>
+        public string InternalMetadataPath { get; set; }
+        
         /// <summary>
         /// Gets or sets the transcoding temporary path.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 13a1e8f16..558087a25 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -115,22 +115,19 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
             }
 
             // Find movies that are mixed in the same folder
-            if (args.Path.IndexOf("[trailers]", StringComparison.OrdinalIgnoreCase) != -1 ||
-                string.Equals(collectionType, CollectionType.Trailers, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(collectionType, CollectionType.Trailers, StringComparison.OrdinalIgnoreCase))
             {
                 return ResolveVideo<Trailer>(args);
             }
 
             Video item = null;
 
-            if (args.Path.IndexOf("[musicvideos]", StringComparison.OrdinalIgnoreCase) != -1 ||
-                string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
             {
                 item = ResolveVideo<MusicVideo>(args);
             }
 
-            if (args.Path.IndexOf("[adultvideos]", StringComparison.OrdinalIgnoreCase) != -1 ||
-                string.Equals(collectionType, CollectionType.AdultVideos, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(collectionType, CollectionType.AdultVideos, StringComparison.OrdinalIgnoreCase))
             {
                 item = ResolveVideo<AdultVideo>(args);
             }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
new file mode 100644
index 000000000..12cdb7035
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "Einstellungen gespeichert",
+	"AddUser": "Benutzer hinzuf\u00fcgen",
+	"Users": "Benutzer",
+	"Delete": "L\u00f6schen",
+	"Administrator": "Administrator",
+	"Password": "Passwort",
+	"CreatePassword": "Passwort erstellen",
+	"DeleteImage": "Bild l\u00f6schen",
+	"DeleteImageConfirmation": "M\u00f6chten Sie das Bild wirklich l\u00f6schen?",
+	"FileReadCancelled": "Das Einlesen der Datei wurde abgebrochen.",
+	"FileNotFound": "Datei nicht gefunden",
+	"FileReadError": "Beim Lesen der Datei ist ein Fehler aufgetreten.",
+	"DeleteUser": "Benutzer l\u00f6schen",
+	"DeleteUserConfirmation": "M\u00f6chten Sie {0} wirklich l\u00f6schen?",
+	"PasswordResetHeader": "Passwort zur\u00fccksetzen",
+	"PasswordResetComplete": "Das Passwort wurde zur\u00fcckgesetzt.",
+	"PasswordResetConfirmation": "M\u00f6chten Sie das Passwort wirklich zur\u00fccksetzen?",
+	"PasswordSaved": "Passwort gespeichert",
+	"PasswordMatchError": "Passwort und Passwortbest\u00e4tigung stimmen nicht \u00fcberein.",
+	"OptionOff": "Aus",
+	"OptionOn": "Ein",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Deinstalliere Plugin",
+	"UninstallPluginConfirmation": "M\u00f6chten Sie {0} wirklich deinstallieren?",
+	"NoPluginConfigurationMessage": "Bei diesem Plugin kann nichts eingestellt werden.",
+	"NoPluginsInstalledMessage": "Sie haben keine Plugins installiert.",
+	"BrowsePluginCatalogMessage": "Durchsuchen Sie unsere Bibliothek um alle verf\u00fcgbaren Plugins anzuzeigen."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
index 45f0d7e13..7184d4724 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -17,5 +17,15 @@
 	"PasswordResetComplete": "The password has been reset.",
 	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
 	"PasswordSaved": "Password saved.",
-	"PasswordMatchError": "Password and password confirmation must match."
+	"PasswordMatchError": "Password and password confirmation must match.",
+	"OptionOff": "Off",
+	"OptionOn": "On",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Uninstall Plugin",
+	"UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?",
+	"NoPluginConfigurationMessage": "This plugin has nothing to configure.",
+	"NoPluginsInstalledMessage": "You have no plugins installed.",
+	"BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
new file mode 100644
index 000000000..b0b9fd1a9
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "Configuracion guardada",
+	"AddUser": "Agregar usuario",
+	"Users": "Usuarios",
+	"Delete": "Borrar",
+	"Administrator": "Administrador",
+	"Password": "Contrase\u00f1a",
+	"CreatePassword": "Crear Contrase\u00f1a",
+	"DeleteImage": "Borrar Imagen",
+	"DeleteImageConfirmation": "Esta seguro que desea borrar esta imagen?",
+	"FileReadCancelled": "La lectura del archivo se ha cancelado.",
+	"FileNotFound": "Archivo no encontrado.",
+	"FileReadError": "Se encontr\u00f3 un error al leer el archivo.",
+	"DeleteUser": "Borrar Usuario",
+	"DeleteUserConfirmation": "Esta seguro que desea eliminar a {0}?",
+	"PasswordResetHeader": "Restablecer contrase\u00f1a",
+	"PasswordResetComplete": "La contrase\u00f1a se ha restablecido.",
+	"PasswordResetConfirmation": "Esta seguro que desea restablecer la contrase\u00f1a?",
+	"PasswordSaved": "Contrase\u00f1a guardada.",
+	"PasswordMatchError": "La contrase\u00f1a y la confirmaci\u00f3n de la contrase\u00f1a deben de ser iguales.",
+	"OptionOff": "Apagado",
+	"OptionOn": "Prendido",
+	"OptionRelease": "Liberar",
+	"OptionBeta": "Beta",
+	"OptionDev": "Desarrollo",
+	"UninstallPluginHeader": "Desinstalar Plugin",
+	"UninstallPluginConfirmation": "Esta seguro que desea desinstalar {0}?",
+	"NoPluginConfigurationMessage": "El plugin no requiere configuraci\u00f3n",
+	"NoPluginsInstalledMessage": "No tiene plugins instalados.",
+	"BrowsePluginCatalogMessage": "Navegar el catalogo de plugins para ver los plugins disponibles."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
new file mode 100644
index 000000000..9e1ebbfee
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "Param\u00e8tres sauvegard\u00e9s.",
+	"AddUser": "Ajout\u00e9 Usager",
+	"Users": "Usagers",
+	"Delete": "Supprimer",
+	"Administrator": "Administrateur",
+	"Password": "Mot de passe",
+	"CreatePassword": "Cr\u00e9er mot de passe",
+	"DeleteImage": "Supprimer Image",
+	"DeleteImageConfirmation": "\u00cates-vous s\u00fbr de vouloir supprimer l'image?",
+	"FileReadCancelled": "La lecture du fichier a \u00e9t\u00e9 annul\u00e9e.",
+	"FileNotFound": "Fichier non trouv\u00e9",
+	"FileReadError": "Un erreur est survenue pendant la lecture du fichier.",
+	"DeleteUser": "Supprimer Usager",
+	"DeleteUserConfirmation": "\u00cates-vous s\u00fbr de vouloir supprimer {0}?",
+	"PasswordResetHeader": "Red\u00e9marrage du mot de passe",
+	"PasswordResetComplete": "Le mot de passe a \u00e9t\u00e9 red\u00e9marr\u00e9.",
+	"PasswordResetConfirmation": "\u00cates-vous s\u00fbr de vouloir red\u00e9marrer le mot de passe?",
+	"PasswordSaved": "Mot de passe sauvegard\u00e9.",
+	"PasswordMatchError": "Mot de passe et confirmation de mot de passe doivent correspondre.",
+	"OptionOff": "Off",
+	"OptionOn": "On",
+	"OptionRelease": "Lancement",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "D\u00e9sinstaller module d'extention",
+	"UninstallPluginConfirmation": "\u00cates-vous s\u00fbr de vouloir d\u00e9sinstaller {0}?",
+	"NoPluginConfigurationMessage": "Ce module d'extension n'a rien \u00e0 configurer.",
+	"NoPluginsInstalledMessage": "Vous n'avez aucun module d'extension install\u00e9.",
+	"BrowsePluginCatalogMessage": "Explorer notre catalogue de modules d'extension pour voir ce qui est disponible."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 41f8508a5..6b014bf34 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -17,5 +17,15 @@
 	"PasswordResetComplete": "The password has been reset.",
 	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
 	"PasswordSaved": "Password saved.",
-	"PasswordMatchError": "Password and password confirmation must match."
+	"PasswordMatchError": "Password and password confirmation must match.",
+	"OptionOff": "Off",
+	"OptionOn": "On",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Uninstall Plugin",
+	"UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?",
+	"NoPluginConfigurationMessage": "This plugin has nothing to configure.",
+	"NoPluginsInstalledMessage": "You have no plugins installed.",
+	"BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
new file mode 100644
index 000000000..17a343283
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "Instellingen opgeslagen.",
+	"AddUser": "Gebruiker toevoegen",
+	"Users": "Gebruikers",
+	"Delete": "Verwijderen",
+	"Administrator": "Beheerder",
+	"Password": "Wachtwoord",
+	"CreatePassword": "Maak wachtwoord",
+	"DeleteImage": "Verwijder afbeelding",
+	"DeleteImageConfirmation": "Weet je zeker dat je deze afbeelding wilt verwijderen?",
+	"FileReadCancelled": "Het lezen van het bestand is geannuleerd",
+	"FileNotFound": "Bestand niet gevonden.",
+	"FileReadError": "Er is een fout opgetreden bij het lezen van het bestand.",
+	"DeleteUser": "Verwijder gebruiker",
+	"DeleteUserConfirmation": "Weet je zeker dat je {0} wilt verwijderen?",
+	"PasswordResetHeader": "Wachtwoord opnieuw instellen",
+	"PasswordResetComplete": "Het wachtwoord is opnieuw ingesteld.",
+	"PasswordResetConfirmation": "Weet je zeker dat je het wachtwoord opnieuw in wilt stellen?",
+	"PasswordSaved": "Wachtwoord opgeslagen.",
+	"PasswordMatchError": "Wachtwoord en wachtwoord bevestiging moeten hetzelfde zijn.",
+	"OptionOff": "Uit",
+	"OptionOn": "Aan",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Deinstalleer Plugin",
+	"UninstallPluginConfirmation": "Weet u zeker dat u {0} wilt deinstalleren?",
+	"NoPluginConfigurationMessage": "Deze plugin heeft niets in te stellen",
+	"NoPluginsInstalledMessage": "U heeft geen plugins geinstalleerd",
+	"BrowsePluginCatalogMessage": "Blader door de Plugincatalogus voor beschikbare plugins."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
index 25d3ff944..e81a18e79 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -8,14 +8,24 @@
 	"CreatePassword": "Criar Senha",
 	"DeleteImage": "Apagar Imagem",
 	"DeleteImageConfirmation": "Tem a certeza que pretende apagar a imagem?",
-	"FileReadCancelled": "The file read has been cancelled.",
+	"FileReadCancelled": "A leitura do ficheiro foi cancelada.",
 	"FileNotFound": "Ficheiro n\u00e3o encontrado",
 	"FileReadError": "Ocorreu um erro ao ler o ficheiro.",
 	"DeleteUser": "Apagar Utilizador",
 	"DeleteUserConfirmation": "Tem a certeza que pretende apagar {0}?",
-	"PasswordResetHeader": "Password Reset",
-	"PasswordResetComplete": "The password has been reset.",
-	"PasswordResetConfirmation": "Are you sure you wish to reset the password?",
+	"PasswordResetHeader": "Redefinir Senha",
+	"PasswordResetComplete": "A senha foi redefinida.",
+	"PasswordResetConfirmation": "Tem a certeza que pretende redefinir a senha?",
 	"PasswordSaved": "Senha guardada.",
-	"PasswordMatchError": "Password and password confirmation must match."
+	"PasswordMatchError": "A senha e a confirma\u00e7\u00e3o da senha devem coincidir.",
+	"OptionOff": "Desligado",
+	"OptionOn": "Ligado",
+	"OptionRelease": "Final",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Desinstalar extens\u00e3o",
+	"UninstallPluginConfirmation": "Tem a certeza que pretende desinstalar {0}?",
+	"NoPluginConfigurationMessage": "Esta extens\u00e3o n\u00e3o \u00e9 configur\u00e1vel.",
+	"NoPluginsInstalledMessage": "N\u00e3o tem extens\u00f5es instaladas.",
+	"BrowsePluginCatalogMessage": "Navegue o nosso cat\u00e1logo de extens\u00f5es para ser as extens\u00f5es dispon\u00edveis."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
new file mode 100644
index 000000000..b54e3f129
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b",
+	"AddUser": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
+	"Users": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
+	"Delete": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c",
+	"Administrator": "\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440",
+	"Password": "\u041f\u0430\u0440\u043e\u043b\u044c",
+	"CreatePassword": "\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c",
+	"DeleteImage": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+	"DeleteImageConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435?",
+	"FileReadCancelled": "\u0427\u0442\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 \u0431\u044b\u043b\u043e \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u043e",
+	"FileNotFound": "\u0424\u0430\u0439\u043b \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d",
+	"FileReadError": "\u0412\u043e \u0432\u0440\u0435\u043c\u044f \u0447\u0442\u0435\u043d\u0438\u044f \u0444\u0430\u0439\u043b\u0430 \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430",
+	"DeleteUser": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
+	"DeleteUserConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c {0}?",
+	"PasswordResetHeader": "\u0421\u0431\u0440\u043e\u0441 \u043f\u0430\u0440\u043e\u043b\u044f",
+	"PasswordResetComplete": "\u041f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u0441\u0431\u0440\u043e\u0448\u0435\u043d",
+	"PasswordResetConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c?",
+	"PasswordSaved": "\u041f\u0430\u0440\u043e\u043b\u044c \u0441\u043e\u0445\u0440\u0430\u043d\u0451\u043d",
+	"PasswordMatchError": "\u041f\u043e\u043b\u044f \u041f\u0430\u0440\u043e\u043b\u044c \u0438 \u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u043e\u043b\u044f \u0434\u043e\u043b\u0436\u043d\u044b \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0442\u044c",
+	"OptionOff": "\u0412\u044b\u043a\u043b.",
+	"OptionOn": "\u0412\u043a\u043b.",
+	"OptionRelease": "\u0412\u044b\u043f\u0443\u0441\u043a",
+	"OptionBeta": "\u0411\u0435\u0442\u0430",
+	"OptionDev": "\u0420\u0430\u0437\u0440\u0430\u0431.",
+	"UninstallPluginHeader": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043b\u0430\u0433\u0438\u043d",
+	"UninstallPluginConfirmation": "\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c {0}?",
+	"NoPluginConfigurationMessage": "\u0414\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043f\u043b\u0430\u0433\u0438\u043d\u0430 \u043d\u0435\u0442 \u043d\u0438\u043a\u0430\u043a\u0438\u0445 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a",
+	"NoPluginsInstalledMessage": "\u0423 \u0412\u0430\u0441 \u043d\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u043d\u0438 \u043e\u0434\u043d\u043e\u0433\u043e \u043f\u043b\u0430\u0433\u0438\u043d\u0430.",
+	"BrowsePluginCatalogMessage": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0438\u0442\u0435 \u043d\u0430\u0448 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0434\u043b\u044f \u043e\u0431\u0437\u043e\u0440\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
new file mode 100644
index 000000000..ca7b3a7c7
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -0,0 +1,31 @@
+{
+	"SettingsSaved": "\u8a2d\u7f6e\u5df2\u4fdd\u5b58",
+	"AddUser": "Add User",
+	"Users": "\u7528\u6236",
+	"Delete": "\u522a\u9664",
+	"Administrator": "\u7ba1\u7406\u54e1",
+	"Password": "\u5bc6\u78bc",
+	"CreatePassword": "\u5275\u5efa\u5bc6\u78bc",
+	"DeleteImage": "\u522a\u9664\u5716\u50cf",
+	"DeleteImageConfirmation": "\u4f60\u78ba\u5b9a\u8981\u522a\u9664\u9019\u5f35\u5716\u7247\uff1f",
+	"FileReadCancelled": "The file read has been cancelled.",
+	"FileNotFound": "File not found.",
+	"FileReadError": "An error occurred while reading the file.",
+	"DeleteUser": "\u522a\u9664\u7528\u6236",
+	"DeleteUserConfirmation": "Are you sure you wish to delete {0}?",
+	"PasswordResetHeader": "\u91cd\u8a2d\u5bc6\u78bc",
+	"PasswordResetComplete": "\u5bc6\u78bc\u5df2\u91cd\u8a2d",
+	"PasswordResetConfirmation": "\u4f60\u78ba\u5b9a\u8981\u91cd\u8a2d\u5bc6\u78bc\uff1f",
+	"PasswordSaved": "\u5bc6\u78bc\u5df2\u4fdd\u5b58\u3002",
+	"PasswordMatchError": "\u5bc6\u78bc\u548c\u78ba\u8a8d\u5bc6\u78bc\u5fc5\u9808\u4e00\u81f4\u3002",
+	"OptionOff": "Off",
+	"OptionOn": "On",
+	"OptionRelease": "Release",
+	"OptionBeta": "Beta",
+	"OptionDev": "Dev",
+	"UninstallPluginHeader": "Uninstall Plugin",
+	"UninstallPluginConfirmation": "Are you sure you wish to uninstall {0}?",
+	"NoPluginConfigurationMessage": "This plugin has nothing to configure.",
+	"NoPluginsInstalledMessage": "You have no plugins installed.",
+	"BrowsePluginCatalogMessage": "Browse our plugin catalog to view available plugins."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
index 6f39c6759..9b907ef74 100644
--- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
+++ b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Entities;
@@ -12,7 +13,6 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using MediaBrowser.Common.Extensions;
 
 namespace MediaBrowser.Server.Implementations.Localization
 {
@@ -334,9 +334,14 @@ namespace MediaBrowser.Server.Implementations.Localization
             return new List<LocalizatonOption>
             {
                 new LocalizatonOption{ Name="English (United States)", Value="en-us"},
+                new LocalizatonOption{ Name="Chinese Traditional", Value="zh-TW"},
+                new LocalizatonOption{ Name="Dutch", Value="nl"},
+                new LocalizatonOption{ Name="French", Value="fr"},
                 new LocalizatonOption{ Name="German", Value="de"},
+                new LocalizatonOption{ Name="Portuguese (Brazil)", Value="pt-BR"},
                 new LocalizatonOption{ Name="Portuguese (Portugal)", Value="pt-PT"},
-                new LocalizatonOption{ Name="Russian", Value="ru"}
+                new LocalizatonOption{ Name="Russian", Value="ru"},
+                new LocalizatonOption{ Name="Spanish", Value="es"}
 
             }.OrderBy(i => i.Name);
         }
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index ab3271b50..0aeaf3c50 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -4,7 +4,7 @@
 	"LabelGithubWiki": "Github Wiki",
 	"LabelSwagger": "Swagger",
 	"LabelStandard": "Standard",
-	"LabelViewApiDocumentation": "Zeige Api Dokumentation",
+	"LabelViewApiDocumentation": "Zeige API Dokumentation",
 	"LabelBrowseLibrary": "Durchsuche Bibliothek",
 	"LabelConfigureMediaBrowser": "Konfiguriere Media Browser",
 	"LabelOpenLibraryViewer": "\u00d6ffne Bibliothekenansicht",
@@ -13,5 +13,38 @@
 	"LabelPrevious": "Vorheriges",
 	"LabelFinish": "Ende",
 	"LabelNext": "N\u00e4chstes",
-	"LabelYoureDone": "Du bist fertig!"
+	"LabelYoureDone": "Du bist fertig!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index f74cca1eb..40269bde3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -13,5 +13,38 @@
 	"LabelPrevious": "Previous",
 	"LabelFinish": "Finish",
 	"LabelNext": "Next",
-	"LabelYoureDone": "You're Done!"
+	"LabelYoureDone": "You're Done!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
new file mode 100644
index 000000000..f475e1db4
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "Salir",
+	"LabelVisitCommunity": "Visitar la comunidad",
+	"LabelGithubWiki": "Wiki de Github",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Estandar",
+	"LabelViewApiDocumentation": "Ver documentacion de Api",
+	"LabelBrowseLibrary": "Navegar biblioteca",
+	"LabelConfigureMediaBrowser": "Configurar Media Browser",
+	"LabelOpenLibraryViewer": "Abrir el visor de la biblioteca",
+	"LabelRestartServer": "reiniciar el servidor",
+	"LabelShowLogWindow": "Mostrar la ventana del log",
+	"LabelPrevious": "Anterior",
+	"LabelFinish": "Terminar",
+	"LabelNext": "Siguiente",
+	"LabelYoureDone": "Ha Terminado!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
new file mode 100644
index 000000000..038fb5607
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "Quitter",
+	"LabelVisitCommunity": "Visiter Communaut\u00e9",
+	"LabelGithubWiki": "GitHub Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standard",
+	"LabelViewApiDocumentation": "Consulter la documentation API",
+	"LabelBrowseLibrary": "Naviguer la biblioth\u00e8que",
+	"LabelConfigureMediaBrowser": "Configurer Media Browser",
+	"LabelOpenLibraryViewer": "Ouvrir le navigateur de biblioth\u00e8que",
+	"LabelRestartServer": "Red\u00e9marrer Serveur",
+	"LabelShowLogWindow": "Afficher la fen\u00eatre du journal d'\u00e9v\u00e8nements",
+	"LabelPrevious": "Pr\u00e9c\u00e9dant",
+	"LabelFinish": "Termin\u00e9",
+	"LabelNext": "Suivant",
+	"LabelYoureDone": "Vous avez Termin\u00e9!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
new file mode 100644
index 000000000..0fcf20a53
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "Afsluiten",
+	"LabelVisitCommunity": "Bezoek de community",
+	"LabelGithubWiki": "Github Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standaard",
+	"LabelViewApiDocumentation": "Bekijk Api documentatie",
+	"LabelBrowseLibrary": "Bekijk bibliotheek",
+	"LabelConfigureMediaBrowser": "Configureer Media Browser",
+	"LabelOpenLibraryViewer": "Open bibliotheek verkenner",
+	"LabelRestartServer": "Herstart server",
+	"LabelShowLogWindow": "Toon log venster",
+	"LabelPrevious": "Vorige",
+	"LabelFinish": "Finish",
+	"LabelNext": "Volgende",
+	"LabelYoureDone": "Gereed!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
new file mode 100644
index 000000000..a7997e5a2
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "Sair",
+	"LabelVisitCommunity": "Visite o Community",
+	"LabelGithubWiki": "Wiki do Github",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "Standard",
+	"LabelViewApiDocumentation": "View Api Documentation",
+	"LabelBrowseLibrary": "Browse Library",
+	"LabelConfigureMediaBrowser": "Configure Media Browser",
+	"LabelOpenLibraryViewer": "Open Library Viewer",
+	"LabelRestartServer": "Restart Server",
+	"LabelShowLogWindow": "Show Log Window",
+	"LabelPrevious": "Previous",
+	"LabelFinish": "Finish",
+	"LabelNext": "Next",
+	"LabelYoureDone": "You're Done!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index 700314708..9fddc4f98 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -13,5 +13,38 @@
 	"LabelPrevious": "Anterior",
 	"LabelFinish": "Terminar",
 	"LabelNext": "Seguinte",
-	"LabelYoureDone": "Concluiu!"
+	"LabelYoureDone": "Concluiu!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index 4cc6b90f7..5b673132e 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -2,16 +2,49 @@
 	"LabelExit": "\u0412\u044b\u0445\u043e\u0434",
 	"LabelVisitCommunity": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c \u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e",
 	"LabelGithubWiki": "\u0412\u0438\u043a\u0438 \u043d\u0430 Github",
-	"LabelSwagger": "\u041e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u0435",
-	"LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439",
+	"LabelSwagger": "\u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 Swagger",
+	"LabelStandard": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0430\u044f",
 	"LabelViewApiDocumentation": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u043f\u043e API",
 	"LabelBrowseLibrary": "\u041e\u0431\u043e\u0437\u0440\u0435\u0432\u0430\u0442\u0435\u043b\u044c \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
-	"LabelConfigureMediaBrowser": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 Media Browser",
-	"LabelOpenLibraryViewer": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
-	"LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440",
-	"LabelShowLogWindow": "\u041e\u043a\u043d\u043e \u0416\u0443\u0440\u043d\u0430\u043b\u0430",
+	"LabelConfigureMediaBrowser": "\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Media Browser",
+	"LabelOpenLibraryViewer": "\u0418\u0441\u0441\u043b\u0435\u0434\u043e\u0432\u0430\u0442\u044c \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0443",
+	"LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440",
+	"LabelShowLogWindow": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0416\u0443\u0440\u043d\u0430\u043b \u0432 \u043e\u043a\u043d\u0435",
 	"LabelPrevious": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u0435",
-	"LabelFinish": "\u0417\u0430\u043a\u043e\u043d\u0447\u0438\u0442\u044c",
+	"LabelFinish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c",
 	"LabelNext": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0435",
-	"LabelYoureDone": "\u0412\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u0438!"
+	"LabelYoureDone": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json
index 62a418391..9630509d3 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/server.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json
@@ -13,5 +13,38 @@
 	"LabelPrevious": "Previous",
 	"LabelFinish": "Finish",
 	"LabelNext": "Next",
-	"LabelYoureDone": "You're Done!"
+	"LabelYoureDone": "You're Done!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish</b> to view the <b>Dashboard</b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
new file mode 100644
index 000000000..6084c1511
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -0,0 +1,50 @@
+{
+	"LabelExit": "\u96e2\u958b",
+	"LabelVisitCommunity": "\u8a2a\u554f\u793e\u5340",
+	"LabelGithubWiki": "Github Wiki",
+	"LabelSwagger": "Swagger",
+	"LabelStandard": "\u6a19\u6dee",
+	"LabelViewApiDocumentation": "View Api Documentation",
+	"LabelBrowseLibrary": "Browse Library",
+	"LabelConfigureMediaBrowser": "Configure Media Browser",
+	"LabelOpenLibraryViewer": "Open Library Viewer",
+	"LabelRestartServer": "\u91cd\u65b0\u555f\u52d5\u670d\u52d9\u5668",
+	"LabelShowLogWindow": "\u986f\u793a\u65e5\u8a8c\u8996\u7a97",
+	"LabelPrevious": "\u4e0a\u4e00\u500b",
+	"LabelFinish": "\u5b8c\u7d50",
+	"LabelNext": "\u4e0b\u4e00\u500b",
+	"LabelYoureDone": "You're Done!",
+	"WelcomeToMediaBrowser": "Welcome to Media Browser!",
+	"LabelMediaBrowser": "Media Browser",
+	"ThisWizardWillGuideYou": "This wizard will help guide you through the setup process.",
+	"TellUsAboutYourself": "Tell us about yourself",
+	"LabelYourFirstName": "Your first name:",
+	"MoreUsersCanBeAddedLater": "More users can be added later within the Dashboard.",
+	"UserProfilesIntro": "Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and parental controls.",
+	"LabelWindowsService": "Windows Service",
+	"AWindowsServiceHasBeenInstalled": "A Windows Service has been installed.",
+	"WindowsServiceIntro1": "Media Browser Server normally runs as a desktop application with a tray icon, but if you prefer to run it as a background service, it can be started from the windows services control panel instead.",
+	"WindowsServiceIntro2": "If using the windows service, please note that it cannot be run at the same time as the tray icon, so you'll need to exit the tray in order to run the service. The service will also need to be configured with administrative privileges via the control panel. Please note that at this time the service is unable to self-update, so new versions will require manual interaction.",
+	"WizardCompleted": "That's all we need for now. Media Browser has begun collecting information about your media library. Check out some of our apps, and then click <b>Finish<\/b> to view the <b>Dashboard<\/b>.",
+	"LabelConfigureSettings": "Configure settings",
+	"LabelEnableVideoImageExtraction": "Enable video image extraction",
+	"VideoImageExtractionHelp": "For videos that don't already have images, and that we're unable to find internet images for. This will add some additional time to the initial library scan but will result in a more pleasing presentation.",
+	"LabelEnableChapterImageExtractionForMovies": "Extract chapter image extraction for Movies",
+	"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
+	"LabelEnableAutomaticPortMapping": "Enable automatic port mapping",
+	"LabelEnableAutomaticPortMappingHelp": "UPnP allows automated router configuration for easy remote access. This may not work with some router models.",
+	"ButtonOk": "Ok",
+	"ButtonCancel": "Cancel",
+	"HeaderSetupLibrary": "Setup your media library",
+	"ButtonAddMediaFolder": "Add media folder",
+	"LabelFolderType": "Folder type:",
+	"MediaFolderHelpPluginRequired": "* Requires the use of a plugin, e.g. GameBrowser or MB Bookshelf.",
+	"ReferToMediaLibraryWiki": "Refer to the media library wiki.",
+	"LabelCountry": "Country:",
+	"LabelLanguage": "Language:",
+	"HeaderPreferredMetadataLanguage": "Preferred metadata language:",
+	"LabelSaveLocalMetadata": "Save artwork and metadata into media folders",
+	"LabelSaveLocalMetadataHelp": "Saving artwork and metadata directly into media folders will put them in a place where they can be easily edited.",
+	"LabelDownloadInternetMetadata": "Download artwork and metadata from the internet",
+	"LabelDownloadInternetMetadataHelp": "Media Browser can download information about your media to enable rich presentations."
+}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 539b968c7..d06cf0181 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -290,6 +290,17 @@
     <EmbeddedResource Include="Localization\JavaScript\en_US.json" />
     <EmbeddedResource Include="Localization\JavaScript\pt_PT.json" />
     <EmbeddedResource Include="Localization\Server\en_US.json" />
+    <EmbeddedResource Include="Localization\JavaScript\de.json" />
+    <EmbeddedResource Include="Localization\JavaScript\fr.json" />
+    <EmbeddedResource Include="Localization\JavaScript\nl.json" />
+    <EmbeddedResource Include="Localization\JavaScript\ru.json" />
+    <EmbeddedResource Include="Localization\JavaScript\zh_TW.json" />
+    <EmbeddedResource Include="Localization\Server\fr.json" />
+    <EmbeddedResource Include="Localization\Server\nl.json" />
+    <EmbeddedResource Include="Localization\Server\zh_TW.json" />
+    <EmbeddedResource Include="Localization\JavaScript\es.json" />
+    <EmbeddedResource Include="Localization\Server\es.json" />
+    <EmbeddedResource Include="Localization\Server\pt_BR.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
index 7c8d71b4f..608e92b24 100644
--- a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
@@ -41,16 +41,6 @@ namespace MediaBrowser.Server.Implementations.Roku
             }
         }
 
-        public Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken)
-        {
-            return SendCommand(new WebSocketMessage<string>
-            {
-                MessageType = "SystemCommand",
-                Data = command.ToString()
-
-            }, cancellationToken);
-        }
-
         public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken)
         {
             return SendCommand(new WebSocketMessage<MessageCommand>
@@ -148,9 +138,9 @@ namespace MediaBrowser.Server.Implementations.Roku
         }
 
 
-        public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
+        public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
-            return SendCommand(new WebSocketMessage<GenericCommand>
+            return SendCommand(new WebSocketMessage<GeneralCommand>
             {
                 MessageType = "Command",
                 Data = command
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 00d2aa992..3b6e9fefb 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -661,24 +661,24 @@ namespace MediaBrowser.Server.Implementations.Session
             return session;
         }
 
-        public Task SendSystemCommand(Guid controllingSessionId, Guid sessionId, SystemCommand command, CancellationToken cancellationToken)
+        public Task SendMessageCommand(Guid controllingSessionId, Guid sessionId, MessageCommand command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
             var controllingSession = GetSession(controllingSessionId);
             AssertCanControl(session, controllingSession);
 
-            return session.SessionController.SendSystemCommand(command, cancellationToken);
+            return session.SessionController.SendMessageCommand(command, cancellationToken);
         }
 
-        public Task SendMessageCommand(Guid controllingSessionId, Guid sessionId, MessageCommand command, CancellationToken cancellationToken)
+        public Task SendGeneralCommand(Guid controllingSessionId, Guid sessionId, GeneralCommand command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
             var controllingSession = GetSession(controllingSessionId);
             AssertCanControl(session, controllingSession);
 
-            return session.SessionController.SendMessageCommand(command, cancellationToken);
+            return session.SessionController.SendGeneralCommand(command, cancellationToken);
         }
 
         public Task SendPlayCommand(Guid controllingSessionId, Guid sessionId, PlayRequest command, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
index ddf4ec2ca..3bb84fa0e 100644
--- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
+++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
@@ -57,18 +57,6 @@ namespace MediaBrowser.Server.Implementations.Session
             return socket;
         }
 
-        public Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken)
-        {
-            var socket = GetActiveSocket();
-
-            return socket.SendAsync(new WebSocketMessage<string>
-            {
-                MessageType = "SystemCommand",
-                Data = command.ToString()
-
-            }, cancellationToken);
-        }
-
         public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken)
         {
             var socket = GetActiveSocket();
@@ -199,13 +187,13 @@ namespace MediaBrowser.Server.Implementations.Session
             }, cancellationToken);
         }
 
-        public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
+        public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
             var socket = GetActiveSocket();
 
-            return socket.SendAsync(new WebSocketMessage<GenericCommand>
+            return socket.SendAsync(new WebSocketMessage<GeneralCommand>
             {
-                MessageType = "Command",
+                MessageType = "GeneralCommand",
                 Data = command
 
             }, cancellationToken);
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 2575434f4..b545156ec 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -879,6 +879,7 @@ namespace MediaBrowser.ServerApplication
                 ProgramDataPath = ApplicationPaths.ProgramDataPath,
                 LogPath = ApplicationPaths.LogDirectoryPath,
                 ItemsByNamePath = ApplicationPaths.ItemsByNamePath,
+                InternalMetadataPath = ApplicationPaths.InternalMetadataPath,
                 CachePath = ApplicationPaths.CachePath,
                 MacAddress = GetMacAddress(),
                 HttpServerPortNumber = HttpServerPort,
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 7313c089f..1b83fb2e9 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -219,7 +219,7 @@ namespace MediaBrowser.WebDashboard.Api
             var contentType = MimeTypes.GetMimeType(path);
 
             var isHtml = IsHtml(path);
-            var localizationCulture = isHtml ? GetLocalizationCulture() : null;
+            var localizationCulture = GetLocalizationCulture();
 
             // Don't cache if not configured to do so
             // But always cache images to simulate production
-- 
cgit v1.2.3