alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-08 11:22:23 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix code issues

Browse Source
This commit is contained in:
gion
2020-05-09 14:34:07 +02:00
parent 8a6ec2fb71
commit 5c8cbd4087
8 changed files with 86 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
MediaBrowser.Api/SyncPlay/SyncPlayService.cs
View File

@@ -171,31 +171,35 @@ namespace MediaBrowser.Api.SyncPlay
public void Post(SyncPlayJoinGroup request)
{
var currentSession = GetSession(_sessionContext);
var joinRequest = new JoinGroupRequest()
Guid groupId;
Guid playingItemId = Guid.Empty;
var valid = Guid.TryParse(request.GroupId, out groupId);
if (!valid)
{
GroupId = Guid.Parse(request.GroupId)
};
Logger.LogError("JoinGroup: {0} is not a valid format for GroupId. Ignoring request.", request.GroupId);
return;
}
// Both null and empty strings mean that client isn't playing anything
if (!String.IsNullOrEmpty(request.PlayingItemId))
{
try
{
joinRequest.PlayingItemId = Guid.Parse(request.PlayingItemId);
}
catch (ArgumentNullException)
{
// Should never happen, but just in case
Logger.LogError("JoinGroup: null value for PlayingItemId. Ignoring request.");
return;
}
catch (FormatException)
valid = Guid.TryParse(request.PlayingItemId, out playingItemId);
if (!valid)
{
Logger.LogError("JoinGroup: {0} is not a valid format for PlayingItemId. Ignoring request.", request.PlayingItemId);
return;
}
}
_syncPlayManager.JoinGroup(currentSession, request.GroupId, joinRequest, CancellationToken.None);
var joinRequest = new JoinGroupRequest()
{
GroupId = groupId,
PlayingItemId = playingItemId
};
_syncPlayManager.JoinGroup(currentSession, groupId, joinRequest, CancellationToken.None);
}
/// <summary>
@@ -217,21 +221,16 @@ namespace MediaBrowser.Api.SyncPlay
{
var currentSession = GetSession(_sessionContext);
var filterItemId = Guid.Empty;
if (!String.IsNullOrEmpty(request.FilterItemId))
{
try
{
filterItemId = Guid.Parse(request.FilterItemId);
}
catch (ArgumentNullException)
{
Logger.LogWarning("ListGroups: null value for FilterItemId. Ignoring filter.");
}
catch (FormatException)
var valid = Guid.TryParse(request.FilterItemId, out filterItemId);
if (!valid)
{
Logger.LogWarning("ListGroups: {0} is not a valid format for FilterItemId. Ignoring filter.", request.FilterItemId);
}
}
return _syncPlayManager.ListGroups(currentSession, filterItemId);
}