diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index a8a288b7e..4b720c775 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -150,7 +150,7 @@ namespace MediaBrowser.Api /// Class UpdateUser /// [Route("/Users/{Id}", "POST", Summary = "Updates a user")] - [Authenticated(Roles = "Admin")] + [Authenticated] public class UpdateUser : UserDto, IReturnVoid { } diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj index ce0ed29a3..075754107 100644 --- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj +++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj @@ -53,10 +53,6 @@ False ..\packages\MediaBrowser.BdInfo.1.0.0.10\lib\net35\DvdLib.dll - - False - ..\packages\MediaBrowser.Naming.1.0.0.9\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll - False ..\packages\morelinq.1.1.0\lib\net35\MoreLinq.dll diff --git a/MediaBrowser.Providers/packages.config b/MediaBrowser.Providers/packages.config index c41b47259..be21e92dc 100644 --- a/MediaBrowser.Providers/packages.config +++ b/MediaBrowser.Providers/packages.config @@ -1,7 +1,6 @@  - \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs index 4abe56aca..b9896e9ce 100644 --- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs +++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs @@ -134,20 +134,6 @@ namespace MediaBrowser.Server.Implementations.Configuration { throw new ArgumentException("Invalid path substitution"); } - - if (!map.From.EndsWith(":\\") && !map.From.EndsWith(":/")) - { - map.From = map.From.TrimEnd('/').TrimEnd('\\'); - } - if (!map.To.EndsWith(":\\") && !map.To.EndsWith(":/")) - { - map.To = map.To.TrimEnd('/').TrimEnd('\\'); - } - - if (string.IsNullOrWhiteSpace(map.From) || string.IsNullOrWhiteSpace(map.To)) - { - throw new ArgumentException("Invalid path substitution"); - } } } diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index db14dc83f..63ced8559 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -16,6 +16,7 @@ using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using MediaBrowser.Naming.Audio; +using MediaBrowser.Naming.Common; using MediaBrowser.Naming.IO; using MediaBrowser.Naming.Video; using MediaBrowser.Server.Implementations.Library.Resolvers.TV; @@ -1625,13 +1626,13 @@ namespace MediaBrowser.Server.Implementations.Library public bool IsVideoFile(string path) { - var resolver = new VideoResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var resolver = new VideoResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); return resolver.IsVideoFile(path); } public bool IsAudioFile(string path) { - var parser = new AudioFileParser(new AudioOptions()); + var parser = new AudioFileParser(new ExtendedNamingOptions()); return parser.IsAudioFile(path); } @@ -1657,7 +1658,7 @@ namespace MediaBrowser.Server.Implementations.Library public ItemLookupInfo ParseName(string name) { - var resolver = new VideoResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var resolver = new VideoResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var result = resolver.CleanDateTime(name); var cleanName = resolver.CleanString(result.Name); @@ -1673,7 +1674,7 @@ namespace MediaBrowser.Server.Implementations.Library VideoType type, IEnumerable files) { - var resolver = new StackResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var resolver = new StackResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); StackResult result; List filteredFiles; diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs index a50059461..5ba07cdae 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs @@ -12,6 +12,7 @@ using MediaBrowser.Naming.Audio; using System; using System.Collections.Generic; using System.IO; +using MediaBrowser.Naming.Common; namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio { @@ -179,7 +180,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio /// true if [is multi disc album folder] [the specified path]; otherwise, false. private static bool IsMultiDiscAlbumFolder(string path) { - var parser = new AlbumParser(new AudioOptions(), new Naming.Logging.NullLogger()); + var parser = new AlbumParser(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var result = parser.ParseMultiPart(path); return result.IsMultiPart; diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs index ba2a32c13..f6d33079b 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs @@ -2,6 +2,7 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using MediaBrowser.Naming.Audio; +using MediaBrowser.Naming.Common; using MediaBrowser.Naming.Video; using System; @@ -43,7 +44,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers // If the path is a file check for a matching extensions if (!args.IsDirectory) { - var parser = new Naming.Video.VideoResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var parser = new Naming.Video.VideoResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var videoInfo = parser.ResolveFile(args.Path); if (videoInfo == null) diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs index 15125ac43..a2da9ff77 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using MediaBrowser.Naming.Audio; +using MediaBrowser.Naming.Common; using MediaBrowser.Naming.Video; namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies @@ -319,7 +320,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies return null; } - var resolver = new StackResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var resolver = new StackResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var result = resolver.ResolveDirectories(folderPaths); @@ -355,7 +356,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies var paths = sortedMovies.Select(i => i.Path).ToList(); - var resolver = new StackResolver(new ExpandedVideoOptions(), new AudioOptions(), new Naming.Logging.NullLogger()); + var resolver = new StackResolver(new ExtendedNamingOptions(), new Naming.Logging.NullLogger()); var result = resolver.ResolveFiles(paths); diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json index e6dadc4a5..d0975221e 100644 --- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json +++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json @@ -618,7 +618,7 @@ "MessageInvitationSentToUser": "An email has been sent to {0}, inviting them to accept your sharing invitation.", "MessageInvitationSentToNewUser": "An email has been sent to {0} inviting them to sign up with Media Browser.", "HeaderConnectionFailure": "Connection Failure", - "MessageUnableToConnectToServer": "We're unable to connect to the selected right now. Please try again later.", + "MessageUnableToConnectToServer": "We're unable to connect to the selected server right now. Please try again later.", "ButtonSelectServer": "Select server", "MessagePluginConfigurationRequiresLocalAccess": "To configure this plugin please sign in to your local server directly.", "MessageLoggedOutParentalControl": "Access is currently restricted. Please try again later.", diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 975e69471..3abcf83b6 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -51,7 +51,7 @@ False - ..\packages\MediaBrowser.Naming.1.0.0.9\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll + ..\packages\MediaBrowser.Naming.1.0.0.12\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll False diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index 97e78f457..634e8a979 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 1d254b914..7360f1915 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -508,14 +508,10 @@ namespace MediaBrowser.Server.Startup.Common RegisterSingleInstance(new SubtitleEncoder(LibraryManager, LogManager.GetLogger("SubtitleEncoder"), ApplicationPaths, FileSystemManager, MediaEncoder, JsonSerializer)); - var displayPreferencesTask = Task.Run(async () => await ConfigureDisplayPreferencesRepositories().ConfigureAwait(false)); - var itemsTask = Task.Run(async () => await ConfigureItemRepositories().ConfigureAwait(false)); - var userdataTask = Task.Run(async () => await ConfigureUserDataRepositories().ConfigureAwait(false)); - + await ConfigureDisplayPreferencesRepositories().ConfigureAwait(false); + await ConfigureItemRepositories().ConfigureAwait(false); + await ConfigureUserDataRepositories().ConfigureAwait(false); await ConfigureNotificationsRepository().ConfigureAwait(false); - progress.Report(92); - - await Task.WhenAll(itemsTask, displayPreferencesTask, userdataTask).ConfigureAwait(false); progress.Report(100); SetStaticProperties(); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 3dded5d98..6b872d55f 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -57,9 +57,9 @@ ..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll - + False - ..\packages\WebMarkupMin.Core.0.9.8\lib\net40\WebMarkupMin.Core.dll + ..\packages\WebMarkupMin.Core.0.9.9\lib\net40\WebMarkupMin.Core.dll diff --git a/MediaBrowser.WebDashboard/app.config b/MediaBrowser.WebDashboard/app.config index b158873ef..7e2967809 100644 --- a/MediaBrowser.WebDashboard/app.config +++ b/MediaBrowser.WebDashboard/app.config @@ -11,6 +11,7 @@ + diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index 37be290ee..a7cbac285 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file