Fix some code smells

This commit is contained in:
gion 2020-05-15 20:06:41 +02:00
parent 029bb80910
commit 8c04049a59
2 changed files with 7 additions and 13 deletions

View file

@ -269,7 +269,7 @@ namespace Emby.Server.Implementations.Session
if (inactive.Any()) if (inactive.Any())
{ {
_logger.LogInformation("Sending ForceKeepAlive message to {0} inactive WebSockets.", inactive.Count()); _logger.LogInformation("Sending ForceKeepAlive message to {0} inactive WebSockets.", inactive.Count);
} }
foreach (var webSocket in inactive) foreach (var webSocket in inactive)
@ -289,7 +289,7 @@ namespace Emby.Server.Implementations.Session
{ {
if (lost.Any()) if (lost.Any())
{ {
_logger.LogInformation("Lost {0} WebSockets.", lost.Count()); _logger.LogInformation("Lost {0} WebSockets.", lost.Count);
foreach (var webSocket in lost) foreach (var webSocket in lost)
{ {
// TODO: handle session relative to the lost webSocket // TODO: handle session relative to the lost webSocket

View file

@ -182,13 +182,10 @@ namespace MediaBrowser.Api.SyncPlay
} }
// Both null and empty strings mean that client isn't playing anything // Both null and empty strings mean that client isn't playing anything
if (!String.IsNullOrEmpty(request.PlayingItemId)) if (!String.IsNullOrEmpty(request.PlayingItemId) && !Guid.TryParse(request.PlayingItemId, out playingItemId))
{ {
if (!Guid.TryParse(request.PlayingItemId, out playingItemId)) Logger.LogError("JoinGroup: {0} is not a valid format for PlayingItemId. Ignoring request.", request.PlayingItemId);
{ return;
Logger.LogError("JoinGroup: {0} is not a valid format for PlayingItemId. Ignoring request.", request.PlayingItemId);
return;
}
} }
var joinRequest = new JoinGroupRequest() var joinRequest = new JoinGroupRequest()
@ -220,12 +217,9 @@ namespace MediaBrowser.Api.SyncPlay
var currentSession = GetSession(_sessionContext); var currentSession = GetSession(_sessionContext);
var filterItemId = Guid.Empty; var filterItemId = Guid.Empty;
if (!String.IsNullOrEmpty(request.FilterItemId)) if (!String.IsNullOrEmpty(request.FilterItemId) && !Guid.TryParse(request.FilterItemId, out filterItemId))
{ {
if (!Guid.TryParse(request.FilterItemId, out filterItemId)) Logger.LogWarning("ListGroups: {0} is not a valid format for FilterItemId. Ignoring filter.", request.FilterItemId);
{
Logger.LogWarning("ListGroups: {0} is not a valid format for FilterItemId. Ignoring filter.", request.FilterItemId);
}
} }
return _syncPlayManager.ListGroups(currentSession, filterItemId); return _syncPlayManager.ListGroups(currentSession, filterItemId);