timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

show plex server names in libraries page (#1402)

Browse Source 
* cleanup plex libraries query

* show plex server names in libraries page
This commit is contained in:
Jason Dove
2023-08-29 08:46:36 -05:00
committed by GitHub
parent 225b95449c
commit deb0ac49b5
12 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- `MYSQL__CONNECTIONSTRING` - (e.g. `Server=localhost;Database=ErsatzTV;Uid=root;Pwd=ersatztv;`)
- Add option to use shared Plex servers, not just owned servers
- This can be enabled by setting the env var `ETV_ALLOW_SHARED_PLEX_SERVERS` to any non-empty value
- Show Plex server names in Libraries page
### Fixed
- Fix subtitle scaling when using QSV hardware acceleration
ErsatzTV.Application/Emby/EmbyLibraryViewModel.cs
+1 -1
View File
@@ -9,4 +9,4 @@ public record EmbyLibraryViewModel(
LibraryMediaKind MediaKind,
bool ShouldSyncItems,
int MediaSourceId)
: LibraryViewModel("Emby", Id, Name, MediaKind, MediaSourceId);
: LibraryViewModel("Emby", Id, Name, MediaKind, MediaSourceId, string.Empty);
ErsatzTV.Application/Jellyfin/JellyfinLibraryViewModel.cs
+1 -1
View File
@@ -9,4 +9,4 @@ public record JellyfinLibraryViewModel(
LibraryMediaKind MediaKind,
bool ShouldSyncItems,
int MediaSourceId)
: LibraryViewModel("Jellyfin", Id, Name, MediaKind, MediaSourceId);
: LibraryViewModel("Jellyfin", Id, Name, MediaKind, MediaSourceId, string.Empty);
ErsatzTV.Application/Libraries/LibraryViewModel.cs
+7 -1
View File
@@ -2,4 +2,10 @@
namespace ErsatzTV.Application.Libraries;
public record LibraryViewModel(string LibraryKind, int Id, string Name, LibraryMediaKind MediaKind, int MediaSourceId);
public record LibraryViewModel(
string LibraryKind,
int Id,
string Name,
LibraryMediaKind MediaKind,
int MediaSourceId,
string MediaSourceName);
ErsatzTV.Application/Libraries/LocalLibraryViewModel.cs
+1 -1
View File
@@ -3,4 +3,4 @@
namespace ErsatzTV.Application.Libraries;
public record LocalLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, int MediaSourceId)
: LibraryViewModel("Local", Id, Name, MediaKind, MediaSourceId);
: LibraryViewModel("Local", Id, Name, MediaKind, MediaSourceId, string.Empty);
ErsatzTV.Application/Libraries/Mapper.cs
+8 -1
View File
@@ -10,7 +10,7 @@ internal static class Mapper
library switch
{
LocalLibrary l => ProjectToViewModel(l),
PlexLibrary p => new PlexLibraryViewModel(p.Id, p.Name, p.MediaKind, p.MediaSourceId),
PlexLibrary p => new PlexLibraryViewModel(p.Id, p.Name, p.MediaKind, p.MediaSourceId, GetServerName(p.MediaSource)),
JellyfinLibrary j => new JellyfinLibraryViewModel(
j.Id,
j.Name,
@@ -26,4 +26,11 @@ internal static class Mapper
public static LocalLibraryPathViewModel ProjectToViewModel(LibraryPath libraryPath) =>
new(libraryPath.Id, libraryPath.LibraryId, libraryPath.Path);
private static string GetServerName(MediaSource ms) =>
ms switch
{
PlexMediaSource pms => pms.ServerName,
_ => string.Empty
};
}
ErsatzTV.Application/Libraries/PlexLibraryViewModel.cs
+7 -2
View File
@@ -2,5 +2,10 @@
namespace ErsatzTV.Application.Libraries;
public record PlexLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, int MediaSourceId)
: LibraryViewModel("Plex", Id, Name, MediaKind, MediaSourceId);
public record PlexLibraryViewModel(
int Id,
string Name,
LibraryMediaKind MediaKind,
int MediaSourceId,
string MediaSourceName)
: LibraryViewModel("Plex", Id, Name, MediaKind, MediaSourceId, MediaSourceName);
ErsatzTV.Application/Libraries/Queries/GetExternalCollectionsHandler.cs
+2 -1
View File
@@ -27,7 +27,8 @@ public class GetExternalCollectionsHandler : IRequestHandler<GetExternalCollecti
0,
"Collections",
0,
id))
id,
string.Empty))
.ToList();
}
}
ErsatzTV.Application/Plex/Queries/GetPlexLibrariesBySourceIdHandler.cs
+21 -13
View File
@@ -1,20 +1,28 @@
using ErsatzTV.Core.Interfaces.Repositories;
using ErsatzTV.Infrastructure.Data;
using Microsoft.EntityFrameworkCore;
using static ErsatzTV.Application.Plex.Mapper;
namespace ErsatzTV.Application.Plex;
public class
GetPlexLibrariesBySourceIdHandler : IRequestHandler<GetPlexLibrariesBySourceId,
List<PlexLibraryViewModel>>
public class GetPlexLibrariesBySourceIdHandler : IRequestHandler<GetPlexLibrariesBySourceId, List<PlexLibraryViewModel>>
{
private readonly IMediaSourceRepository _mediaSourceRepository;
private readonly IDbContextFactory<TvContext> _dbContextFactory;
public GetPlexLibrariesBySourceIdHandler(IMediaSourceRepository mediaSourceRepository) =>
_mediaSourceRepository = mediaSourceRepository;
public Task<List<PlexLibraryViewModel>> Handle(
GetPlexLibrariesBySourceId request,
CancellationToken cancellationToken) =>
_mediaSourceRepository.GetPlexLibraries(request.PlexMediaSourceId)
.Map(list => list.Map(ProjectToViewModel).ToList());
public GetPlexLibrariesBySourceIdHandler(IDbContextFactory<TvContext> dbContextFactory)
{
_dbContextFactory = dbContextFactory;
}
public async Task<List<PlexLibraryViewModel>> Handle(
GetPlexLibrariesBySourceId request,
CancellationToken cancellationToken)
{
await using TvContext context = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
return await context.PlexLibraries
.AsNoTracking()
.Where(l => l.MediaSourceId == request.PlexMediaSourceId)
.Map(pl => ProjectToViewModel(pl))
.ToListAsync(cancellationToken);
}
}
ErsatzTV.Core/Interfaces/Repositories/IMediaSourceRepository.cs
-1
View File
@@ -6,7 +6,6 @@ public interface IMediaSourceRepository
{
Task<PlexMediaSource> Add(PlexMediaSource plexMediaSource);
Task<List<PlexMediaSource>> GetAllPlex();
Task<List<PlexLibrary>> GetPlexLibraries(int plexMediaSourceId);
Task<List<PlexPathReplacement>> GetPlexPathReplacements(int plexMediaSourceId);
Task<Option<PlexLibrary>> GetPlexLibrary(int plexLibraryId);
Task<Option<PlexMediaSource>> GetPlex(int id);
ErsatzTV.Infrastructure/Data/Repositories/MediaSourceRepository.cs
-8
View File
@@ -31,14 +31,6 @@ public class MediaSourceRepository : IMediaSourceRepository
.ToListAsync();
}
public async Task<List<PlexLibrary>> GetPlexLibraries(int plexMediaSourceId)
{
await using TvContext context = await _dbContextFactory.CreateDbContextAsync();
return await context.PlexLibraries
.Filter(l => l.MediaSourceId == plexMediaSourceId)
.ToListAsync();
}
public async Task<List<PlexPathReplacement>> GetPlexPathReplacements(int plexMediaSourceId)
{
await using TvContext context = await _dbContextFactory.CreateDbContextAsync();
ErsatzTV/Pages/Libraries.razor
+17 -2
View File
@@ -20,19 +20,31 @@
</ToolBarContent>
<ColGroup>
<col/>
@if (_showServerNames)
{
<col/>
}
<col/>
<col/>
<col style="width: 180px;"/>
</ColGroup>
<HeaderContent>
<MudTh>Library Kind</MudTh>
<MudTh>Name</MudTh>
@if (_showServerNames)
{
<MudTh>Server Name</MudTh>
}
<MudTh>Library Name</MudTh>
<MudTh>Media Kind</MudTh>
<MudTh/>
</HeaderContent>
<RowTemplate>
<MudTd DataLabel="Library Kind">@context.LibraryKind</MudTd>
<MudTd DataLabel="Name">@context.Name</MudTd>
@if (_showServerNames)
{
<MudTd DataLabel="Server Name">@context.MediaSourceName</MudTd>
}
<MudTd DataLabel="Library Name">@context.Name</MudTd>
<MudTd DataLabel="Media Kind">@context.MediaKind</MudTd>
<MudTd>
<div style="align-items: center; display: flex;">
@@ -133,6 +145,7 @@
private IList<LibraryViewModel> _libraries = new List<LibraryViewModel>();
private IList<LibraryViewModel> _externalCollections = new List<LibraryViewModel>();
private Dictionary<int, int> _progressByLibrary = new();
private bool _showServerNames = false;
protected override void OnInitialized()
{
@@ -146,6 +159,8 @@
private async Task LoadLibraries(CancellationToken cancellationToken)
{
_libraries = await _mediator.Send(new GetConfiguredLibraries(), cancellationToken);
_showServerNames = _libraries.Any(l => l is PlexLibraryViewModel);
_externalCollections = await _mediator.Send(new GetExternalCollections(), cancellationToken);
_progressByLibrary = _libraries.ToDictionary(vm => vm.Id, _ => 0);
}