aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/ConnectService.cs55
-rw-r--r--MediaBrowser.Api/PinLoginService.cs85
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs16
-rw-r--r--MediaBrowser.Api/Playback/Progressive/VideoService.cs4
-rw-r--r--MediaBrowser.Api/Playback/StreamRequest.cs3
-rw-r--r--MediaBrowser.Api/UserService.cs17
6 files changed, 83 insertions, 97 deletions
diff --git a/MediaBrowser.Api/ConnectService.cs b/MediaBrowser.Api/ConnectService.cs
index bdd2eeaad..4bcd33d9e 100644
--- a/MediaBrowser.Api/ConnectService.cs
+++ b/MediaBrowser.Api/ConnectService.cs
@@ -1,10 +1,8 @@
-using System;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Connect;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
using MediaBrowser.Model.Connect;
-using MediaBrowser.Model.Dto;
using ServiceStack;
using System.Collections.Generic;
using System.Linq;
@@ -75,28 +73,6 @@ namespace MediaBrowser.Api
public string ConnectUserId { get; set; }
}
- [Route("/Connect/Supporters", "GET")]
- [Authenticated(Roles = "Admin")]
- public class GetConnectSupporterSummary : IReturn<ConnectSupporterSummary>
- {
- }
-
- [Route("/Connect/Supporters", "DELETE")]
- [Authenticated(Roles = "Admin")]
- public class RemoveConnectSupporter : IReturnVoid
- {
- [ApiMember(Name = "Id", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "DELETE")]
- public string Id { get; set; }
- }
-
- [Route("/Connect/Supporters", "POST")]
- [Authenticated(Roles = "Admin")]
- public class AddConnectSupporter : IReturnVoid
- {
- [ApiMember(Name = "Id", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
- public string Id { get; set; }
- }
-
public class ConnectService : BaseApiService
{
private readonly IConnectManager _connectManager;
@@ -108,35 +84,6 @@ namespace MediaBrowser.Api
_userManager = userManager;
}
- public async Task<object> Get(GetConnectSupporterSummary request)
- {
- var result = await _connectManager.GetConnectSupporterSummary().ConfigureAwait(false);
- var existingConnectUserIds = result.Users.Select(i => i.Id).ToList();
-
- result.EligibleUsers = _userManager.Users
- .Where(i => !string.IsNullOrWhiteSpace(i.ConnectUserId))
- .Where(i => !existingConnectUserIds.Contains(i.ConnectUserId, StringComparer.OrdinalIgnoreCase))
- .OrderBy(i => i.Name)
- .Select(i => _userManager.GetUserDto(i))
- .ToList();
-
- return ToOptimizedResult(result);
- }
-
- public void Delete(RemoveConnectSupporter request)
- {
- var task = _connectManager.RemoveConnectSupporter(request.Id);
-
- Task.WaitAll(task);
- }
-
- public void Post(AddConnectSupporter request)
- {
- var task = _connectManager.AddConnectSupporter(request.Id);
-
- Task.WaitAll(task);
- }
-
public object Post(CreateConnectLink request)
{
return _connectManager.LinkUser(request.Id, request.ConnectUsername);
diff --git a/MediaBrowser.Api/PinLoginService.cs b/MediaBrowser.Api/PinLoginService.cs
index 8b63de10a..a4957651f 100644
--- a/MediaBrowser.Api/PinLoginService.cs
+++ b/MediaBrowser.Api/PinLoginService.cs
@@ -1,9 +1,14 @@
using System;
using System.Collections.Concurrent;
using System.Globalization;
+using System.Threading.Tasks;
using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Connect;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Session;
using ServiceStack;
namespace MediaBrowser.Api
@@ -13,6 +18,8 @@ namespace MediaBrowser.Api
{
[ApiMember(Name = "DeviceId", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string DeviceId { get; set; }
+ [ApiMember(Name = "AppName", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
+ public string AppName { get; set; }
}
[Route("/Auth/Pin", "GET", Summary = "Gets pin status")]
@@ -35,7 +42,7 @@ namespace MediaBrowser.Api
[Route("/Auth/Pin/Validate", "POST", Summary = "Validates a pin")]
[Authenticated]
- public class ValidatePinRequest : IReturnVoid
+ public class ValidatePinRequest : IReturn<SessionInfoDto>
{
[ApiMember(Name = "Pin", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Pin { get; set; }
@@ -43,10 +50,27 @@ namespace MediaBrowser.Api
public class PinLoginService : BaseApiService
{
- private readonly ConcurrentDictionary<string, MyPinStatus> _activeRequests = new ConcurrentDictionary<string, MyPinStatus>(StringComparer.OrdinalIgnoreCase);
+ private static readonly ConcurrentDictionary<string, MyPinStatus> _activeRequests = new ConcurrentDictionary<string, MyPinStatus>(StringComparer.OrdinalIgnoreCase);
+ private readonly ISessionManager _sessionManager;
+ private readonly IUserManager _userManager;
+
+ public PinLoginService(ISessionManager sessionManager, IUserManager userManager)
+ {
+ _sessionManager = sessionManager;
+ _userManager = userManager;
+ }
public object Post(CreatePinRequest request)
{
+ if (string.IsNullOrWhiteSpace(request.DeviceId))
+ {
+ throw new ArgumentNullException("DeviceId");
+ }
+ if (string.IsNullOrWhiteSpace(request.AppName))
+ {
+ throw new ArgumentNullException("AppName");
+ }
+
var pin = GetNewPin();
var value = new MyPinStatus
@@ -55,7 +79,8 @@ namespace MediaBrowser.Api
IsConfirmed = false,
IsExpired = false,
Pin = pin,
- DeviceId = request.DeviceId
+ DeviceId = request.DeviceId,
+ AppName = request.AppName
};
_activeRequests.AddOrUpdate(pin, value, (k, v) => value);
@@ -75,6 +100,7 @@ namespace MediaBrowser.Api
if (!_activeRequests.TryGetValue(request.Pin, out status))
{
+ Logger.Debug("Pin {0} not found.", request.Pin);
throw new ResourceNotFoundException();
}
@@ -88,12 +114,13 @@ namespace MediaBrowser.Api
});
}
- public object Post(ExchangePinRequest request)
+ public async Task<object> Post(ExchangePinRequest request)
{
MyPinStatus status;
if (!_activeRequests.TryGetValue(request.Pin, out status))
{
+ Logger.Debug("Pin {0} not found.", request.Pin);
throw new ResourceNotFoundException();
}
@@ -104,14 +131,24 @@ namespace MediaBrowser.Api
throw new ResourceNotFoundException();
}
- return ToOptimizedResult(new PinExchangeResult
+ var auth = AuthorizationContext.GetAuthorizationInfo(Request);
+ var user = _userManager.GetUserById(status.UserId);
+
+ var result = await _sessionManager.CreateNewSession(new AuthenticationRequest
{
- // TODO: Add access token
- UserId = status.UserId
- });
+ App = auth.Client,
+ AppVersion = auth.Version,
+ DeviceId = auth.DeviceId,
+ DeviceName = auth.Device,
+ RemoteEndPoint = Request.RemoteIp,
+ Username = user.Name
+
+ }).ConfigureAwait(false);
+
+ return ToOptimizedResult(result);
}
- public void Post(ValidatePinRequest request)
+ public object Post(ValidatePinRequest request)
{
MyPinStatus status;
@@ -124,12 +161,18 @@ namespace MediaBrowser.Api
status.IsConfirmed = true;
status.UserId = AuthorizationContext.GetAuthorizationInfo(Request).UserId;
+
+ return ToOptimizedResult(new ValidatePinResult
+ {
+ AppName = status.AppName
+ });
}
private void EnsureValid(string requestedDeviceId, MyPinStatus status)
{
if (!string.Equals(requestedDeviceId, status.DeviceId, StringComparison.OrdinalIgnoreCase))
{
+ Logger.Debug("Pin device Id's do not match. requestedDeviceId: {0}, status.DeviceId: {1}", requestedDeviceId, status.DeviceId);
throw new ResourceNotFoundException();
}
@@ -145,6 +188,7 @@ namespace MediaBrowser.Api
if (status.IsExpired)
{
+ Logger.Debug("Pin {0} is expired", status.Pin);
throw new ResourceNotFoundException();
}
}
@@ -163,16 +207,7 @@ namespace MediaBrowser.Api
private string GetNewPinInternal()
{
- var length = 5;
- var pin = string.Empty;
-
- while (pin.Length < length)
- {
- var digit = new Random().Next(0, 9);
- pin += digit.ToString(CultureInfo.InvariantCulture);
- }
-
- return pin;
+ return new Random().Next(10000, 99999).ToString(CultureInfo.InvariantCulture);
}
private bool IsPinActive(string pin)
@@ -181,15 +216,15 @@ namespace MediaBrowser.Api
if (!_activeRequests.TryGetValue(pin, out status))
{
- return true;
+ return false;
}
if (status.IsExpired)
{
- return true;
+ return false;
}
- return false;
+ return true;
}
public class MyPinStatus : PinStatusResult
@@ -197,6 +232,12 @@ namespace MediaBrowser.Api
public DateTime CreationTimeUtc { get; set; }
public string DeviceId { get; set; }
public string UserId { get; set; }
+ public string AppName { get; set; }
}
}
+
+ public class ValidatePinResult
+ {
+ public string AppName { get; set; }
+ }
}
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index bae8074fd..33995bee3 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1462,6 +1462,13 @@ namespace MediaBrowser.Api.Playback
{
// Duplicating ItemId because of MediaMonkey
}
+ else if (i == 24)
+ {
+ if (videoRequest != null)
+ {
+ videoRequest.CopyTimestamps = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
+ }
+ }
}
}
@@ -2021,6 +2028,11 @@ namespace MediaBrowser.Api.Playback
state.EstimateContentLength = transcodingProfile.EstimateContentLength;
state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
+
+ if (state.VideoRequest != null)
+ {
+ state.VideoRequest.CopyTimestamps = transcodingProfile.CopyTimestamps;
+ }
}
}
}
@@ -2184,9 +2196,9 @@ namespace MediaBrowser.Api.Playback
if (state.VideoRequest != null)
{
- if (string.Equals(state.OutputContainer, "mkv", StringComparison.OrdinalIgnoreCase))
+ if (string.Equals(state.OutputContainer, "mkv", StringComparison.OrdinalIgnoreCase) && state.VideoRequest.CopyTimestamps)
{
- //inputModifier += " -noaccurate_seek";
+ inputModifier += " -noaccurate_seek";
}
}
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index eaf65bd6b..50aa2df19 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -137,9 +137,9 @@ namespace MediaBrowser.Api.Playback.Progressive
var isOutputMkv = string.Equals(state.OutputContainer, "mkv", StringComparison.OrdinalIgnoreCase);
- if (state.RunTimeTicks.HasValue)
+ if (state.RunTimeTicks.HasValue && state.VideoRequest.CopyTimestamps)
{
- //args += " -copyts -avoid_negative_ts disabled -start_at_zero";
+ args += " -copyts -avoid_negative_ts disabled -start_at_zero";
}
if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase))
diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs
index 69f8e6e04..1135a3a54 100644
--- a/MediaBrowser.Api/Playback/StreamRequest.cs
+++ b/MediaBrowser.Api/Playback/StreamRequest.cs
@@ -187,6 +187,9 @@ namespace MediaBrowser.Api.Playback
[ApiMember(Name = "EnableAutoStreamCopy", Description = "Whether or not to allow automatic stream copy if requested values match the original source. Defaults to true.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool EnableAutoStreamCopy { get; set; }
+ [ApiMember(Name = "CopyTimestamps", Description = "Whether or not to copy timestamps when transcoding with an offset. Defaults to false.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+ public bool CopyTimestamps { get; set; }
+
[ApiMember(Name = "Cabac", Description = "Enable if cabac encoding is required", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool? Cabac { get; set; }
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 3996a0311..a35a1c3a2 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -415,23 +415,6 @@ namespace MediaBrowser.Api
{
var auth = AuthorizationContext.GetAuthorizationInfo(Request);
- if (string.IsNullOrWhiteSpace(auth.Client))
- {
- auth.Client = "Unknown app";
- }
- if (string.IsNullOrWhiteSpace(auth.Device))
- {
- auth.Device = "Unknown device";
- }
- if (string.IsNullOrWhiteSpace(auth.Version))
- {
- auth.Version = "Unknown version";
- }
- if (string.IsNullOrWhiteSpace(auth.DeviceId))
- {
- auth.DeviceId = "Unknown device id";
- }
-
var result = await _sessionMananger.AuthenticateNewSession(new AuthenticationRequest
{
App = auth.Client,
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-06 00:06:52 +0000