open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10838 from barronpm/livetv-project

Browse Source 
Move Live TV code to Jellyfin.LiveTv
pull/10426/head^2
Cody Robibero 5 months ago committed by GitHub
parent 68fd9c469f 41de6d1741
commit 82df226246
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 218 additions and 134 deletions
Show Stats Download Patch File Download Diff File

9
Emby.Server.Implementations/ApplicationHost.cs
Unescape View File

@ -15,7 +15,6 @@ using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
using Emby.Naming.Common;
using Emby.Photos;
using Emby.Server.Implementations.Channels;
using Emby.Server.Implementations.Collections;
using Emby.Server.Implementations.Configuration;
using Emby.Server.Implementations.Cryptography;
@ -25,7 +24,6 @@ using Emby.Server.Implementations.Dto;
using Emby.Server.Implementations.HttpServer.Security;
using Emby.Server.Implementations.IO;
using Emby.Server.Implementations.Library;
using Emby.Server.Implementations.LiveTv;
using Emby.Server.Implementations.Localization;
using Emby.Server.Implementations.Playlists;
using Emby.Server.Implementations.Plugins;
@ -504,8 +502,6 @@ namespace Emby.Server.Implementations
serviceCollection.AddSingleton(_xmlSerializer);
serviceCollection.AddSingleton<IStreamHelper, StreamHelper>();
serviceCollection.AddSingleton<ICryptoProvider, CryptographyProvider>();
serviceCollection.AddSingleton<ISocketFactory, SocketFactory>();
@ -557,8 +553,6 @@ namespace Emby.Server.Implementations
serviceCollection.AddTransient(provider => new Lazy<ILiveTvManager>(provider.GetRequiredService<ILiveTvManager>));
serviceCollection.AddSingleton<IDtoService, DtoService>();
serviceCollection.AddSingleton<IChannelManager, ChannelManager>();
serviceCollection.AddSingleton<ISessionManager, SessionManager>();
serviceCollection.AddSingleton<ICollectionManager, CollectionManager>();
@ -567,9 +561,6 @@ namespace Emby.Server.Implementations
serviceCollection.AddSingleton<ISyncPlayManager, SyncPlayManager>();
serviceCollection.AddSingleton<LiveTvDtoService>();
serviceCollection.AddSingleton<ILiveTvManager, LiveTvManager>();
serviceCollection.AddSingleton<IUserViewManager, UserViewManager>();
serviceCollection.AddSingleton<IChapterManager, ChapterManager>();

1
Emby.Server.Implementations/Emby.Server.Implementations.csproj
Unescape View File

@ -22,7 +22,6 @@
<ItemGroup>
<PackageReference Include="DiscUtils.Udf" />
<PackageReference Include="Jellyfin.XmlTv" />
<PackageReference Include="Microsoft.Data.Sqlite" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />

35
Emby.Server.Implementations/Library/MediaSourceManager.cs
Unescape View File

