diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 78606c6eb..1224c43fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,8 +18,11 @@ jobs: kind: windows target: win-x64 - os: macos-latest - kind: maxOS + kind: macOS target: osx-x64 + - os: macos-latest + kind: macOS + target: osx-arm64 runs-on: ${{ matrix.os }} steps: - name: Get the sources diff --git a/CHANGELOG.md b/CHANGELOG.md index fbe3f39b2..1a1fb6e0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Fixed +- Include other video title in channel guide (xmltv) + +### Added +- Build osx-arm64 packages on release ## [0.2.4-alpha] - 2021-11-13 ### Changed diff --git a/ErsatzTV.Core/Iptv/ChannelGuide.cs b/ErsatzTV.Core/Iptv/ChannelGuide.cs index b0371f5aa..cbaaa4e7f 100644 --- a/ErsatzTV.Core/Iptv/ChannelGuide.cs +++ b/ErsatzTV.Core/Iptv/ChannelGuide.cs @@ -342,6 +342,8 @@ namespace ErsatzTV.Core.Iptv .IfNone("[unknown show]"), MusicVideo mv => mv.Artist.ArtistMetadata.HeadOrNone().Map(am => am.Title ?? string.Empty) .IfNone("[unknown artist]"), + OtherVideo ov => ov.OtherVideoMetadata.HeadOrNone().Map(vm => vm.Title ?? string.Empty) + .IfNone("[unknown video]"), _ => "[unknown]" }; } diff --git a/ErsatzTV.Infrastructure/Data/Repositories/ChannelRepository.cs b/ErsatzTV.Infrastructure/Data/Repositories/ChannelRepository.cs index 90848a9d5..780ca32d6 100644 --- a/ErsatzTV.Infrastructure/Data/Repositories/ChannelRepository.cs +++ b/ErsatzTV.Infrastructure/Data/Repositories/ChannelRepository.cs @@ -80,6 +80,11 @@ namespace ErsatzTV.Infrastructure.Data.Repositories .ThenInclude(i => i.MediaItem) .ThenInclude(i => (i as MusicVideo).Artist) .ThenInclude(a => a.ArtistMetadata) + .Include(c => c.Playouts) + .ThenInclude(p => p.Items) + .ThenInclude(i => i.MediaItem) + .ThenInclude(i => (i as OtherVideo).OtherVideoMetadata) + .ThenInclude(vm => vm.Artwork) .ToListAsync(); }