From 6df78dcb342bd38792cde75498292e3f6ef15fd7 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 20 Mar 2015 13:17:03 -0400 Subject: improve people naming --- MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'MediaBrowser.Server.Implementations/Library') diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 1f82e7ef1..64e5d20c9 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -886,7 +886,14 @@ namespace MediaBrowser.Server.Implementations.Library if (type == typeof(Person)) { - subFolderPrefix = validFilename.Substring(0, 1); + var subFolderIndex = 0; + + while (!char.IsLetterOrDigit(validFilename[subFolderIndex])) + { + subFolderIndex++; + } + + subFolderPrefix = validFilename.Substring(subFolderIndex, 1); } var fullPath = string.IsNullOrEmpty(subFolderPrefix) ? -- cgit v1.2.3 From f91c30a4071291cb11f193da3cd435114cd43aba Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 22 Mar 2015 19:41:58 -0400 Subject: fixes #1048 --- .../Library/Validators/ArtistsValidator.cs | 5 ----- .../Playlists/PlaylistManager.cs | 2 -- MediaBrowser.Server.Implementations/Sync/SyncManager.cs | 11 +---------- 3 files changed, 1 insertion(+), 17 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library') diff --git a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs index 7636833e4..a964738e6 100644 --- a/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs +++ b/MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs @@ -2,7 +2,6 @@ using MediaBrowser.Controller.Library; using MediaBrowser.Model.Logging; using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; @@ -53,8 +52,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators .Distinct(StringComparer.OrdinalIgnoreCase) .ToList(); - var returnArtists = new List(allArtists.Count); - var numComplete = 0; var numArtists = allArtists.Count; @@ -67,8 +64,6 @@ namespace MediaBrowser.Server.Implementations.Library.Validators var artistItem = _libraryManager.GetArtist(artist); await artistItem.RefreshMetadata(cancellationToken).ConfigureAwait(false); - - returnArtists.Add(artistItem); } catch (IOException ex) { diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs index c511f40e0..a5cc0e0de 100644 --- a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs +++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs @@ -181,7 +181,6 @@ namespace MediaBrowser.Server.Implementations.Playlists } var list = new List(); - var itemList = new List(); var items = GetPlaylistItems(itemIds, playlist.MediaType, user) .Where(i => i.SupportsAddingToPlaylist) @@ -189,7 +188,6 @@ namespace MediaBrowser.Server.Implementations.Playlists foreach (var item in items) { - itemList.Add(item); list.Add(LinkedChild.Create(item)); } diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs index dc539b408..d489ac8d3 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs @@ -825,17 +825,8 @@ namespace MediaBrowser.Server.Implementations.Sync if (item != null) { - var usersWithAccess = new List(); - - foreach (var user in users) - { - if (IsUserVisible(item, user)) - { - usersWithAccess.Add(user); - } - } - response.ItemUserAccess[itemId] = users + .Where(i => IsUserVisible(item, i)) .Select(i => i.Id.ToString("N")) .OrderBy(i => i) .ToList(); -- cgit v1.2.3 From f66eac7ec5f9a4380558e0c0e8847b49b076917f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 23 Mar 2015 20:22:00 -0400 Subject: updated nuget --- MediaBrowser.Model/Dlna/StreamInfo.cs | 3 +++ .../Library/CoreResolutionIgnoreRule.cs | 5 ++++- Nuget/MediaBrowser.Common.Internal.nuspec | 4 ++-- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Model.Signed.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 ++-- 6 files changed, 13 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library') diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index fe7ff7d4c..4eb1c0a8e 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -151,6 +151,9 @@ namespace MediaBrowser.Model.Dlna list.Add(item.VideoProfile ?? string.Empty); list.Add(item.Cabac.HasValue ? item.Cabac.Value.ToString() : string.Empty); + string streamId = item.PlaybackInfo == null ? null : item.PlaybackInfo.StreamId; + list.Add(streamId ?? string.Empty); + return string.Format("Params={0}", string.Join(";", list.ToArray())); } diff --git a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs index db4910c52..3dda3f158 100644 --- a/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs +++ b/MediaBrowser.Server.Implementations/Library/CoreResolutionIgnoreRule.cs @@ -29,7 +29,10 @@ namespace MediaBrowser.Server.Implementations.Library "extrafanart", "extrathumbs", ".actors", - ".wd_tv" + ".wd_tv", + + // Synology + "eaDir" }; diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 5ca36d8f8..5f1c138b8 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.597 + 3.0.598 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index c8ee52f09..b5a0f3bba 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.597 + 3.0.598 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec index 35aca7ac0..085408f2e 100644 --- a/Nuget/MediaBrowser.Model.Signed.nuspec +++ b/Nuget/MediaBrowser.Model.Signed.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Model.Signed - 3.0.597 + 3.0.598 MediaBrowser.Model - Signed Edition Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 4f2225f8f..dca8aa61a 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.597 + 3.0.598 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - + -- cgit v1.2.3