@ -11,14 +11,15 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using EasyCaching.Core.Configurations;
using Jellyfin.Data.Entities;
using Jellyfin.Data.Enums;
using Jellyfin.Extensions.Json;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
@ -37,6 +38,7 @@ namespace Emby.Server.Implementations.Library
// Do not use a pipe here because Roku http requests to the server will fail, without any explicit error message.
private const char LiveStreamIdDelimeter = '_';
private readonly IServerApplicationHost _appHost;
private readonly IItemRepository _itemRepo;
private readonly IUserManager _userManager;
private readonly ILibraryManager _libraryManager;
@ -55,6 +57,7 @@ namespace Emby.Server.Implementations.Library
private IMediaSourceProvider[] _providers;
public MediaSourceManager(
IServerApplicationHost appHost,
IItemRepository itemRepo,
IApplicationPaths applicationPaths,
ILocalizationManager localizationManager,
@ -66,6 +69,7 @@ namespace Emby.Server.Implementations.Library
IMediaEncoder mediaEncoder,
IDirectoryService directoryService)
{
_appHost = appHost;
_itemRepo = itemRepo;
_userManager = userManager;
_libraryManager = libraryManager;
@ -799,6 +803,35 @@ namespace Emby.Server.Implementations.Library
return result.Item1;
}
public async Task<List<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken)
{
var stream = new MediaSourceInfo
{
EncoderPath = _appHost.GetApiUrlForLocalAccess() + "/LiveTv/LiveRecordings/" + info.Id + "/stream",
EncoderProtocol = MediaProtocol.Http,
Path = info.Path,
Protocol = MediaProtocol.File,
Id = info.Id,
SupportsDirectPlay = false,
SupportsDirectStream = true,
SupportsTranscoding = true,
IsInfiniteStream = true,
RequiresOpening = false,
RequiresClosing = false,
BufferMs = 0,
IgnoreDts = true,
IgnoreIndex = true
};
await new LiveStreamHelper(_mediaEncoder, _logger, _appPaths)
.AddMediaInfoWithProbe(stream, false, false, cancellationToken).ConfigureAwait(false);
return new List<MediaSourceInfo>
{
stream
};
}
public async Task CloseLiveStream(string id)
{
ArgumentException.ThrowIfNullOrEmpty(id);

13
Jellyfin.Server/CoreAppHost.cs
Unescape View File

@ -6,6 +6,8 @@ using Emby.Server.Implementations.Session;
using Jellyfin.Api.WebSocketListeners;
using Jellyfin.Drawing;
using Jellyfin.Drawing.Skia;
using Jellyfin.LiveTv;
using Jellyfin.LiveTv.Channels;
using Jellyfin.Server.Implementations;
using Jellyfin.Server.Implementations.Activity;
using Jellyfin.Server.Implementations.Devices;
@ -16,15 +18,18 @@ using Jellyfin.Server.Implementations.Users;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Authentication;
using MediaBrowser.Controller.BaseItemManager;
using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Devices;
using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Events;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.Lyrics;
using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Security;
using MediaBrowser.Controller.Trickplay;
using MediaBrowser.Model.Activity;
using MediaBrowser.Model.IO;
using MediaBrowser.Providers.Lyric;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
@ -96,6 +101,11 @@ namespace Jellyfin.Server
serviceCollection.AddScoped<IAuthenticationManager, AuthenticationManager>();
serviceCollection.AddSingleton<LiveTvDtoService>();
serviceCollection.AddSingleton<ILiveTvManager, LiveTvManager>();
serviceCollection.AddSingleton<IChannelManager, ChannelManager>();
serviceCollection.AddSingleton<IStreamHelper, StreamHelper>();
foreach (var type in GetExportTypes<ILyricProvider>())
{
serviceCollection.AddSingleton(typeof(ILyricProvider), type);
@ -117,6 +127,9 @@ namespace Jellyfin.Server
// Jellyfin.Server.Implementations
yield return typeof(JellyfinDbContext).Assembly;
// Jellyfin.LiveTv
yield return typeof(LiveTvManager).Assembly;
}
}
}

1
Jellyfin.Server/Jellyfin.Server.csproj
Unescape View File

@ -58,6 +58,7 @@
<ProjectReference Include="..\src\Jellyfin.Drawing\Jellyfin.Drawing.csproj" />
<ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
<ProjectReference Include="..\src\Jellyfin.Drawing.Skia\Jellyfin.Drawing.Skia.csproj" />
<ProjectReference Include="..\src\Jellyfin.LiveTv\Jellyfin.LiveTv.csproj" />
<ProjectReference Include="..\Jellyfin.Server.Implementations\Jellyfin.Server.Implementations.csproj" />
<ProjectReference Include="..\src\Jellyfin.MediaEncoding.Hls\Jellyfin.MediaEncoding.Hls.csproj" />
</ItemGroup>

14
Jellyfin.sln
Unescape View File

