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

Move LiveTv to separate project

Browse Source
This commit is contained in:
Patrick Barron 2023-12-28 15:15:03 -05:00
parent 7eba162879
commit c1a3084312
78 changed files with 121 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -25,7 +25,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;
@ -567,9 +566,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
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" />

1
Emby.Server.Implementations/Properties/AssemblyInfo.cs
View File

@ -17,7 +17,6 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage("en")]
[assembly: InternalsVisibleTo("Jellyfin.Server.Implementations.Tests")]
[assembly: InternalsVisibleTo("Emby.Server.Implementations.Fuzz")]
[assembly: InternalsVisibleTo("Jellyfin.LiveTv.Tests")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from

8
Jellyfin.Server/CoreAppHost.cs
View File

@ -6,6 +6,7 @@ using Emby.Server.Implementations.Session;
using Jellyfin.Api.WebSocketListeners;
using Jellyfin.Drawing;
using Jellyfin.Drawing.Skia;
using Jellyfin.LiveTv;
using Jellyfin.Server.Implementations;
using Jellyfin.Server.Implementations.Activity;
using Jellyfin.Server.Implementations.Devices;
@ -20,6 +21,7 @@ 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;
@ -96,6 +98,9 @@ namespace Jellyfin.Server
serviceCollection.AddScoped<IAuthenticationManager, AuthenticationManager>();
serviceCollection.AddSingleton<LiveTvDtoService>();
serviceCollection.AddSingleton<ILiveTvManager, LiveTvManager>();
foreach (var type in GetExportTypes<ILyricProvider>())
{
serviceCollection.AddSingleton(typeof(ILyricProvider), type);
@ -117,6 +122,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
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>

7
Jellyfin.sln
View File

@ -89,6 +89,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jellyfin.MediaEncoding.Keyf
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
@ -239,6 +241,10 @@ Global
{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
@ -266,6 +272,7 @@ Global
{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}

3
Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs → src/Jellyfin.LiveTv/EmbyTV/DirectRecorder.cs
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
{

4
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs → src/Jellyfin.LiveTv/EmbyTV/EmbyTV.cs
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
{

2
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs → src/Jellyfin.LiveTv/EmbyTV/EncodedRecorder.cs
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
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
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
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
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
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
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
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
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
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
{

22
src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj Normal file
View File

@ -0,0 +1,22 @@
<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" />
</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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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);

2
Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs → src/Jellyfin.LiveTv/LiveTvMediaSourceProvider.cs
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
{

2
Emby.Server.Implementations/LiveTv/RefreshGuideScheduledTask.cs → src/Jellyfin.LiveTv/RefreshGuideScheduledTask.cs
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/LiveTv/TunerHosts/BaseTunerHost.cs → src/Jellyfin.LiveTv/TunerHosts/BaseTunerHost.cs
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
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
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
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
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
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
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
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
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
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
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
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
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
{

2
tests/Jellyfin.LiveTv.Tests/HdHomerunHostTests.cs
View File

@ -6,7 +6,7 @@ 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;

2
tests/Jellyfin.LiveTv.Tests/HdHomerunManagerTests.cs
View File

@ -1,6 +1,6 @@
using System;
using System.Text;
using Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun;
using Jellyfin.LiveTv.TunerHosts.HdHomerun;
using Xunit;
namespace Jellyfin.LiveTv.Tests

2
tests/Jellyfin.LiveTv.Tests/Jellyfin.LiveTv.Tests.csproj
View File

@ -24,6 +24,6 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
<ProjectReference Include="..\..\src\Jellyfin.LiveTv\Jellyfin.LiveTv.csproj" />
</ItemGroup>
</Project>

2
tests/Jellyfin.LiveTv.Tests/Listings/XmlTvListingsProviderTests.cs
View File

@ -6,7 +6,7 @@ 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;

2
tests/Jellyfin.LiveTv.Tests/RecordingHelperTests.cs
View File

@ -1,5 +1,5 @@
using System;
using Emby.Server.Implementations.LiveTv.EmbyTV;
using Jellyfin.LiveTv.EmbyTV;
using MediaBrowser.Controller.LiveTv;
using Xunit;

2
tests/Jellyfin.LiveTv.Tests/SchedulesDirect/SchedulesDirectDeserializeTests.cs
View File

@ -2,8 +2,8 @@ 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.LiveTv.Tests.SchedulesDirect