diff options
Diffstat (limited to 'MediaBrowser.Controller')
9 files changed, 25 insertions, 107 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 474d14ee1..d30f11f7d 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -951,33 +951,6 @@ namespace MediaBrowser.Controller.Entities } /// <summary> - /// Finds an item by ID, recursively - /// </summary> - /// <param name="id">The id.</param> - /// <param name="user">The user.</param> - /// <returns>BaseItem.</returns> - /// <exception cref="System.ArgumentNullException">id</exception> - public virtual BaseItem FindItemById(Guid id, User user) - { - if (id == Guid.Empty) - { - throw new ArgumentNullException("id"); - } - - if (Id == id) - { - return this; - } - - if (LocalTrailers != null) - { - return LocalTrailers.FirstOrDefault(i => i.Id == id); - } - - return null; - } - - /// <summary> /// Finds the particular item by searching through our parents and, if not found there, loading from repo /// </summary> /// <param name="id">The id.</param> diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 83f29e58b..5a61844c2 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -673,7 +673,7 @@ namespace MediaBrowser.Controller.Entities foreach (var item in changedArgs.ItemsRemoved) { - Logger.Info("** " + item.Name + " Removed from library."); + Logger.Debug("** " + item.Name + " Removed from library."); } var childrenReplaced = false; @@ -688,7 +688,7 @@ namespace MediaBrowser.Controller.Entities foreach (var item in changedArgs.ItemsAdded) { - Logger.Info("** " + item.Name + " Added to library."); + Logger.Debug("** " + item.Name + " Added to library."); if (!childrenReplaced) { @@ -701,7 +701,7 @@ namespace MediaBrowser.Controller.Entities await Task.WhenAll(saveTasks).ConfigureAwait(false); //and save children in repo... - Logger.Info("*** Saving " + newChildren.Count + " children for " + Name); + Logger.Debug("*** Saving " + newChildren.Count + " children for " + Name); await Kernel.Instance.ItemRepository.SaveChildren(Id, newChildren, CancellationToken.None).ConfigureAwait(false); } @@ -914,36 +914,6 @@ namespace MediaBrowser.Controller.Entities } /// <summary> - /// Finds an item by ID, recursively - /// </summary> - /// <param name="id">The id.</param> - /// <param name="user">The user.</param> - /// <returns>BaseItem.</returns> - public override BaseItem FindItemById(Guid id, User user) - { - var result = base.FindItemById(id, user); - - if (result != null) - { - return result; - } - - var children = user == null ? ActualChildren : GetChildren(user); - - foreach (var child in children) - { - result = child.FindItemById(id, user); - - if (result != null) - { - return result; - } - } - - return null; - } - - /// <summary> /// Finds an item by path, recursively /// </summary> /// <param name="path">The path.</param> diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs index 5d8ada21f..a9dfde7f9 100644 --- a/MediaBrowser.Controller/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -118,30 +118,7 @@ namespace MediaBrowser.Controller.Entities.Movies cancellationToken.ThrowIfCancellationRequested(); return result; - } - - /// <summary> - /// Finds an item by ID, recursively - /// </summary> - /// <param name="id">The id.</param> - /// <param name="user">The user.</param> - /// <returns>BaseItem.</returns> - public override BaseItem FindItemById(Guid id, User user) - { - var item = base.FindItemById(id, user); - - if (item != null) - { - return item; - } - - if (SpecialFeatures != null) - { - return SpecialFeatures.FirstOrDefault(i => i.Id == id); - } - - return null; - } + } /// <summary> /// Loads special features from the file system diff --git a/MediaBrowser.Controller/Extensions/XmlExtensions.cs b/MediaBrowser.Controller/Extensions/XmlExtensions.cs index 00bee7d1d..8698730d4 100644 --- a/MediaBrowser.Controller/Extensions/XmlExtensions.cs +++ b/MediaBrowser.Controller/Extensions/XmlExtensions.cs @@ -191,7 +191,6 @@ namespace MediaBrowser.Controller.Extensions if (!string.IsNullOrWhiteSpace(valueString)) { - int.TryParse(valueString, out value); } diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index c3102ab64..36c7eba1f 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -809,15 +809,19 @@ namespace MediaBrowser.Controller.Library /// Gets a BaseItem based upon it's client-side item id /// </summary> /// <param name="id">The id.</param> + /// <param name="userManager">The user manager.</param> + /// <param name="libraryManager">The library manager.</param> /// <param name="userId">The user id.</param> /// <returns>BaseItem.</returns> public static BaseItem GetItemByClientId(string id, IUserManager userManager, ILibraryManager libraryManager, Guid? userId = null) { - var isIdEmpty = string.IsNullOrEmpty(id); + if (string.IsNullOrEmpty(id)) + { + throw new ArgumentNullException("id"); + } // If the item is an indexed folder we have to do a special routine to get it - var isIndexFolder = !isIdEmpty && - id.IndexOf(IndexFolderDelimeter, StringComparison.OrdinalIgnoreCase) != -1; + var isIndexFolder = id.IndexOf(IndexFolderDelimeter, StringComparison.OrdinalIgnoreCase) != -1; if (isIndexFolder) { @@ -831,9 +835,7 @@ namespace MediaBrowser.Controller.Library if (userId.HasValue) { - item = isIdEmpty - ? userManager.GetUserById(userId.Value).RootFolder - : libraryManager.GetItemById(new Guid(id), userId.Value); + item = libraryManager.GetItemById(new Guid(id)); } else if (!isIndexFolder) { @@ -862,6 +864,8 @@ namespace MediaBrowser.Controller.Library /// </summary> /// <param name="id">The id.</param> /// <param name="userId">The user id.</param> + /// <param name="userManager">The user manager.</param> + /// <param name="libraryManager">The library manager.</param> /// <returns>BaseItem.</returns> private static BaseItem GetIndexFolder(string id, Guid userId, IUserManager userManager, ILibraryManager libraryManager) { diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs index 84a39db69..1b9d2f4b2 100644 --- a/MediaBrowser.Controller/Library/ILibraryManager.cs +++ b/MediaBrowser.Controller/Library/ILibraryManager.cs @@ -137,14 +137,6 @@ namespace MediaBrowser.Controller.Library BaseItem GetItemById(Guid id); /// <summary> - /// Gets the item by id. - /// </summary> - /// <param name="id">The id.</param> - /// <param name="userId">The user id.</param> - /// <returns>BaseItem.</returns> - BaseItem GetItemById(Guid id, Guid userId); - - /// <summary> /// Gets the intros. /// </summary> /// <param name="item">The item.</param> diff --git a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs index e61611828..a465adeb6 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Common.IO; +using System.Globalization; +using MediaBrowser.Common.IO; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.MediaInfo; @@ -61,6 +62,8 @@ namespace MediaBrowser.Controller.Providers.MediaInfo get { return MetadataProviderPriority.Second; } } + protected readonly CultureInfo UsCulture = new CultureInfo("en-US"); + /// <summary> /// Fetches metadata and returns true or false indicating if any work that requires persistence was done /// </summary> @@ -203,7 +206,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo if (!string.IsNullOrEmpty(streamInfo.sample_rate)) { - stream.SampleRate = int.Parse(streamInfo.sample_rate); + stream.SampleRate = int.Parse(streamInfo.sample_rate, UsCulture); } } else if (streamInfo.codec_type.Equals("subtitle", StringComparison.OrdinalIgnoreCase)) @@ -227,12 +230,12 @@ namespace MediaBrowser.Controller.Providers.MediaInfo { if (!string.IsNullOrEmpty(streamInfo.bit_rate)) { - stream.BitRate = int.Parse(streamInfo.bit_rate); + stream.BitRate = int.Parse(streamInfo.bit_rate, UsCulture); } else if (formatInfo != null && !string.IsNullOrEmpty(formatInfo.bit_rate)) { // If the stream info doesn't have a bitrate get the value from the media format info - stream.BitRate = int.Parse(formatInfo.bit_rate); + stream.BitRate = int.Parse(formatInfo.bit_rate, UsCulture); } } @@ -265,11 +268,11 @@ namespace MediaBrowser.Controller.Providers.MediaInfo if (parts.Length == 2) { - result = float.Parse(parts[0])/float.Parse(parts[1]); + result = float.Parse(parts[0], UsCulture) / float.Parse(parts[1], UsCulture); } else { - result = float.Parse(parts[0]); + result = float.Parse(parts[0], UsCulture); } return float.IsNaN(result) ? (float?)null : result; diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs index 603b7dcaa..a7cc4985b 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs @@ -69,7 +69,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo // If we got something, parse it if (!string.IsNullOrEmpty(duration)) { - audio.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(duration)).Ticks; + audio.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(duration, UsCulture)).Ticks; } if (data.format.tags != null) diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs index 06692b2bc..957000ae2 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs @@ -198,7 +198,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo if (needToSetRuntime && !string.IsNullOrEmpty(data.format.duration)) { - video.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(data.format.duration)).Ticks; + video.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(data.format.duration, UsCulture)).Ticks; } } |