@ -87,6 +87,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.MediaEncoding.Hls.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.MediaEncoding.Keyframes.Tests", "tests\Jellyfin.MediaEncoding.Keyframes.Tests\Jellyfin.MediaEncoding.Keyframes.Tests.csproj", "{24960660-DE6C-47BF-AEEF-CEE8F19FE6C2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.LiveTv.Tests", "tests\Jellyfin.LiveTv.Tests\Jellyfin.LiveTv.Tests.csproj", "{C4F71272-C6BE-4C30-BE0D-4E6ED651D6D3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.LiveTv", "src\Jellyfin.LiveTv\Jellyfin.LiveTv.csproj", "{8C6B2B13-58A4-4506-9DAB-1F882A093FE0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -233,6 +237,14 @@ Global
{24960660-DE6C-47BF-AEEF-CEE8F19FE6C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24960660-DE6C-47BF-AEEF-CEE8F19FE6C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{24960660-DE6C-47BF-AEEF-CEE8F19FE6C2}.Release|Any CPU.Build.0 = Release|Any CPU
{C4F71272-C6BE-4C30-BE0D-4E6ED651D6D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4F71272-C6BE-4C30-BE0D-4E6ED651D6D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4F71272-C6BE-4C30-BE0D-4E6ED651D6D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4F71272-C6BE-4C30-BE0D-4E6ED651D6D3}.Release|Any CPU.Build.0 = Release|Any CPU
{8C6B2B13-58A4-4506-9DAB-1F882A093FE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8C6B2B13-58A4-4506-9DAB-1F882A093FE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8C6B2B13-58A4-4506-9DAB-1F882A093FE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8C6B2B13-58A4-4506-9DAB-1F882A093FE0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -259,6 +271,8 @@ Global
{08FFF49B-F175-4807-A2B5-73B0EBD9F716} = {C9F0AB5D-F4D7-40C8-A353-3305C86D6D4C}
{154872D9-6C12-4007-96E3-8F70A58386CE} = {C9F0AB5D-F4D7-40C8-A353-3305C86D6D4C}
{0A3FCC4D-C714-4072-B90F-E374A15F9FF9} = {C9F0AB5D-F4D7-40C8-A353-3305C86D6D4C}
{C4F71272-C6BE-4C30-BE0D-4E6ED651D6D3} = {FBBB5129-006E-4AD7-BAD5-8B7CA1D10ED6}
{8C6B2B13-58A4-4506-9DAB-1F882A093FE0} = {C9F0AB5D-F4D7-40C8-A353-3305C86D6D4C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3448830C-EBDC-426C-85CD-7BBB9651A7FE}

9
MediaBrowser.Controller/Library/IMediaSourceManager.cs
Unescape View File

@ -8,6 +8,7 @@ using System.Threading;
using System.Threading.Tasks;
using Jellyfin.Data.Entities;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
@ -116,6 +117,14 @@ namespace MediaBrowser.Controller.Library
/// <returns>An instance of <see cref="ILiveStream"/>.</returns>
public ILiveStream GetLiveStreamInfoByUniqueId(string uniqueId);
/// <summary>
/// Gets the media sources for an active recording.
/// </summary>
/// <param name="info">The <see cref="ActiveRecordingInfo"/>.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
/// <returns>A task containing the <see cref="MediaSourceInfo"/>'s for the recording.</returns>
Task<List<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken);
/// <summary>
/// Closes the media source.
/// </summary>

2
Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs → src/Jellyfin.LiveTv/Channels/ChannelDynamicMediaSourceProvider.cs
Unescape View File

@ -8,7 +8,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto;
namespace Emby.Server.Implementations.Channels
namespace Jellyfin.LiveTv.Channels
{
/// <summary>
/// A media source provider for channels.

2
Emby.Server.Implementations/Channels/ChannelImageProvider.cs → src/Jellyfin.LiveTv/Channels/ChannelImageProvider.cs
Unescape View File

@ -7,7 +7,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
namespace Emby.Server.Implementations.Channels
namespace Jellyfin.LiveTv.Channels
{
/// <summary>
/// An image provider for channels.

2
Emby.Server.Implementations/Channels/ChannelManager.cs → src/Jellyfin.LiveTv/Channels/ChannelManager.cs
Unescape View File

@ -34,7 +34,7 @@ using MusicAlbum = MediaBrowser.Controller.Entities.Audio.MusicAlbum;
using Season = MediaBrowser.Controller.Entities.TV.Season;
using Series = MediaBrowser.Controller.Entities.TV.Series;
namespace Emby.Server.Implementations.Channels
namespace Jellyfin.LiveTv.Channels
{
/// <summary>
/// The LiveTV channel manager.

2
Emby.Server.Implementations/Channels/ChannelPostScanTask.cs → src/Jellyfin.LiveTv/Channels/ChannelPostScanTask.cs
Unescape View File

@ -8,7 +8,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.Channels
namespace Jellyfin.LiveTv.Channels
{
/// <summary>
/// A task to remove all non-installed channels from the database.

2
Emby.Server.Implementations/Channels/RefreshChannelsScheduledTask.cs → src/Jellyfin.LiveTv/Channels/RefreshChannelsScheduledTask.cs
Unescape View File

@ -9,7 +9,7 @@ using MediaBrowser.Model.Globalization;
using MediaBrowser.Model.Tasks;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.Channels
namespace Jellyfin.LiveTv.Channels
{
/// <summary>
/// The "Refresh Channels" scheduled task.

3
Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs → src/Jellyfin.LiveTv/EmbyTV/DirectRecorder.cs
Unescape View File

@ -5,7 +5,6 @@ using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Jellyfin.Api.Helpers;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Streaming;
@ -13,7 +12,7 @@ using MediaBrowser.Model.Dto;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
public sealed class DirectRecorder : IRecorder
{

36
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs → src/Jellyfin.LiveTv/EmbyTV/EmbyTV.cs
Unescape View File

@ -14,14 +14,12 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Xml;
using Emby.Server.Implementations.Library;
using Jellyfin.Data.Enums;
using Jellyfin.Data.Events;
using Jellyfin.Extensions;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Progress;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
@ -39,7 +37,7 @@ using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Providers;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
public sealed class EmbyTV : ILiveTvService, ISupportsDirectStreamProvider, ISupportsNewTimerIds, IDisposable
{
@ -47,7 +45,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
private const int TunerDiscoveryDurationMs = 3000;
private readonly IServerApplicationHost _appHost;
private readonly ILogger<EmbyTV> _logger;
private readonly IHttpClientFactory _httpClientFactory;
private readonly IServerConfigurationManager _config;
@ -76,7 +73,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
private bool _disposed;
public EmbyTV(
IServerApplicationHost appHost,
IStreamHelper streamHelper,
IMediaSourceManager mediaSourceManager,
ILogger<EmbyTV> logger,
@ -91,7 +87,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{
Current = this;
_appHost = appHost;
_logger = logger;
_httpClientFactory = httpClientFactory;
_config = config;
@ -1021,35 +1016,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
throw new NotImplementedException();
}
public async Task<List<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken)
{
var stream = new MediaSourceInfo
{
EncoderPath = _appHost.GetApiUrlForLocalAccess() + "/LiveTv/LiveRecordings/" + info.Id + "/stream",
EncoderProtocol = MediaProtocol.Http,
Path = info.Path,
Protocol = MediaProtocol.File,
Id = info.Id,
SupportsDirectPlay = false,
SupportsDirectStream = true,
SupportsTranscoding = true,
IsInfiniteStream = true,
RequiresOpening = false,
RequiresClosing = false,
BufferMs = 0,
IgnoreDts = true,
IgnoreIndex = true
};
await new LiveStreamHelper(_mediaEncoder, _logger, _config.CommonApplicationPaths)
.AddMediaInfoWithProbe(stream, false, false, cancellationToken).ConfigureAwait(false);
return new List<MediaSourceInfo>
{
stream
};
}
public Task CloseLiveStream(string id, CancellationToken cancellationToken)
{
return Task.CompletedTask;

2
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs → src/Jellyfin.LiveTv/EmbyTV/EncodedRecorder.cs
Unescape View File

@ -23,7 +23,7 @@ using MediaBrowser.Model.Dto;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
public class EncodedRecorder : IRecorder
{

2
Emby.Server.Implementations/LiveTv/EmbyTV/EntryPoint.cs → src/Jellyfin.LiveTv/EmbyTV/EntryPoint.cs
Unescape View File

@ -3,7 +3,7 @@
using System.Threading.Tasks;
using MediaBrowser.Controller.Plugins;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
public sealed class EntryPoint : IServerEntryPoint
{

2
Emby.Server.Implementations/LiveTv/EmbyTV/EpgChannelData.cs → src/Jellyfin.LiveTv/EmbyTV/EpgChannelData.cs
Unescape View File

@ -4,7 +4,7 @@ using System;
using System.Collections.Generic;
using MediaBrowser.Controller.LiveTv;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
internal class EpgChannelData
{

2
Emby.Server.Implementations/LiveTv/EmbyTV/IRecorder.cs → src/Jellyfin.LiveTv/EmbyTV/IRecorder.cs
Unescape View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
public interface IRecorder : IDisposable
{

2
Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs → src/Jellyfin.LiveTv/EmbyTV/ItemDataProvider.cs
Unescape View File

@ -9,7 +9,7 @@ using System.Text.Json;
using Jellyfin.Extensions.Json;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
public class ItemDataProvider<T>
where T : class

2
Emby.Server.Implementations/LiveTv/EmbyTV/NfoConfigurationExtensions.cs → src/Jellyfin.LiveTv/EmbyTV/NfoConfigurationExtensions.cs
Unescape View File

@ -1,7 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Model.Configuration;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
/// <summary>
/// Class containing extension methods for working with the nfo configuration.

2
Emby.Server.Implementations/LiveTv/EmbyTV/RecordingHelper.cs → src/Jellyfin.LiveTv/EmbyTV/RecordingHelper.cs
Unescape View File

@ -5,7 +5,7 @@ using System.Globalization;
using System.Text;
using MediaBrowser.Controller.LiveTv;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
internal static class RecordingHelper
{

2
Emby.Server.Implementations/LiveTv/EmbyTV/SeriesTimerManager.cs → src/Jellyfin.LiveTv/EmbyTV/SeriesTimerManager.cs
Unescape View File

@ -4,7 +4,7 @@ using System;
using MediaBrowser.Controller.LiveTv;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
public class SeriesTimerManager : ItemDataProvider<SeriesTimerInfo>
{

2
Emby.Server.Implementations/LiveTv/EmbyTV/TimerManager.cs → src/Jellyfin.LiveTv/EmbyTV/TimerManager.cs
Unescape View File

@ -10,7 +10,7 @@ using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.LiveTv;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.EmbyTV
namespace Jellyfin.LiveTv.EmbyTV
{
public class TimerManager : ItemDataProvider<TimerInfo>
{

3
Emby.Server.Implementations/Library/ExclusiveLiveStream.cs → src/Jellyfin.LiveTv/ExclusiveLiveStream.cs
Unescape View File

@ -1,5 +1,6 @@
#nullable disable
#pragma warning disable CA1711
#pragma warning disable CS1591
using System;
@ -10,7 +11,7 @@ using System.Threading.Tasks;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.Dto;
namespace Emby.Server.Implementations.Library
namespace Jellyfin.LiveTv
{
public sealed class ExclusiveLiveStream : ILiveStream
{

23
src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj
Unescape View File

@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Jellyfin.LiveTv.Tests</_Parameter1>
</AssemblyAttribute>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Jellyfin.XmlTv" />
<PackageReference Include="System.Linq.Async" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
<ProjectReference Include="..\..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
<ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
</ItemGroup>
</Project>

6
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirect.cs
Unescape View File

@ -16,9 +16,9 @@ using System.Text;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos;
using Jellyfin.Extensions;
using Jellyfin.Extensions.Json;
using Jellyfin.LiveTv.Listings.SchedulesDirectDtos;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Authentication;
using MediaBrowser.Controller.LiveTv;
@ -27,7 +27,7 @@ using MediaBrowser.Model.Entities;
using MediaBrowser.Model.LiveTv;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.Listings
namespace Jellyfin.LiveTv.Listings
{
public class SchedulesDirect : IListingsProvider, IDisposable
{
@ -613,6 +613,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
// Response is automatically disposed in the calling function,
// so dispose manually if not returning.
#pragma warning disable IDISP016, IDISP017
response.Dispose();
if (!enableRetry || (int)response.StatusCode >= 500)
{
@ -621,6 +622,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
null,
response.StatusCode);
}
#pragma warning restore IDISP016, IDISP017
_tokens.Clear();
options.Headers.TryAddWithoutValidation("token", await GetToken(providerInfo, cancellationToken).ConfigureAwait(false));

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/BroadcasterDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/BroadcasterDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Broadcaster dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CaptionDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/CaptionDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Caption dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CastDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/CastDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Cast dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ChannelDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ChannelDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Channel dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ContentRatingDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ContentRatingDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Content rating dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/CrewDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/CrewDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Crew dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DayDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/DayDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Day dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description1000Dto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/Description1000Dto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Description 1_000 dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/Description100Dto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/Description100Dto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Description 100 dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/DescriptionsProgramDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/DescriptionsProgramDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Descriptions program dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/EventDetailsDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/EventDetailsDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Event details dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/GracenoteDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/GracenoteDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Gracenote dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/HeadendsDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/HeadendsDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Headends dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ImageDataDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Image data dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// The lineup dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LineupsDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Lineups dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/LogoDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LogoDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Logo dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MapDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Map dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Metadata dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataProgramsDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MetadataProgramsDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Metadata programs dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MetadataScheduleDto.cs
Unescape View File

@ -1,7 +1,7 @@
using System;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Metadata schedule dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MovieDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MovieDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Movie dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/MultipartDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MultipartDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Multipart dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Program details dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ProgramDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ProgramDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Program dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/QualityRatingDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/QualityRatingDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Quality rating dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RatingDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/RatingDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Rating dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RecommendationDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/RecommendationDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Recommendation dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/RequestScheduleForChannelDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/RequestScheduleForChannelDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Request schedule for channel dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/ShowImagesDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ShowImagesDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Show image dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/StationDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/StationDto.cs
Unescape View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Station dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TitleDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/TitleDto.cs
Unescape View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// Title dto.

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs → src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/TokenDto.cs
Unescape View File

@ -1,7 +1,7 @@
using System;
using System.Text.Json.Serialization;
namespace Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos
namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
{
/// <summary>
/// The token dto.

2
Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs → src/Jellyfin.LiveTv/Listings/XmlTvListingsProvider.cs
Unescape View File

@ -23,7 +23,7 @@ using MediaBrowser.Model.IO;
using MediaBrowser.Model.LiveTv;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.Listings
namespace Jellyfin.LiveTv.Listings
{
public class XmlTvListingsProvider : IListingsProvider
{

2
Emby.Server.Implementations/LiveTv/LiveTvConfigurationFactory.cs → src/Jellyfin.LiveTv/LiveTvConfigurationFactory.cs
Unescape View File

@ -2,7 +2,7 @@ using System.Collections.Generic;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Model.LiveTv;
namespace Emby.Server.Implementations.LiveTv
namespace Jellyfin.LiveTv
{
/// <summary>
/// <see cref="IConfigurationFactory" /> implementation for <see cref="LiveTvOptions" />.

2
Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs → src/Jellyfin.LiveTv/LiveTvDtoService.cs
Unescape View File

@ -20,7 +20,7 @@ using MediaBrowser.Model.Entities;
using MediaBrowser.Model.LiveTv;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv
namespace Jellyfin.LiveTv
{
public class LiveTvDtoService
{

5
Emby.Server.Implementations/LiveTv/LiveTvManager.cs → src/Jellyfin.LiveTv/LiveTvManager.cs
Unescape View File

@ -9,7 +9,6 @@ using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Emby.Server.Implementations.Library;
using Jellyfin.Data.Entities;
using Jellyfin.Data.Enums;
using Jellyfin.Data.Events;
@ -34,7 +33,7 @@ using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Tasks;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv
namespace Jellyfin.LiveTv
{
/// <summary>
/// Class LiveTvManager.
@ -231,7 +230,9 @@ namespace Emby.Server.Implementations.LiveTv
_logger.LogInformation("Opening channel stream from {0}, external channel Id: {1}", service.Name, channel.ExternalId);
MediaSourceInfo info;
#pragma warning disable CA1859 // TODO: Analyzer bug?
ILiveStream liveStream;
#pragma warning restore CA1859
if (service is ISupportsDirectStreamProvider supportsManagedStream)
{
liveStream = await supportsManagedStream.GetChannelStreamWithDirectStreamProvider(channel.ExternalId, mediaSourceId, currentLiveStreams, cancellationToken).ConfigureAwait(false);

4
Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs → src/Jellyfin.LiveTv/LiveTvMediaSourceProvider.cs
Unescape View File

@ -16,7 +16,7 @@ using MediaBrowser.Model.Dto;
using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv
namespace Jellyfin.LiveTv
{
public class LiveTvMediaSourceProvider : IMediaSourceProvider
{
@ -61,7 +61,7 @@ namespace Emby.Server.Implementations.LiveTv
{
if (activeRecordingInfo is not null)
{
sources = await EmbyTV.EmbyTV.Current.GetRecordingStreamMediaSources(activeRecordingInfo, cancellationToken)
sources = await _mediaSourceManager.GetRecordingStreamMediaSources(activeRecordingInfo, cancellationToken)
.ConfigureAwait(false);
}
else

2
Emby.Server.Implementations/EntryPoints/RecordingNotifier.cs → src/Jellyfin.LiveTv/RecordingNotifier.cs
Unescape View File

@ -15,7 +15,7 @@ using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Session;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.EntryPoints
namespace Jellyfin.LiveTv
{
public sealed class RecordingNotifier : IServerEntryPoint
{

2
Emby.Server.Implementations/LiveTv/RefreshGuideScheduledTask.cs → src/Jellyfin.LiveTv/RefreshGuideScheduledTask.cs
Unescape View File

@ -7,7 +7,7 @@ using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.Tasks;
namespace Emby.Server.Implementations.LiveTv
namespace Jellyfin.LiveTv
{
/// <summary>
/// The "Refresh Guide" scheduled task.

2
Emby.Server.Implementations/IO/StreamHelper.cs → src/Jellyfin.LiveTv/StreamHelper.cs
Unescape View File

@ -7,7 +7,7 @@ using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Model.IO;
namespace Emby.Server.Implementations.IO
namespace Jellyfin.LiveTv
{
public class StreamHelper : IStreamHelper
{

2
Emby.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs → src/Jellyfin.LiveTv/TunerHosts/BaseTunerHost.cs
Unescape View File

@ -19,7 +19,7 @@ using MediaBrowser.Model.IO;
using MediaBrowser.Model.LiveTv;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.TunerHosts
namespace Jellyfin.LiveTv.TunerHosts
{
public abstract class BaseTunerHost
{

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/Channels.cs → src/Jellyfin.LiveTv/TunerHosts/HdHomerun/Channels.cs
Unescape View File

@ -1,6 +1,6 @@
#nullable disable
namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
{
internal class Channels
{

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/DiscoverResponse.cs → src/Jellyfin.LiveTv/TunerHosts/HdHomerun/DiscoverResponse.cs
Unescape View File

@ -2,7 +2,7 @@
using System;
namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
{
internal class DiscoverResponse
{

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunChannelCommands.cs → src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunChannelCommands.cs
Unescape View File

@ -3,7 +3,7 @@
using System;
using System.Collections.Generic;
namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
{
public class HdHomerunChannelCommands : IHdHomerunChannelCommands
{

8
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs → src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
Unescape View File

@ -30,7 +30,7 @@ using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Net;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
{
public class HdHomerunHost : BaseTunerHost, ITunerHost, IConfigurableTunerHost
{
@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
if (!throwAllExceptions && ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
{
const string DefaultValue = "HDHR";
var response = new DiscoverResponse
var discoverResponse = new DiscoverResponse
{
ModelNumber = DefaultValue
};
@ -152,11 +152,11 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
// HDHR4 doesn't have this api
lock (_modelCache)
{
_modelCache[cacheKey] = response;
_modelCache[cacheKey] = discoverResponse;
}
}
return response;
return discoverResponse;
}
throw;

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs → src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunManager.cs
Unescape View File

@ -14,7 +14,7 @@ using System.Threading.Tasks;
using MediaBrowser.Common;
using MediaBrowser.Controller.LiveTv;
namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
{
public sealed class HdHomerunManager : IDisposable
{

3
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs → src/Jellyfin.LiveTv/TunerHosts/HdHomerun/HdHomerunUdpStream.cs
Unescape View File

@ -1,5 +1,6 @@
#nullable disable
#pragma warning disable CA1711
#pragma warning disable CS1591
using System;
@ -19,7 +20,7 @@ using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
{
public class HdHomerunUdpStream : LiveStream, IDirectStreamProvider
{

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/IHdHomerunChannelCommands.cs → src/Jellyfin.LiveTv/TunerHosts/HdHomerun/IHdHomerunChannelCommands.cs
Unescape View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
{
public interface IHdHomerunChannelCommands
{

2
Emby.Server.Implementations/LiveTv/TunerHosts/HdHomerun/LegacyHdHomerunChannelCommands.cs → src/Jellyfin.LiveTv/TunerHosts/HdHomerun/LegacyHdHomerunChannelCommands.cs
Unescape View File

@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Text.RegularExpressions;
namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
namespace Jellyfin.LiveTv.TunerHosts.HdHomerun
{
public partial class LegacyHdHomerunChannelCommands : IHdHomerunChannelCommands
{

3
Emby.Server.Implementations/LiveTv/TunerHosts/LiveStream.cs → src/Jellyfin.LiveTv/TunerHosts/LiveStream.cs
Unescape View File

@ -1,5 +1,6 @@
#nullable disable
#pragma warning disable CA1711
#pragma warning disable CS1591
using System;
@ -14,7 +15,7 @@ using MediaBrowser.Model.IO;
using MediaBrowser.Model.LiveTv;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.TunerHosts
namespace Jellyfin.LiveTv.TunerHosts
{
public class LiveStream : ILiveStream
{

2
Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs → src/Jellyfin.LiveTv/TunerHosts/M3UTunerHost.cs
Unescape View File

@ -24,7 +24,7 @@ using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Logging;
using Microsoft.Net.Http.Headers;
namespace Emby.Server.Implementations.LiveTv.TunerHosts
namespace Jellyfin.LiveTv.TunerHosts
{
public class M3UTunerHost : BaseTunerHost, ITunerHost, IConfigurableTunerHost
{

2
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs → src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs
Unescape View File

@ -18,7 +18,7 @@ using MediaBrowser.Model.IO;
using MediaBrowser.Model.LiveTv;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.TunerHosts
namespace Jellyfin.LiveTv.TunerHosts
{
public partial class M3uParser
{

3
Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs → src/Jellyfin.LiveTv/TunerHosts/SharedHttpStream.cs
Unescape View File

@ -1,3 +1,4 @@
#pragma warning disable CA1711
#pragma warning disable CS1591
using System;
@ -16,7 +17,7 @@ using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Logging;
namespace Emby.Server.Implementations.LiveTv.TunerHosts
namespace Jellyfin.LiveTv.TunerHosts
{
public class SharedHttpStream : LiveStream, IDirectStreamProvider
{

4
tests/Jellyfin.Server.Implementations.Tests/LiveTv/HdHomerunHostTests.cs → tests/Jellyfin.LiveTv.Tests/HdHomerunHostTests.cs
Unescape View File

@ -6,13 +6,13 @@ using System.Threading;
using System.Threading.Tasks;
using AutoFixture;
using AutoFixture.AutoMoq;
using Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun;
using Jellyfin.LiveTv.TunerHosts.HdHomerun;
using MediaBrowser.Model.LiveTv;
using Moq;
using Moq.Protected;
using Xunit;
namespace Jellyfin.Server.Implementations.Tests.LiveTv
namespace Jellyfin.LiveTv.Tests
{
public class HdHomerunHostTests
{

4
tests/Jellyfin.Server.Implementations.Tests/LiveTv/HdHomerunManagerTests.cs → tests/Jellyfin.LiveTv.Tests/HdHomerunManagerTests.cs
Unescape View File

@ -1,9 +1,9 @@
using System;
using System.Text;
using Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun;
using Jellyfin.LiveTv.TunerHosts.HdHomerun;
using Xunit;
namespace Jellyfin.Server.Implementations.Tests.LiveTv
namespace Jellyfin.LiveTv.Tests
{
public class HdHomerunManagerTests
{

29
tests/Jellyfin.LiveTv.Tests/Jellyfin.LiveTv.Tests.csproj
Unescape View File

@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<None Include="Test Data\**\*.*">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AutoFixture" />
<PackageReference Include="AutoFixture.AutoMoq" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Moq" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Xunit.SkippableFact" />
<PackageReference Include="coverlet.collector" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Jellyfin.LiveTv\Jellyfin.LiveTv.csproj" />
</ItemGroup>
</Project>

4
tests/Jellyfin.Server.Implementations.Tests/LiveTv/Listings/XmlTvListingsProviderTests.cs → tests/Jellyfin.LiveTv.Tests/Listings/XmlTvListingsProviderTests.cs
Unescape View File

@ -6,13 +6,13 @@ using System.Threading;
using System.Threading.Tasks;
using AutoFixture;
using AutoFixture.AutoMoq;
using Emby.Server.Implementations.LiveTv.Listings;
using Jellyfin.LiveTv.Listings;
using MediaBrowser.Model.LiveTv;
using Moq;
using Moq.Protected;
using Xunit;
namespace Jellyfin.Server.Implementations.Tests.LiveTv.Listings;
namespace Jellyfin.LiveTv.Tests.Listings;
public class XmlTvListingsProviderTests
{

4
tests/Jellyfin.Server.Implementations.Tests/LiveTv/RecordingHelperTests.cs → tests/Jellyfin.LiveTv.Tests/RecordingHelperTests.cs
Unescape View File

@ -1,9 +1,9 @@
using System;
using Emby.Server.Implementations.LiveTv.EmbyTV;
using Jellyfin.LiveTv.EmbyTV;
using MediaBrowser.Controller.LiveTv;
using Xunit;
namespace Jellyfin.Server.Implementations.Tests.LiveTv
namespace Jellyfin.LiveTv.Tests
{
public static class RecordingHelperTests
{

4
tests/Jellyfin.Server.Implementations.Tests/LiveTv/SchedulesDirect/SchedulesDirectDeserializeTests.cs → tests/Jellyfin.LiveTv.Tests/SchedulesDirect/SchedulesDirectDeserializeTests.cs
Unescape View File

@ -2,11 +2,11 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text.Json;
using Emby.Server.Implementations.LiveTv.Listings.SchedulesDirectDtos;
using Jellyfin.Extensions.Json;
using Jellyfin.LiveTv.Listings.SchedulesDirectDtos;
using Xunit;
namespace Jellyfin.Server.Implementations.Tests.LiveTv.SchedulesDirect
namespace Jellyfin.LiveTv.Tests.SchedulesDirect
{
public class SchedulesDirectDeserializeTests
{

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/LiveTv/10.10.10.100/discover.json → tests/Jellyfin.LiveTv.Tests/Test Data/LiveTv/10.10.10.100/discover.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/LiveTv/10.10.10.100/lineup.json → tests/Jellyfin.LiveTv.Tests/Test Data/LiveTv/10.10.10.100/lineup.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/LiveTv/192.168.1.182/discover.json → tests/Jellyfin.LiveTv.Tests/Test Data/LiveTv/192.168.1.182/discover.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/LiveTv/192.168.1.182/lineup.json → tests/Jellyfin.LiveTv.Tests/Test Data/LiveTv/192.168.1.182/lineup.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/LiveTv/Listings/XmlTv/emptycategory.xml → tests/Jellyfin.LiveTv.Tests/Test Data/LiveTv/Listings/XmlTv/emptycategory.xml
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/LiveTv/Listings/XmlTv/notitle.xml → tests/Jellyfin.LiveTv.Tests/Test Data/LiveTv/Listings/XmlTv/notitle.xml
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/headends_response.json → tests/Jellyfin.LiveTv.Tests/Test Data/SchedulesDirect/headends_response.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/lineup_response.json → tests/Jellyfin.LiveTv.Tests/Test Data/SchedulesDirect/lineup_response.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/lineups_response.json → tests/Jellyfin.LiveTv.Tests/Test Data/SchedulesDirect/lineups_response.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/metadata_programs_response.json → tests/Jellyfin.LiveTv.Tests/Test Data/SchedulesDirect/metadata_programs_response.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/programs_response.json → tests/Jellyfin.LiveTv.Tests/Test Data/SchedulesDirect/programs_response.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/schedules_request.json → tests/Jellyfin.LiveTv.Tests/Test Data/SchedulesDirect/schedules_request.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/schedules_response.json → tests/Jellyfin.LiveTv.Tests/Test Data/SchedulesDirect/schedules_response.json
Unescape View File

0
tests/Jellyfin.Server.Implementations.Tests/Test Data/SchedulesDirect/token_live_response.json → tests/Jellyfin.LiveTv.Tests/Test Data/SchedulesDirect/token_live_response.json
Unescape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save