Skip to content

Commit

Permalink
Kill circular dependency between LiveTvManager and EmbyTV
Browse files Browse the repository at this point in the history
  • Loading branch information
@barronpm @KrzaQ
barronpm authored and KrzaQ committed Feb 13, 2024
1 parent 3016e14 commit cf904d8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 26 deletions.
29 changes: 19 additions & 10 deletions src/Jellyfin.LiveTv/EmbyTV/EmbyTV.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public sealed class EmbyTV : ILiveTvService, ISupportsDirectStreamProvider, ISup
private readonly ItemDataProvider<SeriesTimerInfo> _seriesTimerProvider;
private readonly TimerManager _timerProvider;

private readonly LiveTvManager _liveTvManager;
private readonly ITunerHostManager _tunerHostManager;
private readonly IFileSystem _fileSystem;

Expand All @@ -61,6 +60,8 @@ public sealed class EmbyTV : ILiveTvService, ISupportsDirectStreamProvider, ISup
private readonly IMediaEncoder _mediaEncoder;
private readonly IMediaSourceManager _mediaSourceManager;
private readonly IStreamHelper _streamHelper;
private readonly LiveTvDtoService _tvDtoService;
private readonly IListingsProvider[] _listingsProviders;

private readonly ConcurrentDictionary<string, ActiveRecordingInfo> _activeRecordings =
new ConcurrentDictionary<string, ActiveRecordingInfo>(StringComparer.OrdinalIgnoreCase);
Expand All @@ -78,13 +79,14 @@ public sealed class EmbyTV : ILiveTvService, ISupportsDirectStreamProvider, ISup
ILogger<EmbyTV> logger,
IHttpClientFactory httpClientFactory,
IServerConfigurationManager config,
ILiveTvManager liveTvManager,
ITunerHostManager tunerHostManager,
IFileSystem fileSystem,
ILibraryManager libraryManager,
ILibraryMonitor libraryMonitor,
IProviderManager providerManager,
IMediaEncoder mediaEncoder)
IMediaEncoder mediaEncoder,
LiveTvDtoService tvDtoService,
IEnumerable<IListingsProvider> listingsProviders)
{
Current = this;

Expand All @@ -96,10 +98,11 @@ public sealed class EmbyTV : ILiveTvService, ISupportsDirectStreamProvider, ISup
_libraryMonitor = libraryMonitor;
_providerManager = providerManager;
_mediaEncoder = mediaEncoder;
_liveTvManager = (LiveTvManager)liveTvManager;
_tvDtoService = tvDtoService;
_tunerHostManager = tunerHostManager;
_mediaSourceManager = mediaSourceManager;
_streamHelper = streamHelper;
_listingsProviders = listingsProviders.ToArray();

_seriesTimerProvider = new SeriesTimerManager(_logger, Path.Combine(DataPath, "seriestimers.json"));
_timerProvider = new TimerManager(_logger, Path.Combine(DataPath, "timers.json"));
Expand Down Expand Up @@ -937,7 +940,7 @@ public async Task<IEnumerable<ProgramInfo>> GetProgramsAsync(string channelId, D
return _config.GetLiveTvConfiguration().ListingProviders
.Select(i =>
{
var provider = _liveTvManager.ListingProviders.FirstOrDefault(l => string.Equals(l.Type, i.Type, StringComparison.OrdinalIgnoreCase));
var provider = _listingsProviders.FirstOrDefault(l => string.Equals(l.Type, i.Type, StringComparison.OrdinalIgnoreCase));
return provider is null ? null : new Tuple<IListingsProvider, ListingsProviderInfo>(provider, i);
})
Expand Down Expand Up @@ -1181,6 +1184,12 @@ private string GetRecordingPath(TimerInfo timer, RemoteSearchResult metadata, ou
return Path.Combine(recordPath, recordingFileName);
}

private BaseItem GetLiveTvChannel(TimerInfo timer)
{
var internalChannelId = _tvDtoService.GetInternalChannelId(Name, timer.ChannelId);
return _libraryManager.GetItemById(internalChannelId);
}

private async Task RecordStream(TimerInfo timer, DateTime recordingEndDate, ActiveRecordingInfo activeRecordingInfo)
{
ArgumentNullException.ThrowIfNull(timer);
Expand All @@ -1206,7 +1215,7 @@ private async Task RecordStream(TimerInfo timer, DateTime recordingEndDate, Acti
var remoteMetadata = await FetchInternetMetadata(timer, CancellationToken.None).ConfigureAwait(false);
var recordPath = GetRecordingPath(timer, remoteMetadata, out string seriesPath);

var channelItem = _liveTvManager.GetLiveTvChannel(timer, this);
var channelItem = GetLiveTvChannel(timer);

string liveStreamId = null;
RecordingStatus recordingStatus;
Expand Down Expand Up @@ -2089,7 +2098,7 @@ private LiveTvProgram GetProgramInfoFromCache(string programId)
{
var query = new InternalItemsQuery
{
ItemIds = new[] { _liveTvManager.GetInternalProgramId(programId) },
ItemIds = [_tvDtoService.GetInternalProgramId(programId)],
Limit = 1,
DtoOptions = new DtoOptions()
};
Expand Down Expand Up @@ -2119,7 +2128,7 @@ private LiveTvProgram GetProgramInfoFromCache(string channelId, DateTime startDa

if (!string.IsNullOrWhiteSpace(channelId))
{
query.ChannelIds = new[] { _liveTvManager.GetInternalChannelId(Name, channelId) };
query.ChannelIds = [_tvDtoService.GetInternalChannelId(Name, channelId)];
}

return _libraryManager.GetItemList(query).Cast<LiveTvProgram>().FirstOrDefault();
Expand Down Expand Up @@ -2155,7 +2164,7 @@ private bool ShouldCancelTimerForSeriesTimer(SeriesTimerInfo seriesTimer, TimerI
private void HandleDuplicateShowIds(List<TimerInfo> timers)
{
// sort showings by HD channels first, then by startDate, record earliest showing possible
foreach (var timer in timers.OrderByDescending(t => _liveTvManager.GetLiveTvChannel(t, this).IsHD).ThenBy(t => t.StartDate).Skip(1))
foreach (var timer in timers.OrderByDescending(t => GetLiveTvChannel(t).IsHD).ThenBy(t => t.StartDate).Skip(1))
{
timer.Status = RecordingStatus.Cancelled;
_timerProvider.Update(timer);
Expand Down Expand Up @@ -2305,7 +2314,7 @@ private IEnumerable<TimerInfo> GetTimersForSeries(SeriesTimerInfo seriesTimer)

if (!seriesTimer.RecordAnyChannel)
{
query.ChannelIds = new[] { _liveTvManager.GetInternalChannelId(Name, seriesTimer.ChannelId) };
query.ChannelIds = [_tvDtoService.GetInternalChannelId(Name, seriesTimer.ChannelId)];
}

var tempChannelCache = new Dictionary<Guid, LiveTvChannel>();
Expand Down
16 changes: 0 additions & 16 deletions src/Jellyfin.LiveTv/LiveTvManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1454,12 +1454,6 @@ public async Task<QueryResult<SeriesTimerInfoDto>> GetSeriesTimers(SeriesTimerQu
return new QueryResult<SeriesTimerInfoDto>(returnArray);
}

public BaseItem GetLiveTvChannel(TimerInfo timer, ILiveTvService service)
{
var internalChannelId = _tvDtoService.GetInternalChannelId(service.Name, timer.ChannelId);
return _libraryManager.GetItemById(internalChannelId);
}

public void AddChannelInfo(IReadOnlyCollection<(BaseItemDto ItemDto, LiveTvChannel Channel)> items, DtoOptions options, User user)
{
var now = DateTime.UtcNow;
Expand Down Expand Up @@ -1925,16 +1919,6 @@ public Task<List<ChannelInfo>> GetChannelsFromListingsProviderData(string id, Ca
return provider.GetChannels(info, cancellationToken);
}

public Guid GetInternalChannelId(string serviceName, string externalId)
{
return _tvDtoService.GetInternalChannelId(serviceName, externalId);
}

public Guid GetInternalProgramId(string externalId)
{
return _tvDtoService.GetInternalProgramId(externalId);
}

/// <inheritdoc />
public Task<BaseItem[]> GetRecordingFoldersAsync(User user)
=> GetRecordingFoldersAsync(user, false);
Expand Down

0 comments on commit cf904d8

Please sign in to comment.