michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

improve people naming

Browse Source
This commit is contained in:
Luke Pulverenti 2015-03-20 13:17:03 -04:00
parent 881928323e
commit 6df78dcb34
4 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Api/UserLibrary/ArtistsService.cs
View File

@ -5,7 +5,6 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Persistence;
using MediaBrowser.Model.Dto; using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Querying;
using ServiceStack; using ServiceStack;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

9
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -886,7 +886,14 @@ namespace MediaBrowser.Server.Implementations.Library
if (type == typeof(Person)) 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) ? var fullPath = string.IsNullOrEmpty(subFolderPrefix) ?

25
MediaBrowser.Server.Implementations/Session/WebSocketController.cs
View File

@ -233,8 +233,6 @@ namespace MediaBrowser.Server.Implementations.Session
private Task SendMessageInternal<T>(WebSocketMessage<T> message, CancellationToken cancellationToken) private Task SendMessageInternal<T>(WebSocketMessage<T> message, CancellationToken cancellationToken)
{ {
if (SkipSending()) return Task.FromResult(true);
var socket = GetActiveSocket(); var socket = GetActiveSocket();
return socket.SendAsync(message, cancellationToken); return socket.SendAsync(message, cancellationToken);
@ -242,8 +240,6 @@ namespace MediaBrowser.Server.Implementations.Session
private Task SendMessagesInternal<T>(WebSocketMessage<T> message, CancellationToken cancellationToken) private Task SendMessagesInternal<T>(WebSocketMessage<T> message, CancellationToken cancellationToken)
{ {
if (SkipSending()) return Task.FromResult(true);
var tasks = GetActiveSockets().Select(i => Task.Run(async () => var tasks = GetActiveSockets().Select(i => Task.Run(async () =>
{ {
try try
@ -260,27 +256,6 @@ namespace MediaBrowser.Server.Implementations.Session
return Task.WhenAll(tasks); return Task.WhenAll(tasks);
} }
private bool SkipSending()
{
if (Session != null)
{
if (string.Equals(Session.Client, "mb-classic", StringComparison.OrdinalIgnoreCase))
{
Version version;
if (!string.IsNullOrWhiteSpace(Session.ApplicationVersion) && Version.TryParse(Session.ApplicationVersion, out version))
{
if (version < new Version(3, 0, 196))
{
_logger.Debug("Skipping web socket message to MBC version {0}.", version);
return true;
}
}
}
}
return false;
}
public void Dispose() public void Dispose()
{ {
foreach (var socket in Sockets.ToList()) foreach (var socket in Sockets.ToList())

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")] [assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5557.0")] //[assembly: AssemblyVersion("3.0.5557.0")]