update docs for 0.0.41-prealpha release [no docker]

more grouping fixes (#234 )
* more grouping fixes * update changelog
2021-05-30 18:01:13 -05:00 · 2021-05-30 11:54:02 -05:00 · 2021-05-30 10:47:33 -05:00 · 2021-05-30 09:40:59 -05:00 · 2021-05-30 06:32:26 -05:00 · 2021-05-30 06:08:33 -05:00
311 changed files with 29938 additions and 2035 deletions
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "jetbrains.resharper.globaltools": {
-      "version": "2020.3.2",
+      "version": "2021.1.3",
      "commands": [
        "jb"
      ]
@@ -42,7 +42,7 @@ jobs:
          #release_name_cli="ErsatzTV.CommandLine-$tag-${{ matrix.target }}"

          # Build everything
-          dotnet publish ErsatzTV/ErsatzTV.csproj --framework net5.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name" /property:InformationalVersion="${tag:1}-${{ matrix.target }}"
+          dotnet publish ErsatzTV/ErsatzTV.csproj --framework net5.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name" /property:InformationalVersion="${tag:1}-${{ matrix.target }}" /property:PublishSingleFile=true --self-contained true
          #dotnet publish ErsatzTV.CommandLine/ErsatzTV.CommandLine.csproj --framework net5.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name_cli" /property:InformationalVersion="${tag:1}-${{ matrix.target }}"

          # Pack files
@@ -0,0 +1,422 @@
+# Changelog
+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
+
+## [0.0.41-prealpha] - 2021-05-30
+### Added
+- Add button to refresh list of Plex, Jellyfin, Emby libraries without restarting app
+- Add episodes to search index
+- Add director and writer metadata to episodes
+- Add unique id/provider id metadata, which will support future features
+- Allow grouping multi-part episodes with titles ending in `Part X`, `Part Y`, etc.
+
+### Changed
+- Change home page link from release notes to full changelog
+
+### Fixed
+- Fix missing channel logos after restart
+- Fix multi-part episode grouping with missing episodes/parts
+- Fix multi-part episode grouping in collections containing multiple shows
+- Fix updating modified seasons and episodes from Jellyfin and Emby
+
+## [0.0.40-prealpha] - 2021-05-28
+### Added
+- Add content rating metadata to movies and shows
+- Add director and writer metadata to movies
+- Sync tv show thumbnail artwork in Local, Jellyfin and Emby libraries (*not* Plex)
+- Prioritize tv show thumbnail artwork over tv show posters in XMLTV
+- Include tv show artwork in XMLTV when grouped items with custom title are all from the same show
+- Cache resized local artwork on disk
+
+### Fixed
+- Recursively retrieve Jellyfin and Emby items
+- Fix incorrect search item counts
+- Fix stack trace information in non-docker releases
+- Fix crash opening `Add to Schedule` dialog
+- Disable FFmpeg troubleshooting reports on Windows as they do not work properly
+
+## [0.0.39-prealpha] - 2021-05-25
+### Added
+- Show Jellyfin and Emby artwork in XMLTV
+
+### Fixed
+- Fix path replacements for Jellyfin and Emby, including UNC paths
+- Use Emby path replacements for playback
+- Fix playback when `fps` is the only required filter
+- Fix resources (images, fonts) required to display offline channel message
+
+## [0.0.38-prealpha] - 2021-05-23
+### Added
+- Add support for Emby
+- Use "single-file" deployments for releases
+    - Non-docker releases will have significantly fewer files
+    - It is recommended to empty your installation folder before copying in the latest release.
+
+### Fixed
+- Fix some cases where Jellyfin artwork would not display
+- Fix saving schedule items with duration less than one hour
+- Use ffmpeg 4.3 in docker images; there was a performance regression with 4.4 (only in docker)
+
+## [0.0.37-prealpha] - 2021-05-21
+### Added
+- Add option to keep multi-part episodes together when shuffling (i.e. two-part season finales)
+- Optimize Plex TV Scanner to quickly process shows that have not been updated since the last scan
+- Optimize local Movie, Show, Music Video scanners to quickly skip unchanged folders, and to notice any mtime change
+- Add server binding configuration to `appsettings.json` which lets non-docker installations bind to localhost or change the port number
+
+### Fixed
+- Properly ignore `Other` Jellyfin libraries
+- Fix bug where search index would try to re-initialize unnecessarily
+- Fix one cause of green line at bottom of some transcoded videos by forcing even scaling targets
+
+## [0.0.36-prealpha] - 2021-05-16
+### Added
+- Add support for Jellyfin
+- Add support for ffmpeg 4.4, and use ffmpeg 4.4 in all docker images
+- Add configurable library refresh interval
+- Add button to copy/clone ffmpeg profile
+
+## [0.0.35-prealpha] - 2021-04-27
+### Added
+- Add search button for each library in `Libraries` page to quickly filter content by library
+    - This requires rebuilding the search index and search results may be empty or incomplete until the rebuild is complete
+
+### Fixed
+- Fix ingesting actors and actor artwork from newly-added Plex media items
+- Only show `movie` and `show` libraries from Plex. Other library types are not supported at this time.
+- Fix local movie scanner missing replaced/updated files
+
+## [0.0.34-prealpha] - 2021-04-17
+### Added
+- Allow `enter` key to submit all dialogs
+- Add actors to movies and shows (Plex or NFO metadata is required)
+    - Note that this requires a one-time full library scan to ingest actor metadata, which may take a long time with large libraries.
+- Rework metadata list links in UI (languages, studios, genres, etc)
+
+### Fixed
+- Fix EPG generation with music video channels that do not use a custom title
+- Fix lag when typing in search bar, `Add To Collection` dialog
+- Fix collections paging
+- Fix padding odd resolutions (this bug caused some items to always fail playback)
+- Only update Plex episode artwork as needed
+
+## [0.0.33-prealpha] - 2021-04-11
+### Added
+- Add language buttons to movies, shows, artists
+- Show release notes on home page
+
+### Fixed
+- Re-import missing television metadata that was incorrectly removed with `v0.0.32`
+- Fix language indexing; language searches now use full english name
+- Fix synchronizing television studios, genres from Plex
+- Limit channels to one playout per channel
+    - Though more than one playout was previously possible it was unsupported and unlikely to work as expected, if at all
+    - A future release may make this possible again
+    
+## [0.0.32-prealpha] - 2021-04-09
+### Added
+- `Add All To Collection` button to quickly add all search results to a collection
+- Add Artists scanned from Music Video libraries
+    - Artist folders are now required, but music videos now have no naming requirements
+    - `artist.nfo` metadata is supported along with thumbnail and poster artwork
+- Save Collections table page size in local storage
+
+### Fixed
+- Fix audio stream language indexing for movies and music videos
+- Fix synchronizing list of Plex servers and connection addresses for each server
+- Fix `See All` link for music video search results
+
+## [0.0.31-prealpha] - 2021-04-06
+### Added
+- Add documentation link to UI
+- Add `language` search field
+- Minor log viewer improvements
+- Use fragment navigation with letter bar (clicking a letter will page and scroll until that letter is in view)
+- Send all audio streams with HLS when channel has no preferred language
+- Move FFmpeg settings to new `Settings` page
+- Add HDHR tuner count setting to new `Settings` page
+
+### Fixed
+- Fix poster width
+- Fix bug that would occasionally prevent items from being added to the search index
+- Automatically refresh the Plex Media Sources page after sign in or sign out
+
+## 0.0.30-prealpha [YANKED]
+
+## [0.0.29-prealpha] - 2021-04-04
+- No longer require NFO metadata for music videos
+    - Instead, the only requirement is that music video files be named `[artist] - [track].[extension]` where the three characters (space dash space) between artist and track are required
+- Add library scan progress detail
+- Optimize library scans after adding library path to only scan new library path
+- Fix bug replacing music videos
+- Scan Plex libraries and local libraries on different threads
+- Use English names for preferred languages in UI instead of ISO language code
+
+## [0.0.28-prealpha] - 2021-04-03
+- Apply audio normalization more consistently; this should further reduce program boundary errors
+- Replace unused audio volume setting with audio loudness normalization option
+    - This can be particularly helpful with music video channels if media items have inconsistent loudness
+    - This setting may be less desirable on movie channels where loudness is intended to be dynamic
+- Fix XMLTV containing music videos that do not use a custom title
+- Fix channels table sorting, add paging to channels table
+- Add sorting and paging to schedules table
+- Add paging to playouts table
+- Use table instead of cards for collections view
+
+## [0.0.27-prealpha] - 2021-04-02
+- Add ***basic*** music video library support
+    - **NFO metadata is required for music videos** - see [tags](https://kodi.wiki/view/NFO_files/Music_videos#Music_Video_Tags), [template](https://kodi.wiki/view/NFO_files/Music_videos#Template_nfo) and [sample](https://kodi.wiki/view/NFO_files/Music_videos#Sample_nfo)
+    - Artists can be searched using the `artist` field, like `artist:daft`
+- Clear search query when clicking `Movies` or `TV Shows` from paged search results
+- Add show title to playout details
+- Let ffmpeg determine thread count by default (signified by `0` threads in ffmpeg profile)
+- Save troubleshooting reports for ffmpeg concat process in addition to transcode process
+- Simplify ffmpeg normalization options
+- Add frame rate setting to ffmpeg profile
+    - When video normalization is enabled, all media items will have their frame rate converted to the same value
+- Fix some scenarios where streaming would freeze at program boundaries
+- Fix bug preventing some Plex libraries from scanning
+- Fix bug preventing some local libraries from scanning folders that were recently added
+
+## [0.0.26-prealpha] - 2021-03-30
+- Add `Custom Title` option to schedule items
+    - When a custom title is set, the schedule item will be grouped in the EPG with the custom title
+- Navigate to schedule items after creating new schedule
+- Fix channel editor so preferred language is no longer required on every channel
+- Fix bug with audio track selection during non-normalized playback
+- Fix bug with playout builds where `Multiple` or `Duration` items wouldn't respect the settings over time
+- Fix bug that prevented some television folders from scanning
+
+## [0.0.25-prealpha] - 2021-03-29
+- Add preferred language feature
+    - Global preference can be set in FFmpeg settings; channels can override global preference
+    - Preferences require [ISO 639-2](https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes) language codes
+    - Audio stream selection will attempt to respect these preferences and prioritize streams with the most channels
+    - English (`eng`) will be used as a fallback when no preferences have been configured
+    - ***This feature requires a one-time reanalysis of every media item which may take a long time for large libraries and playback may fail until this scan has completed***
+- Fix channel sorting in EPG
+- Fix mixed-platform path replacements (Plex on Windows with ErsatzTV on Linux, or Plex on Linux with ErsatzTV on Windows)
+- Fix local television library scanning; this was broken with `v0.0.23`
+- Optimize local library scanning; regular scans should be significantly faster
+- Add log warning when a zero-duration media item is encountered
+- Fix indexing local shows without NFO metadata.
+    - If you have this issue the best way to fix is to:
+        - Shutdown ErsatzTV
+        - Delete the `search-index` subfolder inside the ErsatzTV config folder
+        - Start ErsatzTV; the full search index will be rebuilt on startup
+- Fix updating search index when genres, tags, studios are updated in local libraries
+- Adjust artwork routes so all IPTV traffic can be proxied with a single path prefix of `/iptv`
+
+## [0.0.24-prealpha] - 2021-03-22
+- Fix a critical bug preventing library synchronization with Plex sign ins performed with `v0.0.22` or `v0.0.23`
+    - **If you are unable to sync libraries from Plex, please sign out and back in to apply this fix**
+- Fallback to `folder.jpg` when `poster.jpg` is not present
+- Attach episodes to correct show when adding NFO metadata to existing libraries
+
+## [0.0.23-prealpha] - 2021-03-21
+- Remove all Plex items from search index after sign out
+- Fix fallback metadata for local episodes (episode number was missing)
+- Improve television show year detection where year is missing from nfo metadata
+- Fix sorting for titles that start with `A` or `An` in addition to `The`
+- Properly escape search links containing special characters (genre, tag)
+- Add and index `Studio` metadata
+
+## [0.0.22-prealpha] - 2021-03-20
+- Log errors encountered during search index build; attempt to continue with partial index when errors are encountered
+- Only search `title` field by default; `genre` and `tag` can be searched with `field:query` syntax
+- Allow leading wildcards in searches
+- Keep search query in search field to allow easy modification
+- Fix default ffmpeg profile when creating new channels
+- Fix multiple bugs with updating Plex servers, libraries, path replacements
+- Add `release_date` to search index
+
+## [0.0.21-prealpha] - 2021-03-20
+- Optimize local library scanning to use less memory
+- Duplicate some documentation near the schedule item editor
+- Fix bug with updating `Normalize Video Codec` setting
+- Rework search functionality
+    - Search landing page will show up to 50 items of each type
+    - `See All` links can be used to page through all search results
+    - Complex search queries supported (`christmas OR santa`)
+    - Fields that are searched by default:
+        - `title`
+        - `genre`
+        - `tag`
+    - Fields that aren't searched by default, but can be included in queries with syntax like (`plot:whatever`):
+        - `plot`
+        - `library_name`
+        - `type` (`movie` or `show`)
+    - Add letter bar to all paged search results to quickly navigate to a particular letter
+
+## [0.0.20-prealpha] - 2021-03-17
+- Fix NVIDIA hardware acceleration in `develop-nvidia` and `latest-nvidia` Docker tags
+    - This may never have worked correctly in Docker with older releases
+- Fix occasional crash rebuilding playout from ui
+- Fix crash adding a channel when no channels exist
+- Fix playback for media containing attached pictures
+
+## [0.0.19-prealpha] - 2021-03-16
+- Regularly scan Plex libraries (same as local libraries)
+- Add ability to create new collection from `Add to Collection` dialog
+- Fix channel logos in XMLTV
+- Add episode posters (show posters) to XMLTV
+- Fix shuffled schedules from occasionally having repeated items when reshuffling
+    - This was more likely to happen with low-cardinality collections like A B C C A B B C A
+- Add optional FFmpeg troubleshooting reports
+- Allow synchronizing hidden Plex libraries
+
+## [0.0.18-prealpha] - 2021-03-14
+- Plex is now a supported media source
+    - Plex is **not** used for transcoding at this point, files are played directly from the filesystem using ErsatzTV transcoding
+    - Path replacements will be needed if your shared media folders are mounted differently in Plex and ErsatzTV
+
+## [0.0.17-prealpha] - 2021-03-13
+- Fix bug introduced with 0.0.16 that prevented some playouts from building
+- Properly set sort title on added tv shows
+- Fix loading season pages containing episodes that have incomplete metadata
+- Improve XMLTV guide data
+
+## [0.0.16-prealpha] - 2021-03-12
+- Fix infinite loop caused by incorrectly configured ffprobe path
+- Add more strict ffmpeg and ffprobe settings validation
+- Add custom playback order option to collections that contain only movies
+    - This custom playback order will override the schedule's configured playback order for the collection
+
+## [0.0.15-prealpha] - 2021-03-11
+- Update UI for tv shows
+- Fix tv show sorting
+- Fix editing channel numbers
+- Fix playout timezone bugs
+- Add searchable genres and tags from local NFO metadata
+- Add multi-select feature to movies, shows, search results and collection items pages
+
+## [0.0.14-prealpha] - 2021-03-09
+- New movie layout utilizing fan art (if available)
+- New dark UI
+- Fix offline stream (displayed when no media is scheduled for playback)
+- Add M3U codec hints for Channels DVR
+- Allow sub-channel numbers
+- Fix bug where ffmpeg wouldn't terminate after a media item completed playback
+- Fix time zone in new docker base images
+- Fix vaapi pipeline with mpeg4 content by using software decoder with hardware encoder
+- Enforce unique schedule name
+- Enforce unique channel number
+- Fix sorting of collection items in UI
+
+## [0.0.13-prealpha] - 2021-03-07
+- Remember selected Collection in `Add To Collection` dialog
+- Automatically rebuild Playouts referencing any Collection that has items added or removed from the UI
+- Remove Media Items from database when files are removed from disk
+- Add hardware-accelerated transcoding support (`qsv`, `nvenc`/`nvidia`, `vaapi`)
+    - All flavors support resolution normalization (scaling and padding)
+    - This requires support within ffmpeg; see README for new docker image tags
+
+## [0.0.12-prealpha] - 2021-03-02
+- Fix a database migration issue introduced with version 0.0.11
+- Shutdown app when database migration failures are encountered at startup
+
+## [0.0.11-prealpha] - 2021-03-01
+- Add Libraries and Library Paths under Media Sources
+    - Two local libraries exist: `Movies` and `Shows`
+    - Local Media Sources from prior versions are now found under Library Paths
+- Add `Rebuild Playout` buttons to quickly regenerate playouts after modifying collections
+- Add `Add to Collection` buttons to most media cards (movies, shows, seasons, episodes)
+- Add Search page for searching movies and shows
+
+## [0.0.10-prealpha] - 2021-02-21
+- Rework how television media is stored in the database
+- Rework how media is linked to a collection
+- Add season, episode and movie detail views to UI
+- Add media to collections and schedules from detail views
+- Easily add and remove media from a collection
+- Easily add and reorder schedule items
+
+## [0.0.9-prealpha] - 2021-02-15
+- Local media scanner has been rewritten and is much more performant
+- Ignore extras in the same folder as movies (`-behindthescenes`, `-trailer`, etc)
+- Support `movie.nfo` metadata in addition to matching filename nfo metadata
+- Changes to video files, metadata and posters are automatically detected and used
+
+## [0.0.8-prealpha] - 2021-02-14
+- Optimize scanning so playouts are only rebuilt when necessary (duration changes, or collection membership changes)
+- Automatically add new posters during scanning
+- Support more poster file types (jpg, jpeg, png, gif, tbn)
+- Add "Refresh All Metadata" button to media sources page; this should only be needed if NFO metadata or posters are modified
+- Add progress indicator for media sources that are being actively scanned
+- Prevent deleting media source during scan
+- Prevent creating playout with empty schedule
+
+## [0.0.7-prealpha] - 2021-02-13
+- Rework media items layout - table has been replaced with cards/posters
+- Fix bug preventing long folder names from being used as media sources
+- Use 24h time pickers in schedule editor
+
+## [0.0.6-prealpha] - 2021-02-12
+- Add version information to UI
+- Add basic log viewer to UI
+
+## [0.0.5-prealpha] - 2021-02-12
+- Fix bug where media scanner could stop prematurely and miss media items
+- Add database migrations
+
+## [0.0.4-prealpha] - 2021-02-11
+- **Fix HDHomeRun routes** - this version is required to use as a DVR with Plex, older versions will not work
+- Improve metadata parsing for tv, add fallback (filename) parsing for movies
+
+## [0.0.3-prealpha] - 2021-02-11
+- Fix incomplete XML issue introduced with v0.0.2-prealpha
+- Add `.ts` files to local media scanner
+- Change M3U, XMLTV, API icons to text links
+
+## 0.0.2-prealpha - 2021-02-11 [YANKED]
+- Relax some searches to be case-insensitive
+- Improve categorization of tv episodes without sidecar metadata
+- Properly escape XML content in XMLTV
+
+## [0.0.1-prealpha] - 2021-02-10
+- Initial release to facilitate testing outside of Docker.
+
+
+[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.41-prealpha...HEAD
+[0.0.41-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.40-prealpha...v0.0.41-prealpha
+[0.0.40-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.39-prealpha...v0.0.40-prealpha
+[0.0.39-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.38-prealpha...v0.0.39-prealpha
+[0.0.38-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.37-prealpha...v0.0.38-prealpha
+[0.0.37-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.36-prealpha...v0.0.37-prealpha
+[0.0.36-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.35-prealpha...v0.0.36-prealpha
+[0.0.35-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.34-prealpha...v0.0.35-prealpha
+[0.0.34-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.33-prealpha...v0.0.34-prealpha
+[0.0.33-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.32-prealpha...v0.0.33-prealpha
+[0.0.32-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.31-prealpha...v0.0.32-prealpha
+[0.0.31-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.29-prealpha...v0.0.31-prealpha
+[0.0.29-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.28-prealpha...v0.0.29-prealpha
+[0.0.28-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.27-prealpha...v0.0.28-prealpha
+[0.0.27-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.26-prealpha...v0.0.27-prealpha
+[0.0.26-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.25-prealpha...v0.0.26-prealpha
+[0.0.25-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.24-prealpha...v0.0.25-prealpha
+[0.0.24-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.23-prealpha...v0.0.24-prealpha
+[0.0.23-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.22-prealpha...v0.0.23-prealpha
+[0.0.22-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.21-prealpha...v0.0.22-prealpha
+[0.0.21-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.20-prealpha...v0.0.21-prealpha
+[0.0.20-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.19-prealpha...v0.0.20-prealpha
+[0.0.19-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.18-prealpha...v0.0.19-prealpha
+[0.0.18-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.17-prealpha...v0.0.18-prealpha
+[0.0.17-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.16-prealpha...v0.0.17-prealpha
+[0.0.16-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.15-prealpha...v0.0.16-prealpha
+[0.0.15-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.14-prealpha...v0.0.15-prealpha
+[0.0.14-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.13-prealpha...v0.0.14-prealpha
+[0.0.13-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.12-prealpha...v0.0.13-prealpha
+[0.0.12-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.11-prealpha...v0.0.12-prealpha
+[0.0.11-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.10-prealpha...v0.0.11-prealpha
+[0.0.10-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.9-prealpha...v0.0.10-prealpha
+[0.0.9-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.8-prealpha...v0.0.9-prealpha
+[0.0.8-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.7-prealpha...v0.0.8-prealpha
+[0.0.7-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.6-prealpha...v0.0.7-prealpha
+[0.0.6-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.5-prealpha...v0.0.6-prealpha
+[0.0.5-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.4-prealpha...v0.0.5-prealpha
+[0.0.4-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.3-prealpha...v0.0.4-prealpha
+[0.0.3-prealpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.0.1-prealpha...v0.0.3-prealpha
+[0.0.1-prealpha]: https://github.com/jasongdove/ErsatzTV/releases/tag/v0.0.1-prealpha
@@ -0,0 +1,7 @@
+using ErsatzTV.Core;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record DisconnectEmby : MediatR.IRequest<Either<BaseError, Unit>>;
+}
@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Emby;
+using ErsatzTV.Core.Interfaces.Locking;
+using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Search;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public class DisconnectEmbyHandler : MediatR.IRequestHandler<DisconnectEmby, Either<BaseError, Unit>>
+    {
+        private readonly IEmbySecretStore _embySecretStore;
+        private readonly IEntityLocker _entityLocker;
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly ISearchIndex _searchIndex;
+
+        public DisconnectEmbyHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            IEmbySecretStore embySecretStore,
+            IEntityLocker entityLocker,
+            ISearchIndex searchIndex)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _embySecretStore = embySecretStore;
+            _entityLocker = entityLocker;
+            _searchIndex = searchIndex;
+        }
+
+        public async Task<Either<BaseError, Unit>> Handle(
+            DisconnectEmby request,
+            CancellationToken cancellationToken)
+        {
+            List<int> ids = await _mediaSourceRepository.DeleteAllEmby();
+            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();
+            await _embySecretStore.DeleteAll();
+            _entityLocker.UnlockRemoteMediaSource<EmbyMediaSource>();
+
+            return Unit.Default;
+        }
+    }
+}
@@ -0,0 +1,8 @@
+using ErsatzTV.Core;
+using ErsatzTV.Core.Emby;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record SaveEmbySecrets(EmbySecrets Secrets) : MediatR.IRequest<Either<BaseError, Unit>>;
+}
@@ -0,0 +1,60 @@
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Interfaces.Emby;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public class SaveEmbySecretsHandler : MediatR.IRequestHandler<SaveEmbySecrets, Either<BaseError, Unit>>
+    {
+        private readonly ChannelWriter<IEmbyBackgroundServiceRequest> _channel;
+        private readonly IEmbyApiClient _embyApiClient;
+        private readonly IEmbySecretStore _embySecretStore;
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public SaveEmbySecretsHandler(
+            IEmbySecretStore embySecretStore,
+            IEmbyApiClient embyApiClient,
+            IMediaSourceRepository mediaSourceRepository,
+            ChannelWriter<IEmbyBackgroundServiceRequest> channel)
+        {
+            _embySecretStore = embySecretStore;
+            _embyApiClient = embyApiClient;
+            _mediaSourceRepository = mediaSourceRepository;
+            _channel = channel;
+        }
+
+        public Task<Either<BaseError, Unit>> Handle(SaveEmbySecrets request, CancellationToken cancellationToken) =>
+            Validate(request)
+                .MapT(PerformSave)
+                .Bind(v => v.ToEitherAsync());
+
+        private async Task<Validation<BaseError, Parameters>> Validate(SaveEmbySecrets request)
+        {
+            Either<BaseError, EmbyServerInformation> maybeServerInformation = await _embyApiClient
+                .GetServerInformation(request.Secrets.Address, request.Secrets.ApiKey);
+
+            return maybeServerInformation.Match(
+                info => Validation<BaseError, Parameters>.Success(new Parameters(request.Secrets, info)),
+                error => error);
+        }
+
+        private async Task<Unit> PerformSave(Parameters parameters)
+        {
+            await _embySecretStore.SaveSecrets(parameters.Secrets);
+            await _mediaSourceRepository.UpsertEmby(
+                parameters.Secrets.Address,
+                parameters.ServerInformation.ServerName,
+                parameters.ServerInformation.OperatingSystem);
+            await _channel.WriteAsync(new SynchronizeEmbyMediaSources());
+
+            return Unit.Default;
+        }
+
+        private record Parameters(EmbySecrets Secrets, EmbyServerInformation ServerInformation);
+    }
+}
@@ -0,0 +1,8 @@
+using ErsatzTV.Core;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record SynchronizeEmbyLibraries(int EmbyMediaSourceId) : MediatR.IRequest<Either<BaseError, Unit>>,
+        IEmbyBackgroundServiceRequest;
+}
@@ -0,0 +1,118 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Interfaces.Emby;
+using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Search;
+using LanguageExt;
+using Microsoft.Extensions.Logging;
+using static LanguageExt.Prelude;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public class
+        SynchronizeEmbyLibrariesHandler : MediatR.IRequestHandler<SynchronizeEmbyLibraries, Either<BaseError, Unit>>
+    {
+        private readonly IEmbyApiClient _embyApiClient;
+        private readonly IEmbySecretStore _embySecretStore;
+        private readonly ILogger<SynchronizeEmbyLibrariesHandler> _logger;
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly ISearchIndex _searchIndex;
+
+        public SynchronizeEmbyLibrariesHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            IEmbySecretStore embySecretStore,
+            IEmbyApiClient embyApiClient,
+            ILogger<SynchronizeEmbyLibrariesHandler> logger,
+            ISearchIndex searchIndex)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _embySecretStore = embySecretStore;
+            _embyApiClient = embyApiClient;
+            _logger = logger;
+            _searchIndex = searchIndex;
+        }
+
+        public Task<Either<BaseError, Unit>> Handle(
+            SynchronizeEmbyLibraries request,
+            CancellationToken cancellationToken) =>
+            Validate(request)
+                .MapT(SynchronizeLibraries)
+                .Bind(v => v.ToEitherAsync());
+
+        private Task<Validation<BaseError, ConnectionParameters>> Validate(SynchronizeEmbyLibraries request) =>
+            MediaSourceMustExist(request)
+                .BindT(MediaSourceMustHaveActiveConnection)
+                .BindT(MediaSourceMustHaveApiKey);
+
+        private Task<Validation<BaseError, EmbyMediaSource>> MediaSourceMustExist(
+            SynchronizeEmbyLibraries request) =>
+            _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId)
+                .Map(o => o.ToValidation<BaseError>("Emby media source does not exist."));
+
+        private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
+            EmbyMediaSource embyMediaSource)
+        {
+            Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.HeadOrNone();
+            return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
+                .ToValidation<BaseError>("Emby media source requires an active connection");
+        }
+
+        private async Task<Validation<BaseError, ConnectionParameters>> MediaSourceMustHaveApiKey(
+            ConnectionParameters connectionParameters)
+        {
+            EmbySecrets secrets = await _embySecretStore.ReadSecrets();
+            return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
+                .Filter(match => match)
+                .Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
+                .ToValidation<BaseError>("Emby media source requires an api key");
+        }
+
+        private async Task<Unit> SynchronizeLibraries(ConnectionParameters connectionParameters)
+        {
+            Either<BaseError, List<EmbyLibrary>> maybeLibraries = await _embyApiClient.GetLibraries(
+                connectionParameters.ActiveConnection.Address,
+                connectionParameters.ApiKey);
+
+            await maybeLibraries.Match(
+                async libraries =>
+                {
+                    var existing = connectionParameters.EmbyMediaSource.Libraries.OfType<EmbyLibrary>()
+                        .ToList();
+                    var toAdd = libraries.Filter(library => existing.All(l => l.ItemId != library.ItemId)).ToList();
+                    var toRemove = existing.Filter(library => libraries.All(l => l.ItemId != library.ItemId)).ToList();
+                    List<int> ids = await _mediaSourceRepository.UpdateLibraries(
+                        connectionParameters.EmbyMediaSource.Id,
+                        toAdd,
+                        toRemove);
+                    if (ids.Any())
+                    {
+                        await _searchIndex.RemoveItems(ids);
+                        _searchIndex.Commit();
+                    }
+                },
+                error =>
+                {
+                    _logger.LogWarning(
+                        "Unable to synchronize libraries from emby server {EmbyServer}: {Error}",
+                        connectionParameters.EmbyMediaSource.ServerName,
+                        error.Value);
+
+                    return Task.CompletedTask;
+                });
+
+            return Unit.Default;
+        }
+
+        private record ConnectionParameters(
+            EmbyMediaSource EmbyMediaSource,
+            EmbyConnection ActiveConnection)
+        {
+            public string ApiKey { get; set; }
+        }
+    }
+}
@@ -0,0 +1,23 @@
+using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public interface ISynchronizeEmbyLibraryById : IRequest<Either<BaseError, string>>,
+        IEmbyBackgroundServiceRequest
+    {
+        int EmbyLibraryId { get; }
+        bool ForceScan { get; }
+    }
+
+    public record SynchronizeEmbyLibraryByIdIfNeeded(int EmbyLibraryId) : ISynchronizeEmbyLibraryById
+    {
+        public bool ForceScan => false;
+    }
+
+    public record ForceSynchronizeEmbyLibraryById(int EmbyLibraryId) : ISynchronizeEmbyLibraryById
+    {
+        public bool ForceScan => true;
+    }
+}
@@ -0,0 +1,172 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Interfaces.Emby;
+using ErsatzTV.Core.Interfaces.Locking;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+using Microsoft.Extensions.Logging;
+using static LanguageExt.Prelude;
+using Unit = LanguageExt.Unit;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public class SynchronizeEmbyLibraryByIdHandler :
+        IRequestHandler<ForceSynchronizeEmbyLibraryById, Either<BaseError, string>>,
+        IRequestHandler<SynchronizeEmbyLibraryByIdIfNeeded, Either<BaseError, string>>
+    {
+        private readonly IConfigElementRepository _configElementRepository;
+        private readonly IEmbyMovieLibraryScanner _embyMovieLibraryScanner;
+
+        private readonly IEmbySecretStore _embySecretStore;
+        private readonly IEmbyTelevisionLibraryScanner _embyTelevisionLibraryScanner;
+        private readonly IEntityLocker _entityLocker;
+        private readonly ILibraryRepository _libraryRepository;
+        private readonly ILogger<SynchronizeEmbyLibraryByIdHandler> _logger;
+
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public SynchronizeEmbyLibraryByIdHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            IEmbySecretStore embySecretStore,
+            IEmbyMovieLibraryScanner embyMovieLibraryScanner,
+            IEmbyTelevisionLibraryScanner embyTelevisionLibraryScanner,
+            ILibraryRepository libraryRepository,
+            IEntityLocker entityLocker,
+            IConfigElementRepository configElementRepository,
+            ILogger<SynchronizeEmbyLibraryByIdHandler> logger)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _embySecretStore = embySecretStore;
+            _embyMovieLibraryScanner = embyMovieLibraryScanner;
+            _embyTelevisionLibraryScanner = embyTelevisionLibraryScanner;
+            _libraryRepository = libraryRepository;
+            _entityLocker = entityLocker;
+            _configElementRepository = configElementRepository;
+            _logger = logger;
+        }
+
+        public Task<Either<BaseError, string>> Handle(
+            ForceSynchronizeEmbyLibraryById request,
+            CancellationToken cancellationToken) => Handle(request);
+
+        public Task<Either<BaseError, string>> Handle(
+            SynchronizeEmbyLibraryByIdIfNeeded request,
+            CancellationToken cancellationToken) => Handle(request);
+
+        private Task<Either<BaseError, string>>
+            Handle(ISynchronizeEmbyLibraryById request) =>
+            Validate(request)
+                .MapT(parameters => Synchronize(parameters).Map(_ => parameters.Library.Name))
+                .Bind(v => v.ToEitherAsync());
+
+        private async Task<Unit> Synchronize(RequestParameters parameters)
+        {
+            var lastScan = new DateTimeOffset(parameters.Library.LastScan ?? DateTime.MinValue, TimeSpan.Zero);
+            if (parameters.ForceScan || lastScan < DateTimeOffset.Now - TimeSpan.FromHours(6))
+            {
+                switch (parameters.Library.MediaKind)
+                {
+                    case LibraryMediaKind.Movies:
+                        await _embyMovieLibraryScanner.ScanLibrary(
+                            parameters.ConnectionParameters.ActiveConnection.Address,
+                            parameters.ConnectionParameters.ApiKey,
+                            parameters.Library,
+                            parameters.FFprobePath);
+                        break;
+                    case LibraryMediaKind.Shows:
+                        await _embyTelevisionLibraryScanner.ScanLibrary(
+                            parameters.ConnectionParameters.ActiveConnection.Address,
+                            parameters.ConnectionParameters.ApiKey,
+                            parameters.Library,
+                            parameters.FFprobePath);
+                        break;
+                }
+
+                parameters.Library.LastScan = DateTime.UtcNow;
+                await _libraryRepository.UpdateLastScan(parameters.Library);
+            }
+            else
+            {
+                _logger.LogDebug(
+                    "Skipping unforced scan of emby media library {Name}",
+                    parameters.Library.Name);
+            }
+
+            _entityLocker.UnlockLibrary(parameters.Library.Id);
+            return Unit.Default;
+        }
+
+        private async Task<Validation<BaseError, RequestParameters>> Validate(
+            ISynchronizeEmbyLibraryById request) =>
+            (await ValidateConnection(request), await EmbyLibraryMustExist(request), await ValidateFFprobePath())
+            .Apply(
+                (connectionParameters, embyLibrary, ffprobePath) => new RequestParameters(
+                    connectionParameters,
+                    embyLibrary,
+                    request.ForceScan,
+                    ffprobePath
+                ));
+
+        private Task<Validation<BaseError, ConnectionParameters>> ValidateConnection(
+            ISynchronizeEmbyLibraryById request) =>
+            EmbyMediaSourceMustExist(request)
+                .BindT(MediaSourceMustHaveActiveConnection)
+                .BindT(MediaSourceMustHaveApiKey);
+
+        private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist(
+            ISynchronizeEmbyLibraryById request) =>
+            _mediaSourceRepository.GetEmbyByLibraryId(request.EmbyLibraryId)
+                .Map(
+                    v => v.ToValidation<BaseError>(
+                        $"Emby media source for library {request.EmbyLibraryId} does not exist."));
+
+        private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
+            EmbyMediaSource embyMediaSource)
+        {
+            Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.HeadOrNone();
+            return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
+                .ToValidation<BaseError>("Emby media source requires an active connection");
+        }
+
+        private async Task<Validation<BaseError, ConnectionParameters>> MediaSourceMustHaveApiKey(
+            ConnectionParameters connectionParameters)
+        {
+            EmbySecrets secrets = await _embySecretStore.ReadSecrets();
+            return Optional(secrets.Address == connectionParameters.ActiveConnection.Address)
+                .Filter(match => match)
+                .Map(_ => connectionParameters with { ApiKey = secrets.ApiKey })
+                .ToValidation<BaseError>("Emby media source requires an api key");
+        }
+
+        private Task<Validation<BaseError, EmbyLibrary>> EmbyLibraryMustExist(
+            ISynchronizeEmbyLibraryById request) =>
+            _mediaSourceRepository.GetEmbyLibrary(request.EmbyLibraryId)
+                .Map(v => v.ToValidation<BaseError>($"Emby library {request.EmbyLibraryId} does not exist."));
+
+        private Task<Validation<BaseError, string>> ValidateFFprobePath() =>
+            _configElementRepository.GetValue<string>(ConfigElementKey.FFprobePath)
+                .FilterT(File.Exists)
+                .Map(
+                    ffprobePath =>
+                        ffprobePath.ToValidation<BaseError>("FFprobe path does not exist on the file system"));
+
+        private record RequestParameters(
+            ConnectionParameters ConnectionParameters,
+            EmbyLibrary Library,
+            bool ForceScan,
+            string FFprobePath);
+
+        private record ConnectionParameters(
+            EmbyMediaSource EmbyMediaSource,
+            EmbyConnection ActiveConnection)
+        {
+            public string ApiKey { get; set; }
+        }
+    }
+}
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record SynchronizeEmbyMediaSources : IRequest<Either<BaseError, List<EmbyMediaSource>>>,
+        IEmbyBackgroundServiceRequest;
+}
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Channels;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public class SynchronizeEmbyMediaSourcesHandler : IRequestHandler<SynchronizeEmbyMediaSources,
+        Either<BaseError, List<EmbyMediaSource>>>
+    {
+        private readonly ChannelWriter<IEmbyBackgroundServiceRequest> _channel;
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public SynchronizeEmbyMediaSourcesHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            ChannelWriter<IEmbyBackgroundServiceRequest> channel)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _channel = channel;
+        }
+
+        public async Task<Either<BaseError, List<EmbyMediaSource>>> Handle(
+            SynchronizeEmbyMediaSources request,
+            CancellationToken cancellationToken)
+        {
+            List<EmbyMediaSource> mediaSources = await _mediaSourceRepository.GetAllEmby();
+            foreach (EmbyMediaSource mediaSource in mediaSources)
+            {
+                // await _channel.WriteAsync(new SynchronizeEmbyAdminUserId(mediaSource.Id), cancellationToken);
+                await _channel.WriteAsync(new SynchronizeEmbyLibraries(mediaSource.Id), cancellationToken);
+            }
+
+            return mediaSources;
+        }
+    }
+}
@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using ErsatzTV.Core;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record UpdateEmbyLibraryPreferences
+        (List<EmbyLibraryPreference> Preferences) : MediatR.IRequest<Either<BaseError, Unit>>;
+
+    public record EmbyLibraryPreference(int Id, bool ShouldSyncItems);
+}
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Search;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public class
+        UpdateEmbyLibraryPreferencesHandler : MediatR.IRequestHandler<UpdateEmbyLibraryPreferences,
+            Either<BaseError, Unit>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly ISearchIndex _searchIndex;
+
+        public UpdateEmbyLibraryPreferencesHandler(
+            IMediaSourceRepository mediaSourceRepository,
+            ISearchIndex searchIndex)
+        {
+            _mediaSourceRepository = mediaSourceRepository;
+            _searchIndex = searchIndex;
+        }
+
+        public async Task<Either<BaseError, Unit>> Handle(
+            UpdateEmbyLibraryPreferences request,
+            CancellationToken cancellationToken)
+        {
+            var toDisable = request.Preferences.Filter(p => p.ShouldSyncItems == false).Map(p => p.Id).ToList();
+            List<int> ids = await _mediaSourceRepository.DisableEmbyLibrarySync(toDisable);
+            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();
+
+            IEnumerable<int> toEnable = request.Preferences.Filter(p => p.ShouldSyncItems).Map(p => p.Id);
+            await _mediaSourceRepository.EnableEmbyLibrarySync(toEnable);
+
+            return Unit.Default;
+        }
+    }
+}
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using ErsatzTV.Core;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public record UpdateEmbyPathReplacements(
+        int EmbyMediaSourceId,
+        List<EmbyPathReplacementItem> PathReplacements) : MediatR.IRequest<Either<BaseError, Unit>>;
+
+    public record EmbyPathReplacementItem(int Id, string EmbyPath, string LocalPath);
+}
@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Emby.Commands
+{
+    public class UpdateEmbyPathReplacementsHandler : MediatR.IRequestHandler<UpdateEmbyPathReplacements,
+        Either<BaseError, Unit>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public UpdateEmbyPathReplacementsHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;
+
+        public Task<Either<BaseError, Unit>> Handle(
+            UpdateEmbyPathReplacements request,
+            CancellationToken cancellationToken) =>
+            Validate(request)
+                .MapT(pms => MergePathReplacements(request, pms))
+                .Bind(v => v.ToEitherAsync());
+
+        private Task<Unit> MergePathReplacements(
+            UpdateEmbyPathReplacements request,
+            EmbyMediaSource embyMediaSource)
+        {
+            embyMediaSource.PathReplacements ??= new List<EmbyPathReplacement>();
+
+            var incoming = request.PathReplacements.Map(Project).ToList();
+
+            var toAdd = incoming.Filter(r => r.Id < 1).ToList();
+            var toRemove = embyMediaSource.PathReplacements.Filter(r => incoming.All(pr => pr.Id != r.Id)).ToList();
+            var toUpdate = incoming.Except(toAdd).ToList();
+
+            return _mediaSourceRepository.UpdatePathReplacements(embyMediaSource.Id, toAdd, toUpdate, toRemove);
+        }
+
+        private static EmbyPathReplacement Project(EmbyPathReplacementItem vm) =>
+            new() { Id = vm.Id, EmbyPath = vm.EmbyPath, LocalPath = vm.LocalPath };
+
+        private Task<Validation<BaseError, EmbyMediaSource>> Validate(UpdateEmbyPathReplacements request) =>
+            EmbyMediaSourceMustExist(request);
+
+        private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist(
+            UpdateEmbyPathReplacements request) =>
+            _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId)
+                .Map(
+                    v => v.ToValidation<BaseError>(
+                        $"Emby media source {request.EmbyMediaSourceId} does not exist."));
+    }
+}
@@ -0,0 +1,4 @@
+namespace ErsatzTV.Application.Emby
+{
+    public record EmbyConnectionParametersViewModel(string Address);
+}
@@ -0,0 +1,8 @@
+using ErsatzTV.Application.Libraries;
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.Emby
+{
+    public record EmbyLibraryViewModel(int Id, string Name, LibraryMediaKind MediaKind, bool ShouldSyncItems)
+        : LibraryViewModel("Emby", Id, Name, MediaKind);
+}
@@ -0,0 +1,9 @@
+using ErsatzTV.Application.MediaSources;
+
+namespace ErsatzTV.Application.Emby
+{
+    public record EmbyMediaSourceViewModel(int Id, string Name, string Address) : RemoteMediaSourceViewModel(
+        Id,
+        Name,
+        Address);
+}
@@ -0,0 +1,4 @@
+namespace ErsatzTV.Application.Emby
+{
+    public record EmbyPathReplacementViewModel(int Id, string EmbyPath, string LocalPath);
+}
@@ -0,0 +1,19 @@
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.Emby
+{
+    internal static class Mapper
+    {
+        internal static EmbyMediaSourceViewModel ProjectToViewModel(EmbyMediaSource embyMediaSource) =>
+            new(
+                embyMediaSource.Id,
+                embyMediaSource.ServerName,
+                embyMediaSource.Connections.HeadOrNone().Match(c => c.Address, string.Empty));
+
+        internal static EmbyLibraryViewModel ProjectToViewModel(EmbyLibrary library) =>
+            new(library.Id, library.Name, library.MediaKind, library.ShouldSyncItems);
+
+        internal static EmbyPathReplacementViewModel ProjectToViewModel(EmbyPathReplacement pathReplacement) =>
+            new(pathReplacement.Id, pathReplacement.EmbyPath, pathReplacement.LocalPath);
+    }
+}
@@ -0,0 +1,7 @@
+using System.Collections.Generic;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetAllEmbyMediaSources : IRequest<List<EmbyMediaSourceViewModel>>;
+}
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+using static ErsatzTV.Application.Emby.Mapper;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public class GetAllEmbyMediaSourcesHandler : IRequestHandler<GetAllEmbyMediaSources, List<EmbyMediaSourceViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public GetAllEmbyMediaSourcesHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;
+
+        public Task<List<EmbyMediaSourceViewModel>> Handle(
+            GetAllEmbyMediaSources request,
+            CancellationToken cancellationToken) =>
+            _mediaSourceRepository.GetAllEmby().Map(list => list.Map(ProjectToViewModel).ToList());
+    }
+}
@@ -0,0 +1,8 @@
+using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbyConnectionParameters : IRequest<Either<BaseError, EmbyConnectionParametersViewModel>>;
+}
@@ -0,0 +1,73 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public class GetEmbyConnectionParametersHandler : IRequestHandler<GetEmbyConnectionParameters,
+        Either<BaseError, EmbyConnectionParametersViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly IMemoryCache _memoryCache;
+
+        public GetEmbyConnectionParametersHandler(
+            IMemoryCache memoryCache,
+            IMediaSourceRepository mediaSourceRepository)
+        {
+            _memoryCache = memoryCache;
+            _mediaSourceRepository = mediaSourceRepository;
+        }
+
+        public async Task<Either<BaseError, EmbyConnectionParametersViewModel>> Handle(
+            GetEmbyConnectionParameters request,
+            CancellationToken cancellationToken)
+        {
+            if (_memoryCache.TryGetValue(request, out EmbyConnectionParametersViewModel parameters))
+            {
+                return parameters;
+            }
+
+            Either<BaseError, EmbyConnectionParametersViewModel> maybeParameters =
+                await Validate()
+                    .MapT(cp => new EmbyConnectionParametersViewModel(cp.ActiveConnection.Address))
+                    .Map(v => v.ToEither<EmbyConnectionParametersViewModel>());
+
+            return maybeParameters.Match(
+                p =>
+                {
+                    _memoryCache.Set(request, p, TimeSpan.FromHours(1));
+                    return maybeParameters;
+                },
+                error => error);
+        }
+
+        private Task<Validation<BaseError, ConnectionParameters>> Validate() =>
+            EmbyMediaSourceMustExist()
+                .BindT(MediaSourceMustHaveActiveConnection);
+
+        private Task<Validation<BaseError, EmbyMediaSource>> EmbyMediaSourceMustExist() =>
+            _mediaSourceRepository.GetAllEmby().Map(list => list.HeadOrNone())
+                .Map(
+                    v => v.ToValidation<BaseError>(
+                        "Emby media source does not exist."));
+
+        private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
+            EmbyMediaSource embyMediaSource)
+        {
+            Option<EmbyConnection> maybeConnection = embyMediaSource.Connections.FirstOrDefault();
+            return maybeConnection.Map(connection => new ConnectionParameters(embyMediaSource, connection))
+                .ToValidation<BaseError>("Emby media source requires an active connection");
+        }
+
+        private record ConnectionParameters(
+            EmbyMediaSource EmbyMediaSource,
+            EmbyConnection ActiveConnection);
+    }
+}
@@ -0,0 +1,7 @@
+using System.Collections.Generic;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbyLibrariesBySourceId(int EmbyMediaSourceId) : IRequest<List<EmbyLibraryViewModel>>;
+}
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+using static ErsatzTV.Application.Emby.Mapper;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public class
+        GetEmbyLibrariesBySourceIdHandler : IRequestHandler<GetEmbyLibrariesBySourceId, List<EmbyLibraryViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public GetEmbyLibrariesBySourceIdHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;
+
+        public Task<List<EmbyLibraryViewModel>> Handle(
+            GetEmbyLibrariesBySourceId request,
+            CancellationToken cancellationToken) =>
+            _mediaSourceRepository.GetEmbyLibraries(request.EmbyMediaSourceId)
+                .Map(list => list.Map(ProjectToViewModel).ToList());
+    }
+}
@@ -0,0 +1,7 @@
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbyMediaSourceById(int EmbyMediaSourceId) : IRequest<Option<EmbyMediaSourceViewModel>>;
+}
@@ -0,0 +1,23 @@
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+using static ErsatzTV.Application.Emby.Mapper;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public class
+        GetEmbyMediaSourceByIdHandler : IRequestHandler<GetEmbyMediaSourceById, Option<EmbyMediaSourceViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public GetEmbyMediaSourceByIdHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;
+
+        public Task<Option<EmbyMediaSourceViewModel>> Handle(
+            GetEmbyMediaSourceById request,
+            CancellationToken cancellationToken) =>
+            _mediaSourceRepository.GetEmby(request.EmbyMediaSourceId).MapT(ProjectToViewModel);
+    }
+}
@@ -0,0 +1,8 @@
+using System.Collections.Generic;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbyPathReplacementsBySourceId
+        (int EmbyMediaSourceId) : IRequest<List<EmbyPathReplacementViewModel>>;
+}
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+using static ErsatzTV.Application.Emby.Mapper;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public class GetEmbyPathReplacementsBySourceIdHandler : IRequestHandler<GetEmbyPathReplacementsBySourceId,
+        List<EmbyPathReplacementViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+
+        public GetEmbyPathReplacementsBySourceIdHandler(IMediaSourceRepository mediaSourceRepository) =>
+            _mediaSourceRepository = mediaSourceRepository;
+
+        public Task<List<EmbyPathReplacementViewModel>> Handle(
+            GetEmbyPathReplacementsBySourceId request,
+            CancellationToken cancellationToken) =>
+            _mediaSourceRepository.GetEmbyPathReplacements(request.EmbyMediaSourceId)
+                .Map(list => list.Map(ProjectToViewModel).ToList());
+    }
+}
@@ -0,0 +1,7 @@
+using ErsatzTV.Core.Emby;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public record GetEmbySecrets : IRequest<EmbySecrets>;
+}
@@ -0,0 +1,19 @@
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Interfaces.Emby;
+using MediatR;
+
+namespace ErsatzTV.Application.Emby.Queries
+{
+    public class GetEmbySecretsHandler : IRequestHandler<GetEmbySecrets, EmbySecrets>
+    {
+        private readonly IEmbySecretStore _embySecretStore;
+
+        public GetEmbySecretsHandler(IEmbySecretStore embySecretStore) =>
+            _embySecretStore = embySecretStore;
+
+        public Task<EmbySecrets> Handle(GetEmbySecrets request, CancellationToken cancellationToken) =>
+            _embySecretStore.ReadSecrets();
+    }
+}
@@ -3,6 +3,7 @@
    <PropertyGroup>
        <TargetFramework>net5.0</TargetFramework>
        <NoWarn>VSTHRD200</NoWarn>
+        <DebugType>embedded</DebugType>
    </PropertyGroup>

    <ItemGroup>
@@ -16,7 +17,7 @@
        <PrivateAssets>all</PrivateAssets>
        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      </PackageReference>
-      <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
      <PackageReference Include="Winista.MimeDetect" Version="1.0.1" />
    </ItemGroup>

@@ -1,11 +1,13 @@
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Runtime;
 using LanguageExt;

 namespace ErsatzTV.Application.FFmpegProfiles.Commands
@@ -14,13 +16,16 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
    {
        private readonly IConfigElementRepository _configElementRepository;
        private readonly ILocalFileSystem _localFileSystem;
+        private readonly IRuntimeInfo _runtimeInfo;

        public UpdateFFmpegSettingsHandler(
            IConfigElementRepository configElementRepository,
-            ILocalFileSystem localFileSystem)
+            ILocalFileSystem localFileSystem,
+            IRuntimeInfo runtimeInfo)
        {
            _configElementRepository = configElementRepository;
            _localFileSystem = localFileSystem;
+            _runtimeInfo = runtimeInfo;
        }

        public Task<Either<BaseError, Unit>> Handle(
@@ -31,8 +36,8 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
                .Bind(v => v.ToEitherAsync());

        private async Task<Validation<BaseError, Unit>> Validate(UpdateFFmpegSettings request) =>
-            (await FFmpegMustExist(request), await FFprobeMustExist(request))
-            .Apply((_, _) => Unit.Default);
+            (await FFmpegMustExist(request), await FFprobeMustExist(request), ReportsAreNotSupportedOnWindows(request))
+            .Apply((_, _, _) => Unit.Default);

        private Task<Validation<BaseError, Unit>> FFmpegMustExist(UpdateFFmpegSettings request) =>
            ValidateToolPath(request.Settings.FFmpegPath, "ffmpeg");
@@ -40,6 +45,16 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
        private Task<Validation<BaseError, Unit>> FFprobeMustExist(UpdateFFmpegSettings request) =>
            ValidateToolPath(request.Settings.FFprobePath, "ffprobe");

+        private Validation<BaseError, Unit> ReportsAreNotSupportedOnWindows(UpdateFFmpegSettings request)
+        {
+            if (request.Settings.SaveReports && _runtimeInfo.IsOSPlatform(OSPlatform.Windows))
+            {
+                return BaseError.New("FFmpeg reports are not supported on Windows");
+            }
+
+            return Unit.Default;
+        }
+
        private async Task<Validation<BaseError, Unit>> ValidateToolPath(string path, string name)
        {
            if (!_localFileSystem.FileExists(path))
@@ -0,0 +1,6 @@
+namespace ErsatzTV.Application
+{
+    public interface IEmbyBackgroundServiceRequest
+    {
+    }
+}
@@ -0,0 +1,4 @@
+namespace ErsatzTV.Application.Images
+{
+    public record CachedImagePathViewModel(string FileName, string MimeType);
+}
@@ -1,5 +0,0 @@
-namespace ErsatzTV.Application.Images
-{
-    // ReSharper disable once SuggestBaseTypeForParameter
-    public record ImageViewModel(byte[] Contents, string MimeType);
-}
@@ -5,6 +5,7 @@ using MediatR;

 namespace ErsatzTV.Application.Images.Queries
 {
-    public record GetImageContents
-        (string FileName, ArtworkKind ArtworkKind, int? MaxHeight = null) : IRequest<Either<BaseError, ImageViewModel>>;
+    public record GetCachedImagePath
+        (string FileName, ArtworkKind ArtworkKind, int? MaxHeight = null) : IRequest<
+            Either<BaseError, CachedImagePathViewModel>>;
 }
@@ -0,0 +1,72 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Interfaces.Images;
+using LanguageExt;
+using MediatR;
+using Winista.Mime;
+using static LanguageExt.Prelude;
+
+namespace ErsatzTV.Application.Images.Queries
+{
+    public class
+        GetCachedImagePathHandler : IRequestHandler<GetCachedImagePath, Either<BaseError, CachedImagePathViewModel>>
+    {
+        private static readonly MimeTypes MimeTypes = new();
+        private readonly IImageCache _imageCache;
+
+        public GetCachedImagePathHandler(IImageCache imageCache) => _imageCache = imageCache;
+
+        public async Task<Either<BaseError, CachedImagePathViewModel>> Handle(
+            GetCachedImagePath request,
+            CancellationToken cancellationToken)
+        {
+            try
+            {
+                MimeType mimeType;
+
+                string cachePath = _imageCache.GetPathForImage(
+                    request.FileName,
+                    request.ArtworkKind,
+                    Optional(request.MaxHeight));
+                if (!File.Exists(cachePath))
+                {
+                    if (request.MaxHeight.HasValue)
+                    {
+                        string originalPath = _imageCache.GetPathForImage(request.FileName, request.ArtworkKind, None);
+                        byte[] contents = await File.ReadAllBytesAsync(originalPath, cancellationToken);
+                        Either<BaseError, byte[]> resizeResult =
+                            await _imageCache.ResizeImage(contents, request.MaxHeight.Value);
+                        resizeResult.IfRight(result => contents = result);
+
+                        string baseFolder = Path.GetDirectoryName(cachePath);
+                        if (baseFolder != null && !Directory.Exists(baseFolder))
+                        {
+                            Directory.CreateDirectory(baseFolder);
+                        }
+
+                        await File.WriteAllBytesAsync(cachePath, contents, cancellationToken);
+
+                        mimeType = new MimeType("image/jpeg");
+                    }
+                    else
+                    {
+                        return BaseError.New($"Artwork does not exist on disk at {cachePath}");
+                    }
+                }
+                else
+                {
+                    mimeType = MimeTypes.GetMimeTypeFromFile(cachePath);
+                }
+
+                return new CachedImagePathViewModel(cachePath, mimeType.Name);
+            }
+            catch (Exception ex)
+            {
+                return BaseError.New(ex.Message);
+            }
+        }
+    }
+}
@@ -1,69 +0,0 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using ErsatzTV.Core;
-using ErsatzTV.Core.Domain;
-using ErsatzTV.Core.Interfaces.Images;
-using LanguageExt;
-using MediatR;
-using Microsoft.Extensions.Caching.Memory;
-using Winista.Mime;
-
-namespace ErsatzTV.Application.Images.Queries
-{
-    public class GetImageContentsHandler : IRequestHandler<GetImageContents, Either<BaseError, ImageViewModel>>
-    {
-        private static readonly MimeTypes MimeTypes = new();
-        private readonly IImageCache _imageCache;
-        private readonly IMemoryCache _memoryCache;
-
-        public GetImageContentsHandler(IImageCache imageCache, IMemoryCache memoryCache)
-        {
-            _imageCache = imageCache;
-            _memoryCache = memoryCache;
-        }
-
-        public async Task<Either<BaseError, ImageViewModel>> Handle(
-            GetImageContents request,
-            CancellationToken cancellationToken)
-        {
-            try
-            {
-                return await _memoryCache.GetOrCreateAsync(
-                    request.FileName,
-                    async entry =>
-                    {
-                        entry.SlidingExpiration = TimeSpan.FromHours(1);
-
-                        string subfolder = request.FileName.Substring(0, 2);
-                        string baseFolder = request.ArtworkKind switch
-                        {
-                            ArtworkKind.Poster => Path.Combine(FileSystemLayout.PosterCacheFolder, subfolder),
-                            ArtworkKind.Thumbnail => Path.Combine(FileSystemLayout.ThumbnailCacheFolder, subfolder),
-                            ArtworkKind.Logo => Path.Combine(FileSystemLayout.LogoCacheFolder, subfolder),
-                            ArtworkKind.FanArt => Path.Combine(FileSystemLayout.FanArtCacheFolder, subfolder),
-                            _ => FileSystemLayout.LegacyImageCacheFolder
-                        };
-
-                        string fileName = Path.Combine(baseFolder, request.FileName);
-                        byte[] contents = await File.ReadAllBytesAsync(fileName, cancellationToken);
-
-                        if (request.MaxHeight.HasValue)
-                        {
-                            Either<BaseError, byte[]> resizeResult = await _imageCache
-                                .ResizeImage(contents, request.MaxHeight.Value);
-                            resizeResult.IfRight(result => contents = result);
-                        }
-
-                        MimeType mimeType = MimeTypes.GetMimeType(contents);
-                        return new ImageViewModel(contents, mimeType.Name);
-                    });
-            }
-            catch (Exception ex)
-            {
-                return BaseError.New(ex.Message);
-            }
-        }
-    }
-}
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Jellyfin;
 using ErsatzTV.Core.Interfaces.Locking;
 using ErsatzTV.Core.Interfaces.Repositories;
@@ -35,8 +36,9 @@ namespace ErsatzTV.Application.Jellyfin.Commands
        {
            List<int> ids = await _mediaSourceRepository.DeleteAllJellyfin();
            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();
            await _jellyfinSecretStore.DeleteAll();
-            _entityLocker.UnlockJellyfin();
+            _entityLocker.UnlockRemoteMediaSource<JellyfinMediaSource>();

            return Unit.Default;
        }
@@ -6,6 +6,7 @@ using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Jellyfin;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Core.Jellyfin;
 using LanguageExt;
 using Microsoft.Extensions.Logging;
@@ -22,17 +23,20 @@ namespace ErsatzTV.Application.Jellyfin.Commands
        private readonly IJellyfinSecretStore _jellyfinSecretStore;
        private readonly ILogger<SynchronizeJellyfinLibrariesHandler> _logger;
        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly ISearchIndex _searchIndex;

        public SynchronizeJellyfinLibrariesHandler(
            IMediaSourceRepository mediaSourceRepository,
            IJellyfinSecretStore jellyfinSecretStore,
            IJellyfinApiClient jellyfinApiClient,
-            ILogger<SynchronizeJellyfinLibrariesHandler> logger)
+            ILogger<SynchronizeJellyfinLibrariesHandler> logger,
+            ISearchIndex searchIndex)
        {
            _mediaSourceRepository = mediaSourceRepository;
            _jellyfinSecretStore = jellyfinSecretStore;
            _jellyfinApiClient = jellyfinApiClient;
            _logger = logger;
+            _searchIndex = searchIndex;
        }

        public Task<Either<BaseError, Unit>> Handle(
@@ -77,16 +81,21 @@ namespace ErsatzTV.Application.Jellyfin.Commands
                connectionParameters.ApiKey);

            await maybeLibraries.Match(
-                libraries =>
+                async libraries =>
                {
                    var existing = connectionParameters.JellyfinMediaSource.Libraries.OfType<JellyfinLibrary>()
                        .ToList();
                    var toAdd = libraries.Filter(library => existing.All(l => l.ItemId != library.ItemId)).ToList();
                    var toRemove = existing.Filter(library => libraries.All(l => l.ItemId != library.ItemId)).ToList();
-                    return _mediaSourceRepository.UpdateLibraries(
+                    List<int> ids = await _mediaSourceRepository.UpdateLibraries(
                        connectionParameters.JellyfinMediaSource.Id,
                        toAdd,
                        toRemove);
+                    if (ids.Any())
+                    {
+                        await _searchIndex.RemoveItems(ids);
+                        _searchIndex.Commit();
+                    }
                },
                error =>
                {
@@ -31,6 +31,7 @@ namespace ErsatzTV.Application.Jellyfin.Commands
            var toDisable = request.Preferences.Filter(p => p.ShouldSyncItems == false).Map(p => p.Id).ToList();
            List<int> ids = await _mediaSourceRepository.DisableJellyfinLibrarySync(toDisable);
            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();

            IEnumerable<int> toEnable = request.Preferences.Filter(p => p.ShouldSyncItems).Map(p => p.Id);
            await _mediaSourceRepository.EnableJellyfinLibrarySync(toEnable);
@@ -0,0 +1,4 @@
+namespace ErsatzTV.Application.Jellyfin
+{
+    public record JellyfinConnectionParametersViewModel(string Address);
+}
@@ -2,5 +2,8 @@

 namespace ErsatzTV.Application.Jellyfin
 {
-    public record JellyfinMediaSourceViewModel(int Id, string Name, string Address) : MediaSourceViewModel(Id, Name);
+    public record JellyfinMediaSourceViewModel(int Id, string Name, string Address) : RemoteMediaSourceViewModel(
+        Id,
+        Name,
+        Address);
 }
@@ -0,0 +1,8 @@
+using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Jellyfin.Queries
+{
+    public record GetJellyfinConnectionParameters : IRequest<Either<BaseError, JellyfinConnectionParametersViewModel>>;
+}
@@ -0,0 +1,73 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace ErsatzTV.Application.Jellyfin.Queries
+{
+    public class GetJellyfinConnectionParametersHandler : IRequestHandler<GetJellyfinConnectionParameters,
+        Either<BaseError, JellyfinConnectionParametersViewModel>>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly IMemoryCache _memoryCache;
+
+        public GetJellyfinConnectionParametersHandler(
+            IMemoryCache memoryCache,
+            IMediaSourceRepository mediaSourceRepository)
+        {
+            _memoryCache = memoryCache;
+            _mediaSourceRepository = mediaSourceRepository;
+        }
+
+        public async Task<Either<BaseError, JellyfinConnectionParametersViewModel>> Handle(
+            GetJellyfinConnectionParameters request,
+            CancellationToken cancellationToken)
+        {
+            if (_memoryCache.TryGetValue(request, out JellyfinConnectionParametersViewModel parameters))
+            {
+                return parameters;
+            }
+
+            Either<BaseError, JellyfinConnectionParametersViewModel> maybeParameters =
+                await Validate()
+                    .MapT(cp => new JellyfinConnectionParametersViewModel(cp.ActiveConnection.Address))
+                    .Map(v => v.ToEither<JellyfinConnectionParametersViewModel>());
+
+            return maybeParameters.Match(
+                p =>
+                {
+                    _memoryCache.Set(request, p, TimeSpan.FromHours(1));
+                    return maybeParameters;
+                },
+                error => error);
+        }
+
+        private Task<Validation<BaseError, ConnectionParameters>> Validate() =>
+            JellyfinMediaSourceMustExist()
+                .BindT(MediaSourceMustHaveActiveConnection);
+
+        private Task<Validation<BaseError, JellyfinMediaSource>> JellyfinMediaSourceMustExist() =>
+            _mediaSourceRepository.GetAllJellyfin().Map(list => list.HeadOrNone())
+                .Map(
+                    v => v.ToValidation<BaseError>(
+                        "Jellyfin media source does not exist."));
+
+        private Validation<BaseError, ConnectionParameters> MediaSourceMustHaveActiveConnection(
+            JellyfinMediaSource jellyfinMediaSource)
+        {
+            Option<JellyfinConnection> maybeConnection = jellyfinMediaSource.Connections.FirstOrDefault();
+            return maybeConnection.Map(connection => new ConnectionParameters(jellyfinMediaSource, connection))
+                .ToValidation<BaseError>("Jellyfin media source requires an active connection");
+        }
+
+        private record ConnectionParameters(
+            JellyfinMediaSource JellyfinMediaSource,
+            JellyfinConnection ActiveConnection);
+    }
+}
@@ -32,6 +32,7 @@ namespace ErsatzTV.Application.Libraries.Commands
        {
            List<int> ids = await _libraryRepository.GetMediaIdsByLocalPath(libraryPath.Id);
            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();
            await _libraryRepository.DeleteLocalPath(libraryPath.Id);
            return Unit.Default;
        }
@@ -1,4 +1,5 @@
 using System;
+using ErsatzTV.Application.Emby;
 using ErsatzTV.Application.Jellyfin;
 using ErsatzTV.Core.Domain;

@@ -12,6 +13,7 @@ namespace ErsatzTV.Application.Libraries
                LocalLibrary l => ProjectToViewModel(l),
                PlexLibrary p => new PlexLibraryViewModel(p.Id, p.Name, p.MediaKind),
                JellyfinLibrary j => new JellyfinLibraryViewModel(j.Id, j.Name, j.MediaKind, j.ShouldSyncItems),
+                EmbyLibrary e => new EmbyLibraryViewModel(e.Id, e.Name, e.MediaKind, e.ShouldSyncItems),
                _ => throw new ArgumentOutOfRangeException(nameof(library))
            };

@@ -31,6 +31,7 @@ namespace ErsatzTV.Application.Libraries.Queries
                LocalLibrary => true,
                PlexLibrary plex => plex.ShouldSyncItems,
                JellyfinLibrary jellyfin => jellyfin.ShouldSyncItems,
+                EmbyLibrary emby => emby.ShouldSyncItems,
                _ => false
            };
    }
@@ -0,0 +1,7 @@
+using ErsatzTV.Core;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Maintenance.Commands
+{
+    public record DeleteOrphanedArtwork : MediatR.IRequest<Either<BaseError, Unit>>, IBackgroundServiceRequest;
+}
@@ -0,0 +1,23 @@
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using static LanguageExt.Prelude;
+
+namespace ErsatzTV.Application.Maintenance.Commands
+{
+    public class DeleteOrphanedArtworkHandler : MediatR.IRequestHandler<DeleteOrphanedArtwork, Either<BaseError, Unit>>
+    {
+        private readonly IArtworkRepository _artworkRepository;
+
+        public DeleteOrphanedArtworkHandler(IArtworkRepository artworkRepository) =>
+            _artworkRepository = artworkRepository;
+
+        public Task<Either<BaseError, Unit>>
+            Handle(DeleteOrphanedArtwork request, CancellationToken cancellationToken) =>
+            _artworkRepository.GetOrphanedArtwork()
+                .Bind(_artworkRepository.Delete)
+                .Map(_ => Right<BaseError, Unit>(Unit.Default));
+    }
+}
@@ -1,6 +1,8 @@
 using System;
 using System.Linq;
 using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Jellyfin;
 using LanguageExt;
 using static LanguageExt.Prelude;

@@ -10,17 +12,19 @@ namespace ErsatzTV.Application.MediaCards
    {
        internal static TelevisionShowCardViewModel ProjectToViewModel(
            ShowMetadata showMetadata,
-            Option<JellyfinMediaSource> maybeJellyfin) =>
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby) =>
            new(
                showMetadata.ShowId,
                showMetadata.Title,
                showMetadata.Year?.ToString(),
                showMetadata.SortTitle,
-                GetPoster(showMetadata, maybeJellyfin));
+                GetPoster(showMetadata, maybeJellyfin, maybeEmby));

        internal static TelevisionSeasonCardViewModel ProjectToViewModel(
            Season season,
-            Option<JellyfinMediaSource> maybeJellyfin) =>
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby) =>
            new(
                season.Show.ShowMetadata.HeadOrNone().Match(m => m.Title ?? string.Empty, () => string.Empty),
                season.Id,
@@ -28,12 +32,15 @@ namespace ErsatzTV.Application.MediaCards
                GetSeasonName(season.SeasonNumber),
                string.Empty,
                GetSeasonName(season.SeasonNumber),
-                season.SeasonMetadata.HeadOrNone().Map(sm => GetPoster(sm, maybeJellyfin)).IfNone(string.Empty),
+                season.SeasonMetadata.HeadOrNone().Map(sm => GetPoster(sm, maybeJellyfin, maybeEmby))
+                    .IfNone(string.Empty),
                season.SeasonNumber == 0 ? "S" : season.SeasonNumber.ToString());

        internal static TelevisionEpisodeCardViewModel ProjectToViewModel(
            EpisodeMetadata episodeMetadata,
-            Option<JellyfinMediaSource> maybeJellyfin) =>
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby,
+            bool isSearchResult) =>
            new(
                episodeMetadata.EpisodeId,
                episodeMetadata.ReleaseDate ?? DateTime.MinValue,
@@ -42,22 +49,32 @@ namespace ErsatzTV.Application.MediaCards
                    () => string.Empty),
                episodeMetadata.Episode.Season.ShowId,
                episodeMetadata.Episode.SeasonId,
+                episodeMetadata.Episode.Season.SeasonNumber,
                episodeMetadata.Episode.EpisodeNumber,
                episodeMetadata.Title,
+                episodeMetadata.SortTitle,
                episodeMetadata.Episode.EpisodeMetadata.HeadOrNone().Match(
                    em => em.Plot ?? string.Empty,
                    () => string.Empty),
-                GetThumbnail(episodeMetadata, maybeJellyfin));
+                isSearchResult
+                    ? GetPoster(
+                        episodeMetadata.Episode.Season.SeasonMetadata.Head(),
+                        maybeJellyfin,
+                        maybeEmby)
+                    : GetThumbnail(episodeMetadata, maybeJellyfin, maybeEmby),
+                episodeMetadata.Directors.Map(d => d.Name).ToList(),
+                episodeMetadata.Writers.Map(w => w.Name).ToList());

        internal static MovieCardViewModel ProjectToViewModel(
            MovieMetadata movieMetadata,
-            Option<JellyfinMediaSource> maybeJellyfin) =>
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby) =>
            new(
                movieMetadata.MovieId,
                movieMetadata.Title,
                movieMetadata.Year?.ToString(),
                movieMetadata.SortTitle,
-                GetPoster(movieMetadata, maybeJellyfin));
+                GetPoster(movieMetadata, maybeJellyfin, maybeEmby));

        internal static MusicVideoCardViewModel ProjectToViewModel(MusicVideoMetadata musicVideoMetadata) =>
            new(
@@ -66,7 +83,7 @@ namespace ErsatzTV.Application.MediaCards
                musicVideoMetadata.MusicVideo.Artist.ArtistMetadata.Head().Title,
                musicVideoMetadata.SortTitle,
                musicVideoMetadata.Plot,
-                GetThumbnail(musicVideoMetadata, None));
+                GetThumbnail(musicVideoMetadata, None, None));

        internal static ArtistCardViewModel ProjectToViewModel(ArtistMetadata artistMetadata) =>
            new(
@@ -74,37 +91,48 @@ namespace ErsatzTV.Application.MediaCards
                artistMetadata.Title,
                artistMetadata.Disambiguation,
                artistMetadata.SortTitle,
-                GetThumbnail(artistMetadata, None));
+                GetThumbnail(artistMetadata, None, None));

        internal static CollectionCardResultsViewModel
-            ProjectToViewModel(Collection collection, Option<JellyfinMediaSource> maybeJellyfin) =>
+            ProjectToViewModel(
+                Collection collection,
+                Option<JellyfinMediaSource> maybeJellyfin,
+                Option<EmbyMediaSource> maybeEmby) =>
            new(
                collection.Name,
                collection.MediaItems.OfType<Movie>().Map(
-                    m => ProjectToViewModel(m.MovieMetadata.Head(), maybeJellyfin) with
+                    m => ProjectToViewModel(m.MovieMetadata.Head(), maybeJellyfin, maybeEmby) with
                    {
                        CustomIndex = GetCustomIndex(collection, m.Id)
                    }).ToList(),
-                collection.MediaItems.OfType<Show>().Map(s => ProjectToViewModel(s.ShowMetadata.Head(), maybeJellyfin))
+                collection.MediaItems.OfType<Show>()
+                    .Map(s => ProjectToViewModel(s.ShowMetadata.Head(), maybeJellyfin, maybeEmby))
+                    .ToList(),
+                collection.MediaItems.OfType<Season>().Map(s => ProjectToViewModel(s, maybeJellyfin, maybeEmby))
                    .ToList(),
-                collection.MediaItems.OfType<Season>().Map(s => ProjectToViewModel(s, maybeJellyfin)).ToList(),
                collection.MediaItems.OfType<Episode>()
-                    .Map(e => ProjectToViewModel(e.EpisodeMetadata.Head(), maybeJellyfin))
+                    .Map(e => ProjectToViewModel(e.EpisodeMetadata.Head(), maybeJellyfin, maybeEmby, false))
                    .ToList(),
                collection.MediaItems.OfType<Artist>().Map(a => ProjectToViewModel(a.ArtistMetadata.Head())).ToList(),
                collection.MediaItems.OfType<MusicVideo>().Map(mv => ProjectToViewModel(mv.MusicVideoMetadata.Head()))
                    .ToList()) { UseCustomPlaybackOrder = collection.UseCustomPlaybackOrder };

-        internal static ActorCardViewModel ProjectToViewModel(Actor actor, Option<JellyfinMediaSource> maybeJellyfin)
+        internal static ActorCardViewModel ProjectToViewModel(
+            Actor actor,
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby)
        {
            string artwork = actor.Artwork?.Path ?? string.Empty;

            if (maybeJellyfin.IsSome && artwork.StartsWith("jellyfin://"))
            {
-                string address = maybeJellyfin.Map(ms => ms.Connections.HeadOrNone().Map(c => c.Address))
-                    .Flatten()
-                    .IfNone("jellyfin://");
-                artwork = artwork.Replace("jellyfin://", address) + "&fillheight=440";
+                artwork = JellyfinUrl.ForArtwork(maybeJellyfin, artwork)
+                    .SetQueryParam("fillHeight", 440);
+            }
+            else if (maybeEmby.IsSome && artwork.StartsWith("emby://"))
+            {
+                artwork = EmbyUrl.ForArtwork(maybeEmby, artwork)
+                    .SetQueryParam("maxHeight", 440);
            }

            return new ActorCardViewModel(actor.Id, actor.Name, actor.Role, artwork);
@@ -118,34 +146,45 @@ namespace ErsatzTV.Application.MediaCards
        private static string GetSeasonName(int number) =>
            number == 0 ? "Specials" : $"Season {number}";

-        private static string GetPoster(Metadata metadata, Option<JellyfinMediaSource> maybeJellyfin)
+        private static string GetPoster(
+            Metadata metadata,
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby)
        {
            string poster = Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Poster))
                .Match(a => a.Path, string.Empty);

            if (maybeJellyfin.IsSome && poster.StartsWith("jellyfin://"))
            {
-                string address = maybeJellyfin.Map(ms => ms.Connections.HeadOrNone().Map(c => c.Address))
-                    .Flatten()
-                    .IfNone("jellyfin://");
-                poster = poster.Replace("jellyfin://", address) + "&fillHeight=440";
+                poster = JellyfinUrl.ForArtwork(maybeJellyfin, poster)
+                    .SetQueryParam("fillHeight", 440);
+            }
+            else if (maybeEmby.IsSome && poster.StartsWith("emby://"))
+            {
+                poster = EmbyUrl.ForArtwork(maybeEmby, poster)
+                    .SetQueryParam("maxHeight", 440);
            }

            return poster;
        }

-        private static string GetThumbnail(Metadata metadata, Option<JellyfinMediaSource> maybeJellyfin)
+        private static string GetThumbnail(
+            Metadata metadata,
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby)
        {
            string thumb = Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == ArtworkKind.Thumbnail))
                .Match(a => a.Path, string.Empty);

            if (maybeJellyfin.IsSome && thumb.StartsWith("jellyfin://"))
            {
-                string address = maybeJellyfin.Map(ms => ms.Connections.HeadOrNone().Map(c => c.Address))
-                    .Flatten()
-                    .IfNone("jellyfin://");
-                thumb = thumb.Replace("jellyfin://", address) +
-                        "&fillHeight=220"; // TODO: this height is optimized for episode
+                thumb = JellyfinUrl.ForArtwork(maybeJellyfin, thumb)
+                    .SetQueryParam("fillHeight", 220);
+            }
+            else if (maybeEmby.IsSome && thumb.StartsWith("emby://"))
+            {
+                thumb = EmbyUrl.ForArtwork(maybeEmby, thumb)
+                    .SetQueryParam("maxHeight", 220);
            }

            return thumb;
@@ -30,10 +30,13 @@ namespace ErsatzTV.Application.MediaCards.Queries
            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                .Map(list => list.HeadOrNone());

+            Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                .Map(list => list.HeadOrNone());
+
            return await _collectionRepository
                .GetCollectionWithItemsUntracked(request.Id)
                .Map(c => c.ToEither(BaseError.New("Unable to load collection")))
-                .MapT(c => ProjectToViewModel(c, maybeJellyfin));
+                .MapT(c => ProjectToViewModel(c, maybeJellyfin, maybeEmby));
        }
    }
 }
@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Search;
 using LanguageExt;
 using MediatR;
 using static ErsatzTV.Application.MediaCards.Mapper;
@@ -34,11 +35,14 @@ namespace ErsatzTV.Application.MediaCards.Queries
            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                .Map(list => list.HeadOrNone());

+            Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                .Map(list => list.HeadOrNone());
+
            List<TelevisionEpisodeCardViewModel> results = await _televisionRepository
                .GetPagedEpisodes(request.TelevisionSeasonId, request.PageNumber, request.PageSize)
-                .Map(list => list.Map(e => ProjectToViewModel(e, maybeJellyfin)).ToList());
+                .Map(list => list.Map(e => ProjectToViewModel(e, maybeJellyfin, maybeEmby, false)).ToList());

-            return new TelevisionEpisodeCardResultsViewModel(count, results);
+            return new TelevisionEpisodeCardResultsViewModel(count, results, Option<SearchPageMap>.None);
        }
    }
 }
@@ -34,9 +34,12 @@ namespace ErsatzTV.Application.MediaCards.Queries
            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                .Map(list => list.HeadOrNone());

+            Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                .Map(list => list.HeadOrNone());
+
            List<TelevisionSeasonCardViewModel> results = await _televisionRepository
                .GetPagedSeasons(request.TelevisionShowId, request.PageNumber, request.PageSize)
-                .Map(list => list.Map(s => ProjectToViewModel(s, maybeJellyfin)).ToList());
+                .Map(list => list.Map(s => ProjectToViewModel(s, maybeJellyfin, maybeEmby)).ToList());

            return new TelevisionSeasonCardResultsViewModel(count, results);
        }
@@ -1,6 +1,11 @@
 using System.Collections.Generic;
+using ErsatzTV.Core.Search;
+using LanguageExt;

 namespace ErsatzTV.Application.MediaCards
 {
-    public record TelevisionEpisodeCardResultsViewModel(int Count, List<TelevisionEpisodeCardViewModel> Cards);
+    public record TelevisionEpisodeCardResultsViewModel(
+        int Count,
+        List<TelevisionEpisodeCardViewModel> Cards,
+        Option<SearchPageMap> PageMap);
 }
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;

 namespace ErsatzTV.Application.MediaCards
 {
@@ -9,15 +10,17 @@ namespace ErsatzTV.Application.MediaCards
        string ShowTitle,
        int ShowId,
        int SeasonId,
+        int Season,
        int Episode,
        string Title,
+        string SortTitle,
        string Plot,
-        string Poster) : MediaCardViewModel(
+        string Poster,
+        List<string> Directors,
+        List<string> Writers) : MediaCardViewModel(
        EpisodeId,
        Title,
        $"Episode {Episode}",
-        $"Episode {Episode}",
-        Poster)
-    {
-    }
+        SortTitle,
+        Poster);
 }
@@ -14,7 +14,5 @@
        Title,
        Subtitle,
        SortTitle,
-        Poster)
-    {
-    }
+        Poster);
 }
@@ -6,7 +6,5 @@
            Title,
            Subtitle,
            SortTitle,
-            Poster)
-    {
-    }
+            Poster);
 }
@@ -9,6 +9,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands
        int CollectionId,
        List<int> MovieIds,
        List<int> ShowIds,
+        List<int> EpisodeIds,
        List<int> ArtistIds,
        List<int> MusicVideoIds) : MediatR.IRequest<Either<BaseError, Unit>>;
 }
@@ -41,6 +41,7 @@ namespace ErsatzTV.Application.MediaCollections.Commands
        {
            var allItems = request.MovieIds
                .Append(request.ShowIds)
+                .Append(request.EpisodeIds)
                .Append(request.ArtistIds)
                .Append(request.MusicVideoIds)
                .ToList();
@@ -59,8 +60,9 @@ namespace ErsatzTV.Application.MediaCollections.Commands
        }

        private async Task<Validation<BaseError, Unit>> Validate(AddItemsToCollection request) =>
-            (await CollectionMustExist(request), await ValidateMovies(request), await ValidateShows(request))
-            .Apply((_, _, _) => Unit.Default);
+            (await CollectionMustExist(request), await ValidateMovies(request), await ValidateShows(request),
+                await ValidateEpisodes(request))
+            .Apply((_, _, _, _) => Unit.Default);

        private Task<Validation<BaseError, Unit>> CollectionMustExist(AddItemsToCollection request) =>
            _mediaCollectionRepository.GetCollectionWithItems(request.CollectionId)
@@ -80,5 +82,12 @@ namespace ErsatzTV.Application.MediaCollections.Commands
                .Filter(v => v == true)
                .MapT(_ => Unit.Default)
                .Map(v => v.ToValidation<BaseError>("Show does not exist"));
+
+        private Task<Validation<BaseError, Unit>> ValidateEpisodes(AddItemsToCollection request) =>
+            _televisionRepository.AllEpisodesExist(request.EpisodeIds)
+                .Map(Optional)
+                .Filter(v => v == true)
+                .MapT(_ => Unit.Default)
+                .Map(v => v.ToValidation<BaseError>("Show does not exist"));
    }
 }
@@ -0,0 +1,4 @@
+namespace ErsatzTV.Application.MediaSources
+{
+    public record RemoteMediaSourceViewModel(int Id, string Name, string Address) : MediaSourceViewModel(Id, Name);
+}
@@ -3,6 +3,9 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Jellyfin;
+using Flurl;
 using LanguageExt;
 using static LanguageExt.Prelude;

@@ -10,7 +13,10 @@ namespace ErsatzTV.Application.Movies
 {
    internal static class Mapper
    {
-        internal static MovieViewModel ProjectToViewModel(Movie movie, Option<JellyfinMediaSource> maybeJellyfin)
+        internal static MovieViewModel ProjectToViewModel(
+            Movie movie,
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby)
        {
            MovieMetadata metadata = Optional(movie.MovieMetadata).Flatten().Head();
            return new MovieViewModel(
@@ -20,13 +26,17 @@ namespace ErsatzTV.Application.Movies
                metadata.Genres.Map(g => g.Name).ToList(),
                metadata.Tags.Map(t => t.Name).ToList(),
                metadata.Studios.Map(s => s.Name).ToList(),
+                (metadata.ContentRating ?? string.Empty).Split("/").Map(s => s.Trim())
+                .Where(x => !string.IsNullOrWhiteSpace(x)).ToList(),
                LanguagesForMovie(movie),
                metadata.Actors.OrderBy(a => a.Order).ThenBy(a => a.Id)
-                    .Map(a => MediaCards.Mapper.ProjectToViewModel(a, maybeJellyfin))
-                    .ToList())
+                    .Map(a => MediaCards.Mapper.ProjectToViewModel(a, maybeJellyfin, maybeEmby))
+                    .ToList(),
+                metadata.Directors.Map(d => d.Name).ToList(),
+                metadata.Writers.Map(w => w.Name).ToList())
            {
-                Poster = Artwork(metadata, ArtworkKind.Poster, maybeJellyfin),
-                FanArt = Artwork(metadata, ArtworkKind.FanArt, maybeJellyfin)
+                Poster = Artwork(metadata, ArtworkKind.Poster, maybeJellyfin, maybeEmby),
+                FanArt = Artwork(metadata, ArtworkKind.FanArt, maybeJellyfin, maybeEmby)
            };
        }

@@ -49,22 +59,31 @@ namespace ErsatzTV.Application.Movies
        private static string Artwork(
            Metadata metadata,
            ArtworkKind artworkKind,
-            Option<JellyfinMediaSource> maybeJellyfin)
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby)
        {
            string artwork = Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == artworkKind))
                .Match(a => a.Path, string.Empty);

            if (maybeJellyfin.IsSome && artwork.StartsWith("jellyfin://"))
            {
-                string address = maybeJellyfin.Map(ms => ms.Connections.HeadOrNone().Map(c => c.Address))
-                    .Flatten()
-                    .IfNone("jellyfin://");
-                artwork = artwork.Replace("jellyfin://", address);
-
+                Url url = JellyfinUrl.ForArtwork(maybeJellyfin, artwork);
                if (artworkKind is ArtworkKind.Poster or ArtworkKind.Thumbnail)
                {
-                    artwork += "&fillHeight=440";
+                    url.SetQueryParam("fillHeight", 440);
                }
+
+                artwork = url;
+            }
+            else if (maybeEmby.IsSome && artwork.StartsWith("emby://"))
+            {
+                Url url = EmbyUrl.ForArtwork(maybeEmby, artwork);
+                if (artworkKind is ArtworkKind.Poster or ArtworkKind.Thumbnail)
+                {
+                    url.SetQueryParam("maxHeight", 440);
+                }
+
+                artwork = url;
            }

            return artwork;
@@ -11,8 +11,11 @@ namespace ErsatzTV.Application.Movies
        List<string> Genres,
        List<string> Tags,
        List<string> Studios,
+        List<string> ContentRatings,
        List<CultureInfo> Languages,
-        List<ActorCardViewModel> Actors)
+        List<ActorCardViewModel> Actors,
+        List<string> Directors,
+        List<string> Writers)
    {
        public string Poster { get; set; }
        public string FanArt { get; set; }
@@ -26,8 +26,11 @@ namespace ErsatzTV.Application.Movies.Queries
            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                .Map(list => list.HeadOrNone());

+            Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                .Map(list => list.HeadOrNone());
+
            Option<Movie> movie = await _movieRepository.GetMovie(request.Id);
-            return movie.Map(m => ProjectToViewModel(m, maybeJellyfin));
+            return movie.Map(m => ProjectToViewModel(m, maybeJellyfin, maybeEmby));
        }
    }
 }
@@ -33,6 +33,7 @@ namespace ErsatzTV.Application.Plex.Commands
        {
            List<int> ids = await _mediaSourceRepository.DeleteAllPlex();
            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();
            await _plexSecretStore.DeleteAll();
            _entityLocker.UnlockPlex();

@@ -6,6 +6,7 @@ using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Plex;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Search;
 using ErsatzTV.Core.Plex;
 using LanguageExt;
 using Microsoft.Extensions.Logging;
@@ -19,17 +20,20 @@ namespace ErsatzTV.Application.Plex.Commands
        private readonly IMediaSourceRepository _mediaSourceRepository;
        private readonly IPlexSecretStore _plexSecretStore;
        private readonly IPlexServerApiClient _plexServerApiClient;
+        private readonly ISearchIndex _searchIndex;

        public SynchronizePlexLibrariesHandler(
            IMediaSourceRepository mediaSourceRepository,
            IPlexSecretStore plexSecretStore,
            IPlexServerApiClient plexServerApiClient,
-            ILogger<SynchronizePlexLibrariesHandler> logger)
+            ILogger<SynchronizePlexLibrariesHandler> logger,
+            ISearchIndex searchIndex)
        {
            _mediaSourceRepository = mediaSourceRepository;
            _plexSecretStore = plexSecretStore;
            _plexServerApiClient = plexServerApiClient;
            _logger = logger;
+            _searchIndex = searchIndex;
        }

        public Task<Either<BaseError, Unit>> Handle(
@@ -73,15 +77,20 @@ namespace ErsatzTV.Application.Plex.Commands
                connectionParameters.PlexServerAuthToken);

            await maybeLibraries.Match(
-                libraries =>
+                async libraries =>
                {
                    var existing = connectionParameters.PlexMediaSource.Libraries.OfType<PlexLibrary>().ToList();
                    var toAdd = libraries.Filter(library => existing.All(l => l.Key != library.Key)).ToList();
                    var toRemove = existing.Filter(library => libraries.All(l => l.Key != library.Key)).ToList();
-                    return _mediaSourceRepository.UpdateLibraries(
+                    List<int> ids = await _mediaSourceRepository.UpdateLibraries(
                        connectionParameters.PlexMediaSource.Id,
                        toAdd,
                        toRemove);
+                    if (ids.Any())
+                    {
+                        await _searchIndex.RemoveItems(ids);
+                        _searchIndex.Commit();
+                    }
                },
                error =>
                {
@@ -31,6 +31,7 @@ namespace ErsatzTV.Application.Plex.Commands
            var toDisable = request.Preferences.Filter(p => p.ShouldSyncItems == false).Map(p => p.Id).ToList();
            List<int> ids = await _mediaSourceRepository.DisablePlexLibrarySync(toDisable);
            await _searchIndex.RemoveItems(ids);
+            _searchIndex.Commit();

            IEnumerable<int> toEnable = request.Preferences.Filter(p => p.ShouldSyncItems).Map(p => p.Id);
            await _mediaSourceRepository.EnablePlexLibrarySync(toEnable);
@@ -132,11 +132,14 @@ namespace ErsatzTV.Application.ProgramSchedules.Commands
                    CollectionType = item.CollectionType,
                    CollectionId = item.CollectionId,
                    MediaItemId = item.MediaItemId,
-                    PlayoutDuration = item.PlayoutDuration.GetValueOrDefault(),
+                    PlayoutDuration = FixDuration(item.PlayoutDuration.GetValueOrDefault()),
                    OfflineTail = item.OfflineTail.GetValueOrDefault(),
                    CustomTitle = item.CustomTitle
                },
                _ => throw new NotSupportedException($"Unsupported playout mode {item.PlayoutMode}")
            };
+
+        private static TimeSpan FixDuration(TimeSpan duration) =>
+            duration > TimeSpan.FromDays(1) ? duration.Subtract(TimeSpan.FromDays(1)) : duration;
    }
 }
@@ -17,18 +17,16 @@ namespace ErsatzTV.Application.Search.Queries

        public async Task<SearchResultAllItemsViewModel> Handle(
            QuerySearchIndexAllItems request,
-            CancellationToken cancellationToken)
-        {
-            List<int> movieIds = await _searchIndex.Search($"type:movie AND ({request.Query})", 0, 0)
-                .Map(result => result.Items.Map(i => i.Id).ToList());
-            List<int> showIds = await _searchIndex.Search($"type:show AND ({request.Query})", 0, 0)
-                .Map(result => result.Items.Map(i => i.Id).ToList());
-            List<int> artistIds = await _searchIndex.Search($"type:artist AND ({request.Query})", 0, 0)
-                .Map(result => result.Items.Map(i => i.Id).ToList());
-            List<int> musicVideoIds = await _searchIndex.Search($"type:music_video AND ({request.Query})", 0, 0)
-                .Map(result => result.Items.Map(i => i.Id).ToList());
+            CancellationToken cancellationToken) =>
+            new(
+                await GetIds("movie", request.Query),
+                await GetIds("show", request.Query),
+                await GetIds("episode", request.Query),
+                await GetIds("artist", request.Query),
+                await GetIds("music_video", request.Query));

-            return new SearchResultAllItemsViewModel(movieIds, showIds, artistIds, musicVideoIds);
-        }
+        private Task<List<int>> GetIds(string type, string query) =>
+            _searchIndex.Search($"type:{type} AND ({query})", 0, 0)
+                .Map(result => result.Items.Map(i => i.Id).ToList());
    }
 }
@@ -0,0 +1,8 @@
+using ErsatzTV.Application.MediaCards;
+using MediatR;
+
+namespace ErsatzTV.Application.Search.Queries
+{
+    public record QuerySearchIndexEpisodes
+        (string Query, int PageNumber, int PageSize) : IRequest<TelevisionEpisodeCardResultsViewModel>;
+}
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Application.MediaCards;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Search;
+using ErsatzTV.Core.Search;
+using LanguageExt;
+using MediatR;
+using static ErsatzTV.Application.MediaCards.Mapper;
+
+namespace ErsatzTV.Application.Search.Queries
+{
+    public class
+        QuerySearchIndexEpisodesHandler : IRequestHandler<QuerySearchIndexEpisodes,
+            TelevisionEpisodeCardResultsViewModel>
+    {
+        private readonly IMediaSourceRepository _mediaSourceRepository;
+        private readonly ISearchIndex _searchIndex;
+        private readonly ITelevisionRepository _televisionRepository;
+
+        public QuerySearchIndexEpisodesHandler(
+            ISearchIndex searchIndex,
+            ITelevisionRepository televisionRepository,
+            IMediaSourceRepository mediaSourceRepository)
+        {
+            _searchIndex = searchIndex;
+            _televisionRepository = televisionRepository;
+            _mediaSourceRepository = mediaSourceRepository;
+        }
+
+        public async Task<TelevisionEpisodeCardResultsViewModel> Handle(
+            QuerySearchIndexEpisodes request,
+            CancellationToken cancellationToken)
+        {
+            SearchResult searchResult = await _searchIndex.Search(
+                request.Query,
+                (request.PageNumber - 1) * request.PageSize,
+                request.PageSize);
+
+            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
+                .Map(list => list.HeadOrNone());
+
+            Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                .Map(list => list.HeadOrNone());
+
+            List<TelevisionEpisodeCardViewModel> items = await _televisionRepository
+                .GetEpisodesForCards(searchResult.Items.Map(i => i.Id).ToList())
+                .Map(list => list.Map(s => ProjectToViewModel(s, maybeJellyfin, maybeEmby, true)).ToList());
+
+            return new TelevisionEpisodeCardResultsViewModel(searchResult.TotalCount, items, searchResult.PageMap);
+        }
+    }
+}
@@ -41,9 +41,12 @@ namespace ErsatzTV.Application.Search.Queries
            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                .Map(list => list.HeadOrNone());

+            Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                .Map(list => list.HeadOrNone());
+
            List<MovieCardViewModel> items = await _movieRepository
                .GetMoviesForCards(searchResult.Items.Map(i => i.Id).ToList())
-                .Map(list => list.Map(m => ProjectToViewModel(m, maybeJellyfin)).ToList());
+                .Map(list => list.Map(m => ProjectToViewModel(m, maybeJellyfin, maybeEmby)).ToList());

            return new MovieCardResultsViewModel(searchResult.TotalCount, items, searchResult.PageMap);
        }
@@ -42,9 +42,12 @@ namespace ErsatzTV.Application.Search.Queries
            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                .Map(list => list.HeadOrNone());

+            Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                .Map(list => list.HeadOrNone());
+
            List<TelevisionShowCardViewModel> items = await _televisionRepository
                .GetShowsForCards(searchResult.Items.Map(i => i.Id).ToList())
-                .Map(list => list.Map(s => ProjectToViewModel(s, maybeJellyfin)).ToList());
+                .Map(list => list.Map(s => ProjectToViewModel(s, maybeJellyfin, maybeEmby)).ToList());

            return new TelevisionShowCardResultsViewModel(searchResult.TotalCount, items, searchResult.PageMap);
        }
@@ -5,6 +5,7 @@ namespace ErsatzTV.Application.Search
    public record SearchResultAllItemsViewModel(
        List<int> MovieIds,
        List<int> ShowIds,
+        List<int> EpisodeIds,
        List<int> ArtistIds,
        List<int> MusicVideoIds);
 }
@@ -1,9 +1,11 @@
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.FFmpeg;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Runtime;
 using LanguageExt;

 namespace ErsatzTV.Application.Streaming.Queries
@@ -12,15 +14,18 @@ namespace ErsatzTV.Application.Streaming.Queries
    {
        private readonly IConfigElementRepository _configElementRepository;
        private readonly FFmpegProcessService _ffmpegProcessService;
+        private readonly IRuntimeInfo _runtimeInfo;

        public GetConcatProcessByChannelNumberHandler(
            IChannelRepository channelRepository,
            IConfigElementRepository configElementRepository,
-            FFmpegProcessService ffmpegProcessService)
+            FFmpegProcessService ffmpegProcessService,
+            IRuntimeInfo runtimeInfo)
            : base(channelRepository, configElementRepository)
        {
            _configElementRepository = configElementRepository;
            _ffmpegProcessService = ffmpegProcessService;
+            _runtimeInfo = runtimeInfo;
        }

        protected override async Task<Either<BaseError, Process>> GetProcess(
@@ -28,7 +33,8 @@ namespace ErsatzTV.Application.Streaming.Queries
            Channel channel,
            string ffmpegPath)
        {
-            bool saveReports = await _configElementRepository.GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
+            bool saveReports = !_runtimeInfo.IsOSPlatform(OSPlatform.Windows) && await _configElementRepository
+                .GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
                .Map(result => result.IfNone(false));

            return _ffmpegProcessService.ConcatChannel(
@@ -1,14 +1,17 @@
 using System;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Errors;
 using ErsatzTV.Core.FFmpeg;
+using ErsatzTV.Core.Interfaces.Emby;
 using ErsatzTV.Core.Interfaces.Jellyfin;
 using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Plex;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Runtime;
 using LanguageExt;
 using static LanguageExt.Prelude;

@@ -18,11 +21,13 @@ namespace ErsatzTV.Application.Streaming.Queries
        GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<GetPlayoutItemProcessByChannelNumber>
    {
        private readonly IConfigElementRepository _configElementRepository;
+        private readonly IEmbyPathReplacementService _embyPathReplacementService;
        private readonly FFmpegProcessService _ffmpegProcessService;
        private readonly IJellyfinPathReplacementService _jellyfinPathReplacementService;
        private readonly ILocalFileSystem _localFileSystem;
        private readonly IPlayoutRepository _playoutRepository;
        private readonly IPlexPathReplacementService _plexPathReplacementService;
+        private readonly IRuntimeInfo _runtimeInfo;

        public GetPlayoutItemProcessByChannelNumberHandler(
            IChannelRepository channelRepository,
@@ -31,7 +36,9 @@ namespace ErsatzTV.Application.Streaming.Queries
            FFmpegProcessService ffmpegProcessService,
            ILocalFileSystem localFileSystem,
            IPlexPathReplacementService plexPathReplacementService,
-            IJellyfinPathReplacementService jellyfinPathReplacementService)
+            IJellyfinPathReplacementService jellyfinPathReplacementService,
+            IEmbyPathReplacementService embyPathReplacementService,
+            IRuntimeInfo runtimeInfo)
            : base(channelRepository, configElementRepository)
        {
            _configElementRepository = configElementRepository;
@@ -40,6 +47,8 @@ namespace ErsatzTV.Application.Streaming.Queries
            _localFileSystem = localFileSystem;
            _plexPathReplacementService = plexPathReplacementService;
            _jellyfinPathReplacementService = jellyfinPathReplacementService;
+            _embyPathReplacementService = embyPathReplacementService;
+            _runtimeInfo = runtimeInfo;
        }

        protected override async Task<Either<BaseError, Process>> GetProcess(
@@ -64,7 +73,8 @@ namespace ErsatzTV.Application.Streaming.Queries
                        _ => throw new ArgumentOutOfRangeException(nameof(playoutItemWithPath))
                    };

-                    bool saveReports = await _configElementRepository.GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
+                    bool saveReports = !_runtimeInfo.IsOSPlatform(OSPlatform.Windows) && await _configElementRepository
+                        .GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
                        .Map(result => result.IfNone(false));

                    return Right<BaseError, Process>(
@@ -143,7 +153,6 @@ namespace ErsatzTV.Application.Streaming.Queries
        {
            string path = await GetPlayoutItemPath(playoutItem);

-            // TODO: this won't work with url streaming from plex
            if (_localFileSystem.FileExists(path))
            {
                return new PlayoutItemWithPath(playoutItem, path);
@@ -178,6 +187,12 @@ namespace ErsatzTV.Application.Streaming.Queries
                JellyfinEpisode jellyfinEpisode => await _jellyfinPathReplacementService.GetReplacementJellyfinPath(
                    jellyfinEpisode.LibraryPathId,
                    path),
+                EmbyMovie embyMovie => await _embyPathReplacementService.GetReplacementEmbyPath(
+                    embyMovie.LibraryPathId,
+                    path),
+                EmbyEpisode embyEpisode => await _embyPathReplacementService.GetReplacementEmbyPath(
+                    embyEpisode.LibraryPathId,
+                    path),
                _ => path
            };
        }
@@ -4,6 +4,9 @@ using System.Globalization;
 using System.Linq;
 using ErsatzTV.Application.MediaCards;
 using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Jellyfin;
+using Flurl;
 using LanguageExt;
 using static LanguageExt.Prelude;

@@ -14,37 +17,45 @@ namespace ErsatzTV.Application.Television
        internal static TelevisionShowViewModel ProjectToViewModel(
            Show show,
            List<string> languages,
-            Option<JellyfinMediaSource> maybeJellyfin) =>
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby) =>
            new(
                show.Id,
                show.ShowMetadata.HeadOrNone().Map(m => m.Title ?? string.Empty).IfNone(string.Empty),
                show.ShowMetadata.HeadOrNone().Map(m => m.Year?.ToString() ?? string.Empty).IfNone(string.Empty),
                show.ShowMetadata.HeadOrNone().Map(m => m.Plot ?? string.Empty).IfNone(string.Empty),
-                show.ShowMetadata.HeadOrNone().Map(m => GetPoster(m, maybeJellyfin)).IfNone(string.Empty),
-                show.ShowMetadata.HeadOrNone().Map(m => GetFanArt(m, maybeJellyfin)).IfNone(string.Empty),
+                show.ShowMetadata.HeadOrNone().Map(m => GetPoster(m, maybeJellyfin, maybeEmby)).IfNone(string.Empty),
+                show.ShowMetadata.HeadOrNone().Map(m => GetFanArt(m, maybeJellyfin, maybeEmby)).IfNone(string.Empty),
                show.ShowMetadata.HeadOrNone().Map(m => m.Genres.Map(g => g.Name).ToList()).IfNone(new List<string>()),
                show.ShowMetadata.HeadOrNone().Map(m => m.Tags.Map(g => g.Name).ToList()).IfNone(new List<string>()),
                show.ShowMetadata.HeadOrNone().Map(m => m.Studios.Map(s => s.Name).ToList())
                    .IfNone(new List<string>()),
+                show.ShowMetadata.HeadOrNone()
+                    .Map(
+                        m => (m.ContentRating ?? string.Empty).Split("/").Map(s => s.Trim())
+                            .Where(x => !string.IsNullOrWhiteSpace(x)).ToList()).IfNone(new List<string>()),
                LanguagesForShow(languages),
                show.ShowMetadata.HeadOrNone()
                    .Map(
                        m => m.Actors.OrderBy(a => a.Order).ThenBy(a => a.Id)
-                            .Map(a => MediaCards.Mapper.ProjectToViewModel(a, maybeJellyfin))
+                            .Map(a => MediaCards.Mapper.ProjectToViewModel(a, maybeJellyfin, maybeEmby))
                            .ToList())
                    .IfNone(new List<ActorCardViewModel>()));

        internal static TelevisionSeasonViewModel ProjectToViewModel(
            Season season,
-            Option<JellyfinMediaSource> maybeJellyfin) =>
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby) =>
            new(
                season.Id,
                season.ShowId,
                season.Show.ShowMetadata.HeadOrNone().Map(m => m.Title ?? string.Empty).IfNone(string.Empty),
                season.Show.ShowMetadata.HeadOrNone().Map(m => m.Year?.ToString() ?? string.Empty).IfNone(string.Empty),
                season.SeasonNumber == 0 ? "Specials" : $"Season {season.SeasonNumber}",
-                season.SeasonMetadata.HeadOrNone().Map(m => GetPoster(m, maybeJellyfin)).IfNone(string.Empty),
-                season.Show.ShowMetadata.HeadOrNone().Map(m => GetFanArt(m, maybeJellyfin)).IfNone(string.Empty));
+                season.SeasonMetadata.HeadOrNone().Map(m => GetPoster(m, maybeJellyfin, maybeEmby))
+                    .IfNone(string.Empty),
+                season.Show.ShowMetadata.HeadOrNone().Map(m => GetFanArt(m, maybeJellyfin, maybeEmby))
+                    .IfNone(string.Empty));

        internal static TelevisionEpisodeViewModel ProjectToViewModel(Episode episode) =>
            new(
@@ -53,36 +64,54 @@ namespace ErsatzTV.Application.Television
                episode.EpisodeNumber,
                episode.EpisodeMetadata.HeadOrNone().Map(m => m.Title ?? string.Empty).IfNone(string.Empty),
                episode.EpisodeMetadata.HeadOrNone().Map(m => m.Plot ?? string.Empty).IfNone(string.Empty),
-                episode.EpisodeMetadata.HeadOrNone().Map(m => GetThumbnail(m, None)).IfNone(string.Empty));
+                episode.EpisodeMetadata.HeadOrNone().Map(m => GetThumbnail(m, None, None)).IfNone(string.Empty));

-        private static string GetPoster(Metadata metadata, Option<JellyfinMediaSource> maybeJellyfin) =>
-            GetArtwork(metadata, ArtworkKind.Poster, maybeJellyfin);
+        private static string GetPoster(
+            Metadata metadata,
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby) =>
+            GetArtwork(metadata, ArtworkKind.Poster, maybeJellyfin, maybeEmby);

-        private static string GetFanArt(Metadata metadata, Option<JellyfinMediaSource> maybeJellyfin) =>
-            GetArtwork(metadata, ArtworkKind.FanArt, maybeJellyfin);
+        private static string GetFanArt(
+            Metadata metadata,
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby) =>
+            GetArtwork(metadata, ArtworkKind.FanArt, maybeJellyfin, maybeEmby);

-        private static string GetThumbnail(Metadata metadata, Option<JellyfinMediaSource> maybeJellyfin) =>
-            GetArtwork(metadata, ArtworkKind.Thumbnail, maybeJellyfin);
+        private static string GetThumbnail(
+            Metadata metadata,
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby) =>
+            GetArtwork(metadata, ArtworkKind.Thumbnail, maybeJellyfin, maybeEmby);

        private static string GetArtwork(
            Metadata metadata,
            ArtworkKind artworkKind,
-            Option<JellyfinMediaSource> maybeJellyfin)
+            Option<JellyfinMediaSource> maybeJellyfin,
+            Option<EmbyMediaSource> maybeEmby)
        {
            string artwork = Optional(metadata.Artwork.FirstOrDefault(a => a.ArtworkKind == artworkKind))
                .Match(a => a.Path, string.Empty);

            if (maybeJellyfin.IsSome && artwork.StartsWith("jellyfin://"))
            {
-                string address = maybeJellyfin.Map(ms => ms.Connections.HeadOrNone().Map(c => c.Address))
-                    .Flatten()
-                    .IfNone("jellyfin://");
-                artwork = artwork.Replace("jellyfin://", address);
-
+                Url url = JellyfinUrl.ForArtwork(maybeJellyfin, artwork);
                if (artworkKind == ArtworkKind.Poster)
                {
-                    artwork += "&fillHeight=440";
+                    url.SetQueryParam("fillHeight", 440);
                }
+
+                artwork = url;
+            }
+            else if (maybeEmby.IsSome && artwork.StartsWith("emby://"))
+            {
+                Url url = EmbyUrl.ForArtwork(maybeEmby, artwork);
+                if (artworkKind == ArtworkKind.Poster)
+                {
+                    url.SetQueryParam("maxHeight", 440);
+                }
+
+                artwork = url;
            }

            return artwork;
@@ -29,8 +29,11 @@ namespace ErsatzTV.Application.Television.Queries
            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                .Map(list => list.HeadOrNone());

+            Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                .Map(list => list.HeadOrNone());
+
            return await _televisionRepository.GetSeason(request.SeasonId)
-                .MapT(s => ProjectToViewModel(s, maybeJellyfin));
+                .MapT(s => ProjectToViewModel(s, maybeJellyfin, maybeEmby));
        }
    }
 }
@@ -36,8 +36,11 @@ namespace ErsatzTV.Application.Television.Queries
                    Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                        .Map(list => list.HeadOrNone());

+                    Option<EmbyMediaSource> maybeEmby = await _mediaSourceRepository.GetAllEmby()
+                        .Map(list => list.HeadOrNone());
+
                    List<string> languages = await _searchRepository.GetLanguagesForShow(show);
-                    return ProjectToViewModel(show, languages, maybeJellyfin);
+                    return ProjectToViewModel(show, languages, maybeJellyfin, maybeEmby);
                },
                () => Task.FromResult(Option<TelevisionShowViewModel>.None));
        }
@@ -14,6 +14,7 @@ namespace ErsatzTV.Application.Television
        List<string> Genres,
        List<string> Tags,
        List<string> Studios,
+        List<string> ContentRatings,
        List<CultureInfo> Languages,
        List<ActorCardViewModel> Actors);
 }
@@ -13,13 +13,13 @@
      <PackageReference Include="FluentAssertions" Version="5.10.3" />
      <PackageReference Include="LanguageExt.Core" Version="3.4.15" />
      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.9.60">
        <PrivateAssets>all</PrivateAssets>
        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      </PackageReference>
      <PackageReference Include="Moq" Version="4.16.1" />
-      <PackageReference Include="NUnit" Version="3.13.1" />
+      <PackageReference Include="NUnit" Version="3.13.2" />
      <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
      <PackageReference Include="Serilog" Version="2.10.0" />
      <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
@@ -107,7 +107,7 @@ namespace ErsatzTV.Core.Tests.FFmpeg
            }

            [Test]
-            public void ShouldNot_SetRealtime_ForHttpLiveStreaming()
+            public void Should_SetRealtime_ForHttpLiveStreaming()
            {
                FFmpegProfile ffmpegProfile = TestProfile();

@@ -120,7 +120,7 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now);

-                actual.RealtimeOutput.Should().BeFalse();
+                actual.RealtimeOutput.Should().BeTrue();
            }

            [Test]
@@ -467,6 +467,36 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                actual.VideoCodec.Should().Be("copy");
            }

+            [Test]
+            public void
+                Should_SetCorrectVideoCodec_When_ContentIsCorrectSize_And_CorrectCodec_And_Framerate_ForTransportStream()
+            {
+                var ffmpegProfile = new FFmpegProfile
+                {
+                    NormalizeVideo = true,
+                    Resolution = new Resolution { Width = 1920, Height = 1080 },
+                    VideoCodec = "libx264",
+                    FrameRate = "24"
+                };
+
+                // not anamorphic
+                var version = new MediaVersion
+                    { Width = 1920, Height = 1080, SampleAspectRatio = "1:1" };
+
+                FFmpegPlaybackSettings actual = _calculator.CalculateSettings(
+                    StreamingMode.TransportStream,
+                    ffmpegProfile,
+                    version,
+                    new MediaStream { Codec = "libx264" },
+                    new MediaStream(),
+                    DateTimeOffset.Now,
+                    DateTimeOffset.Now);
+
+                actual.ScaledSize.IsNone.Should().BeTrue();
+                actual.PadToDesiredResolution.Should().BeFalse();
+                actual.VideoCodec.Should().Be("libx264");
+            }
+
            [Test]
            public void
                Should_SetCopyVideoCodec_When_ContentIsCorrectSize_And_NotNormalizingVideo_ForTransportStream()
@@ -11,17 +11,14 @@ namespace ErsatzTV.Core.Tests.Fakes
    public class FakeTelevisionRepository : ITelevisionRepository
    {
        public Task<bool> AllShowsExist(List<int> showIds) => throw new NotSupportedException();
+        public Task<bool> AllEpisodesExist(List<int> episodeIds) => throw new NotSupportedException();

        public Task<List<Show>> GetAllShows() => throw new NotSupportedException();

        public Task<Option<Show>> GetShow(int showId) => throw new NotSupportedException();

-        public Task<int> GetShowCount() => throw new NotSupportedException();
-
-        public Task<List<ShowMetadata>> GetPagedShows(int pageNumber, int pageSize) =>
-            throw new NotSupportedException();
-
        public Task<List<ShowMetadata>> GetShowsForCards(List<int> ids) => throw new NotSupportedException();
+        public Task<List<EpisodeMetadata>> GetEpisodesForCards(List<int> ids) => throw new NotSupportedException();

        public Task<List<Episode>> GetShowItems(int showId) => throw new NotSupportedException();

@@ -89,10 +86,18 @@ namespace ErsatzTV.Core.Tests.Fakes
        public Task<Unit> RemoveMissingPlexSeasons(string showKey, List<string> seasonKeys) =>
            throw new NotSupportedException();

-        public Task<Unit> RemoveMissingPlexEpisodes(string seasonKey, List<string> episodeKeys) =>
+        public Task<List<int>> RemoveMissingPlexEpisodes(string seasonKey, List<string> episodeKeys) =>
            throw new NotSupportedException();

        public Task<Unit> SetEpisodeNumber(Episode episode, int episodeNumber) => throw new NotSupportedException();
+        public Task<bool> AddDirector(EpisodeMetadata metadata, Director director) => throw new NotSupportedException();
+
+        public Task<bool> AddWriter(EpisodeMetadata metadata, Writer writer) => throw new NotSupportedException();
+
+        public Task<int> GetShowCount() => throw new NotSupportedException();
+
+        public Task<List<ShowMetadata>> GetPagedShows(int pageNumber, int pageSize) =>
+            throw new NotSupportedException();

        public Task<bool> Update(Show show) => throw new NotSupportedException();

@@ -0,0 +1,121 @@
+using System.Collections.Generic;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Jellyfin;
+using FluentAssertions;
+using Flurl;
+using NUnit.Framework;
+using static LanguageExt.Prelude;
+
+namespace ErsatzTV.Core.Tests.Jellyfin
+{
+    public class JellyfinUrlTests
+    {
+        [Test]
+        public void Should_Work_Without_Trailing_Slash()
+        {
+            var artwork = "jellyfin://Items/2/Images/3?tag=4";
+            var address = "https://some.jellyfin.server";
+            var mediaSource = new JellyfinMediaSource
+            {
+                Connections = new List<JellyfinConnection>
+                {
+                    new() { Address = address }
+                }
+            };
+
+            Url url = JellyfinUrl.ForArtwork(Some(mediaSource), artwork);
+
+            url.ToString().Should().Be("https://some.jellyfin.server/Items/2/Images/3?tag=4");
+        }
+
+        [Test]
+        public void Should_Work_With_Trailing_Slash()
+        {
+            var artwork = "jellyfin://Items/2/Images/3?tag=4";
+            var address = "https://some.jellyfin.server/";
+            var mediaSource = new JellyfinMediaSource
+            {
+                Connections = new List<JellyfinConnection>
+                {
+                    new() { Address = address }
+                }
+            };
+
+            Url url = JellyfinUrl.ForArtwork(Some(mediaSource), artwork);
+
+            url.ToString().Should().Be("https://some.jellyfin.server/Items/2/Images/3?tag=4");
+        }
+
+        [Test]
+        public void Should_Work_With_Port_Without_Trailing_Slash()
+        {
+            var artwork = "jellyfin://Items/2/Images/3?tag=4";
+            var address = "https://some.jellyfin.server:1000";
+            var mediaSource = new JellyfinMediaSource
+            {
+                Connections = new List<JellyfinConnection>
+                {
+                    new() { Address = address }
+                }
+            };
+
+            Url url = JellyfinUrl.ForArtwork(Some(mediaSource), artwork);
+
+            url.ToString().Should().Be("https://some.jellyfin.server:1000/Items/2/Images/3?tag=4");
+        }
+
+        [Test]
+        public void Should_Work_With_Port_With_Trailing_Slash()
+        {
+            var artwork = "jellyfin://Items/2/Images/3?tag=4";
+            var address = "https://some.jellyfin.server:1000/";
+            var mediaSource = new JellyfinMediaSource
+            {
+                Connections = new List<JellyfinConnection>
+                {
+                    new() { Address = address }
+                }
+            };
+
+            Url url = JellyfinUrl.ForArtwork(Some(mediaSource), artwork);
+
+            url.ToString().Should().Be("https://some.jellyfin.server:1000/Items/2/Images/3?tag=4");
+        }
+
+        [Test]
+        public void Should_Work_With_Path_Prefix_Without_Trailing_Slash()
+        {
+            var artwork = "jellyfin://Items/2/Images/3?tag=4";
+            var address = "https://some.jellyfin.server/jellyfin";
+            var mediaSource = new JellyfinMediaSource
+            {
+                Connections = new List<JellyfinConnection>
+                {
+                    new() { Address = address }
+                }
+            };
+
+            Url url = JellyfinUrl.ForArtwork(Some(mediaSource), artwork);
+
+            url.ToString().Should().Be("https://some.jellyfin.server/jellyfin/Items/2/Images/3?tag=4");
+        }
+
+        [Test]
+        public void Should_Work_With_Path_Prefix_With_Trailing_Slash()
+        {
+            var artwork = "jellyfin://Items/2/Images/3?tag=4";
+            var address = "https://some.jellyfin.server/jellyfin/";
+            var mediaSource = new JellyfinMediaSource
+            {
+                Connections = new List<JellyfinConnection>
+                {
+                    new() { Address = address }
+                }
+            };
+
+            Url url = JellyfinUrl.ForArtwork(Some(mediaSource), artwork);
+
+            url.ToString().Should().Be("https://some.jellyfin.server/jellyfin/Items/2/Images/3?tag=4");
+        }
+    }
+}
@@ -1,100 +1,229 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Scheduling;
 using FluentAssertions;
 using NUnit.Framework;
+using static LanguageExt.Prelude;

 namespace ErsatzTV.Core.Tests.Scheduling
 {
    public class MultiPartEpisodeGrouperTests
    {
        [Test]
-        public void NotGrouped_Grouped_NotGrouped()
+        [TestCase("Episode 1", "Episode 2 (1)", "Episode 3 (2)", "Episode 4")]
+        [TestCase("Episode 1 - More", "Episode 2 (1) - Title", "Episode 3 (2) - After", "Episode 4 - Dash")]
+        [TestCase("Episode 1", "Episode 2 Part 1", "Episode 3 Part 2", "Episode 4")]
+        public void NotGrouped_Grouped_NotGrouped(string one, string two, string three, string four)
        {
            var mediaItems = new List<MediaItem>
            {
-                NamedEpisode("Episode 1"),
-                NamedEpisode("Episode 2 (1)"),
-                NamedEpisode("Episode 3 (2)"),
-                NamedEpisode("Episode 4")
+                NamedEpisode(one, 1, 1, 1),
+                NamedEpisode(two, 1, 1, 2),
+                NamedEpisode(three, 1, 1, 3),
+                NamedEpisode(four, 1, 1, 4)
            };

            List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);

            result.Count.Should().Be(3);
-            result[0].First.Should().Be(mediaItems[0]);
-            result[1].First.Should().Be(mediaItems[1]);
-            result[1].Additional[0].Should().Be(mediaItems[2]);
-            result[2].First.Should().Be(mediaItems[3]);
+            ShouldHaveOneItem(result, mediaItems[0]);
+            ShouldHaveTwoItems(result, mediaItems[1], mediaItems[2]);
+            ShouldHaveOneItem(result, mediaItems[3]);
        }

        [Test]
-        public void Grouped_NotGrouped()
+        [TestCase("Episode 1 (1)", "Episode 2 (2)", "Episode 3")]
+        [TestCase("Episode 1 (1) - More", "Episode 2 (2) - Title", "Episode 3 - After")]
+        [TestCase("Episode 1 Part 1", "Episode 2 Part 2", "Episode 3")]
+        public void Grouped_NotGrouped(string one, string two, string three)
        {
            var mediaItems = new List<MediaItem>
            {
-                NamedEpisode("Episode 1 (1)"),
-                NamedEpisode("Episode 2 (2)"),
-                NamedEpisode("Episode 3")
+                NamedEpisode(one, 1, 1, 1),
+                NamedEpisode(two, 1, 1, 2),
+                NamedEpisode(three, 1, 1, 3)
            };

            List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);

            result.Count.Should().Be(2);
-            result[0].First.Should().Be(mediaItems[0]);
-            result[0].Additional[0].Should().Be(mediaItems[1]);
-            result[1].First.Should().Be(mediaItems[2]);
+            ShouldHaveTwoItems(result, mediaItems[0], mediaItems[1]);
+            ShouldHaveOneItem(result, mediaItems[2]);
        }

        [Test]
-        public void Grouped_NotGrouped_Grouped()
+        [TestCase("Episode 1 (1)", "Episode 2 (2)", "Episode 3", "Episode 4 (1)", "Episode 5 (2)")]
+        [TestCase(
+            "Episode 1 (1) - More",
+            "Episode 2 (2) - Title",
+            "Episode 3 - After",
+            "Episode 4 (1) - Dash",
+            "Episode 5 (2) - Again")]
+        [TestCase("Episode 1 Part 1", "Episode 2 Part 2", "Episode 3", "Episode 4 Part 1", "Episode 5 Part 2")]
+        public void Grouped_NotGrouped_Grouped(string one, string two, string three, string four, string five)
        {
            var mediaItems = new List<MediaItem>
            {
-                NamedEpisode("Episode 1 (1)"),
-                NamedEpisode("Episode 2 (2)"),
-                NamedEpisode("Episode 3"),
-                NamedEpisode("Episode 4 (1)"),
-                NamedEpisode("Episode 5 (2)")
+                NamedEpisode(one, 1, 1, 1),
+                NamedEpisode(two, 1, 1, 2),
+                NamedEpisode(three, 1, 1, 3),
+                NamedEpisode(four, 1, 1, 4),
+                NamedEpisode(five, 1, 1, 5)
            };

            List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);

            result.Count.Should().Be(3);
-            result[0].First.Should().Be(mediaItems[0]);
-            result[0].Additional[0].Should().Be(mediaItems[1]);
-            result[1].First.Should().Be(mediaItems[2]);
-            result[2].First.Should().Be(mediaItems[3]);
-            result[2].Additional[0].Should().Be(mediaItems[4]);
+            ShouldHaveTwoItems(result, mediaItems[0], mediaItems[1]);
+            ShouldHaveOneItem(result, mediaItems[2]);
+            ShouldHaveTwoItems(result, mediaItems[3], mediaItems[4]);
        }

        [Test]
-        public void Grouped_Grouped()
+        [TestCase("Episode 1 (1)", "Episode 2 (2)", "Episode 3 (1)", "Episode 4 (2)")]
+        [TestCase("Episode 1 (1) - More", "Episode 2 (2) - Title", "Episode 3 (1) - After", "Episode 4 (2) - Dash")]
+        [TestCase("Episode 1 Part 1", "Episode 2 Part 2", "Episode 3 Part 1", "Episode 4 Part 2")]
+        public void Grouped_Grouped(string one, string two, string three, string four)
        {
            var mediaItems = new List<MediaItem>
            {
-                NamedEpisode("Episode 1 (1)"),
-                NamedEpisode("Episode 2 (2)"),
-                NamedEpisode("Episode 3 (1)"),
-                NamedEpisode("Episode 4 (2)")
+                NamedEpisode(one, 1, 1, 1),
+                NamedEpisode(two, 1, 1, 2),
+                NamedEpisode(three, 1, 1, 3),
+                NamedEpisode(four, 1, 1, 4)
            };

            List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);

            result.Count.Should().Be(2);
-            result[0].First.Should().Be(mediaItems[0]);
-            result[0].Additional[0].Should().Be(mediaItems[1]);
-            result[1].First.Should().Be(mediaItems[2]);
-            result[1].Additional[0].Should().Be(mediaItems[3]);
+            ShouldHaveTwoItems(result, mediaItems[0], mediaItems[1]);
+            ShouldHaveTwoItems(result, mediaItems[2], mediaItems[3]);
        }

-        private static Episode NamedEpisode(string title) =>
+        [Test]
+        [TestCase("Episode 1", "Episode 2 (2)", "Episode 3 (1)", "Episode 4 (2)")]
+        [TestCase("Episode 1 - More", "Episode 2 (2) - Title", "Episode 3 (1) - After", "Episode 4 (2) - Dash")]
+        [TestCase("Episode 1", "Episode 2 Part 2", "Episode 3 Part 1", "Episode 4 Part 2")]
+        public void Part2_Without_Part1(string one, string two, string three, string four)
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                NamedEpisode(one, 1, 1, 1),
+                NamedEpisode(two, 1, 1, 2),
+                NamedEpisode(three, 1, 1, 3),
+                NamedEpisode(four, 1, 1, 4)
+            };
+
+            List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
+
+            result.Count.Should().Be(3);
+            ShouldHaveOneItem(result, mediaItems[0]);
+            ShouldHaveOneItem(result, mediaItems[1]);
+            ShouldHaveTwoItems(result, mediaItems[2], mediaItems[3]);
+        }
+
+        [Test]
+        [TestCase("Episode 1 (1)", "Episode 3 (3)", "Episode 4", "Episode 5")]
+        [TestCase("Episode 1 (1) - More", "Episode 3 (3) - Title", "Episode 4 - After", "Episode 5 - Dash")]
+        [TestCase("Episode 1 Part 1", "Episode 3 Part 3", "Episode 4", "Episode 5")]
+        public void Skip_Part(string one, string two, string three, string four)
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                NamedEpisode(one, 1, 1, 1),
+                NamedEpisode(two, 1, 1, 3),
+                NamedEpisode(three, 1, 1, 4),
+                NamedEpisode(four, 1, 1, 5)
+            };
+
+            List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
+
+            result.Count.Should().Be(4);
+            ShouldHaveOneItem(result, mediaItems[0]);
+            ShouldHaveOneItem(result, mediaItems[1]);
+            ShouldHaveOneItem(result, mediaItems[2]);
+            ShouldHaveOneItem(result, mediaItems[3]);
+        }
+
+        [Test]
+        [TestCase("Episode 1 (1)", "Episode 3 (1)", "Episode 4 (2)", "Episode 5")]
+        [TestCase("Episode 1 (1) - More", "Episode 3 (1) - Title", "Episode 4 (2) - After", "Episode 5 - Dash")]
+        [TestCase("Episode 1 Part 1", "Episode 3 Part 1", "Episode 4 Part 2", "Episode 5")]
+        public void Repeat_Part(string one, string two, string three, string four)
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                NamedEpisode(one, 1, 1, 1),
+                NamedEpisode(two, 1, 1, 3),
+                NamedEpisode(three, 1, 1, 4),
+                NamedEpisode(four, 1, 1, 5)
+            };
+
+            List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
+
+            result.Count.Should().Be(3);
+            ShouldHaveOneItem(result, mediaItems[0]);
+            ShouldHaveTwoItems(result, mediaItems[1], mediaItems[2]);
+            ShouldHaveOneItem(result, mediaItems[3]);
+        }
+
+        [Test]
+        [TestCase("S1 Episode 1 (1)", "S2 Episode 3 (1)", "S1 Episode 2 (2)", "S1 Episode 5")]
+        [TestCase(
+            "S1 Episode 1 (1) - More",
+            "S2 Episode 3 (1) - Title",
+            "S1 Episode 2 (2) - After",
+            "S1 Episode 5 - Dash")]
+        [TestCase("S1 Episode 1 Part 1", "S2 Episode 3 Part 1", "S1 Episode 2 Part 2", "S1 Episode 5")]
+        public void Mixed_Shows_Chronologically(string one, string two, string three, string four)
+        {
+            var mediaItems = new List<MediaItem>
+            {
+                NamedEpisode(one, 1, 1, 1, new DateTime(2020, 1, 1)),
+                NamedEpisode(two, 2, 1, 3, new DateTime(2020, 1, 2)),
+                NamedEpisode(three, 1, 1, 2, new DateTime(2020, 1, 3)),
+                NamedEpisode(four, 1, 1, 5, new DateTime(2020, 1, 4))
+            };
+
+            List<GroupedMediaItem> result = MultiPartEpisodeGrouper.GroupMediaItems(mediaItems);
+
+            result.Count.Should().Be(3);
+            ShouldHaveTwoItems(result, mediaItems[0], mediaItems[2]);
+            ShouldHaveOneItem(result, mediaItems[1]);
+            ShouldHaveOneItem(result, mediaItems[3]);
+        }
+
+        private static Episode NamedEpisode(
+            string title,
+            int showId,
+            int season,
+            int episode,
+            DateTime? releaseDate = null) =>
            new()
            {
+                EpisodeNumber = episode,
                EpisodeMetadata = new List<EpisodeMetadata>
                {
-                    new() { Title = title }
+                    new() { Title = title, ReleaseDate = releaseDate }
+                },
+                Season = new Season
+                {
+                    SeasonNumber = season,
+                    Show = new Show { Id = showId },
+                    ShowId = showId
                }
            };
+
+        private static void ShouldHaveOneItem(IEnumerable<GroupedMediaItem> result, MediaItem item) =>
+            result.Filter(g => g.First == item && Optional(g.Additional).Flatten().HeadOrNone() == None)
+                .Should().HaveCount(1);
+
+        private static void ShouldHaveTwoItems(
+            IEnumerable<GroupedMediaItem> result,
+            MediaItem first,
+            MediaItem additional) =>
+            result.Filter(g => g.First == first && Optional(g.Additional).Flatten().HeadOrNone() == Some(additional))
+                .Should().HaveCount(1);
    }
 }
@@ -0,0 +1,8 @@
+namespace ErsatzTV.Core.Domain
+{
+    public class EmbyLibrary : Library
+    {
+        public string ItemId { get; set; }
+        public bool ShouldSyncItems { get; set; }
+    }
+}
@@ -0,0 +1,11 @@
+using System.Diagnostics;
+
+namespace ErsatzTV.Core.Domain
+{
+    [DebuggerDisplay("{EpisodeMetadata[0].Title}")]
+    public class EmbyEpisode : Episode
+    {
+        public string ItemId { get; set; }
+        public string Etag { get; set; }
+    }
+}
@@ -0,0 +1,8 @@
+namespace ErsatzTV.Core.Domain
+{
+    public class EmbyMovie : Movie
+    {
+        public string ItemId { get; set; }
+        public string Etag { get; set; }
+    }
+}
@@ -0,0 +1,8 @@
+namespace ErsatzTV.Core.Domain
+{
+    public class EmbySeason : Season
+    {
+        public string ItemId { get; set; }
+        public string Etag { get; set; }
+    }
+}
@@ -0,0 +1,8 @@
+namespace ErsatzTV.Core.Domain
+{
+    public class EmbyShow : Show
+    {
+        public string ItemId { get; set; }
+        public string Etag { get; set; }
+    }
+}
@@ -0,0 +1,10 @@
+namespace ErsatzTV.Core.Domain
+{
+    public class EmbyConnection
+    {
+        public int Id { get; set; }
+        public string Address { get; set; }
+        public int EmbyMediaSourceId { get; set; }
+        public EmbyMediaSource EmbyMediaSource { get; set; }
+    }
+}
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace ErsatzTV.Core.Domain
+{
+    public class EmbyMediaSource : MediaSource
+    {
+        public string ServerName { get; set; }
+        public string OperatingSystem { get; set; }
+        public List<EmbyConnection> Connections { get; set; }
+        public List<EmbyPathReplacement> PathReplacements { get; set; }
+    }
+}
@@ -0,0 +1,11 @@
+namespace ErsatzTV.Core.Domain
+{
+    public class EmbyPathReplacement
+    {
+        public int Id { get; set; }
+        public string EmbyPath { get; set; }
+        public string LocalPath { get; set; }
+        public int EmbyMediaSourceId { get; set; }
+        public EmbyMediaSource EmbyMediaSource { get; set; }
+    }
+}
@@ -0,0 +1,8 @@
+namespace ErsatzTV.Core.Domain
+{
+    public class Director
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}
@@ -1,4 +1,6 @@
-namespace ErsatzTV.Core.Domain
+using System.Collections.Generic;
+
+namespace ErsatzTV.Core.Domain
 {
    public class EpisodeMetadata : Metadata
    {
@@ -7,5 +9,7 @@
        public string Tagline { get; set; }
        public int EpisodeId { get; set; }
        public Episode Episode { get; set; }
+        public List<Director> Directors { get; set; }
+        public List<Writer> Writers { get; set; }
    }
 }
@@ -19,5 +19,6 @@ namespace ErsatzTV.Core.Domain
        public List<Tag> Tags { get; set; }
        public List<Studio> Studios { get; set; }
        public List<Actor> Actors { get; set; }
+        public List<MetadataGuid> Guids { get; set; }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jason Dove	539285d81e	update docs for 0.0.41-prealpha release [no docker]	2021-05-30 18:01:13 -05:00
Jason DoveandGitHub	f8c986472a	more grouping fixes (#234 ) * more grouping fixes * update changelog	2021-05-30 11:54:02 -05:00
Jason Dove	442d73150e	link to full changelog on home page [no docker]	2021-05-30 10:47:33 -05:00
Jason DoveandGitHub	d6cee14143	add changelog (#232 )	2021-05-30 09:40:59 -05:00
Jason DoveandGitHub	c20c0b231e	fix updating local movies (#231 )	2021-05-30 06:32:26 -05:00
Jason DoveandGitHub	e506dd38a8	merge latest develop (#230 ) * sync guids/provider ids (#227) * sync guids from plex * cleanup * sync local guids * sync jellyfin and emby guids * add episodes to search index (#228) * sync episode directors and writers * display episode writers and directors * remove missing episodes from search index * show episodes in search results * fix emby and jellyfin episode updates * fix updating plex episodes * don't delete channel logos on startup * add episodes page; fix adding episodes to collection * cleanup * multi-part episode grouping fixes (#229)	2021-05-30 06:08:33 -05:00
Jason DoveandGitHub	bbd8bc6c7e	add button to refresh list of libraries (#226 ) * add button to refresh list of libraries * code cleanup	2021-05-28 15:28:45 -05:00
Jason DoveandGitHub	e841c9c53b	fix missing artwork (#225 )	2021-05-28 09:34:47 -05:00
Jason DoveandGitHub	4c78f41c5a	fix incorrect search items count (#224 )	2021-05-28 06:13:40 -05:00
Jason DoveandGitHub	95cceb95b9	regularly delete orphaned artwork from db (#223 )	2021-05-28 05:38:58 -05:00
Jason DoveandGitHub	58d6f81d2e	recursively retrieve jellyfin and emby items (#221 )	2021-05-27 21:01:25 -05:00
Jason DoveandGitHub	fe5cedfcdc	disable ffmpeg reports on windows (#220 ) * disable ffmpeg reports for windows * code cleanup	2021-05-27 16:36:02 -05:00
Jason DoveandGitHub	0bbed69e85	add movie directors and writers (#219 )	2021-05-27 09:24:47 -05:00
Jason DoveandGitHub	68123a2f9c	add content rating (#218 ) * add new columns * store local content ratings * display and search content ratings * add content_rating to search docs * sync content rating from jellyfin, emby, plex * force sync content rating for all libraries * code cleanup	2021-05-27 06:41:24 -05:00
Jason DoveandGitHub	6504ca10a8	cache local artwork on disk (#217 )	2021-05-26 19:49:08 -05:00
Jason DoveandGitHub	84770ed250	use artwork for schedule items with custom title when all media items are from same show (#216 )	2021-05-26 15:34:54 -05:00
Jason DoveandGitHub	466d33f808	sync tv show thumb art (#214 ) * sync thumb art from local, jellyfin, emby * code cleanup	2021-05-26 12:46:23 -05:00
Jason DoveandGitHub	8e81d5f197	fix add to schedule dialog (#213 )	2021-05-26 08:43:11 -05:00
Jason DoveandGitHub	da43e6f7cf	embed debug symbols (#212 )	2021-05-26 07:26:14 -05:00
Jason DoveandGitHub	c9905d0542	fix resources (offline background and font) (#211 )	2021-05-25 15:42:03 -05:00
Jason DoveandGitHub	c9e20e28df	proxy jellyfin and emby artwork for xmltv (#210 ) * fix xmltv artwork for jf and emby * proxy jellyfin and emby artwork for xmltv	2021-05-25 15:15:15 -05:00
Jason DoveandGitHub	f9427cac99	use multiple docker tags again (#209 ) * Revert "disable framerate normalization (#208)" This reverts commit `141a34933d`. * Revert "use linuxserver base docker image (#207)" This reverts commit `0962a1429a`. * fix playback that only uses fps filter * nvidia needs privileged	2021-05-25 05:13:51 -05:00
Jason DoveandGitHub	141a34933d	disable framerate normalization (#208 ) * disable framerate normalization * fix test	2021-05-24 21:47:26 -05:00
Jason DoveandGitHub	0962a1429a	use linuxserver base docker image (#207 ) * use one base docker image * remove nvidia and vaapi tags * fix playback that only uses fps filter	2021-05-24 21:12:55 -05:00
Jason DoveandGitHub	f8b45ed9db	fix unc path replacements from jellyfin and emby (#205 ) * fix UNC path replacements from non-windows JF and Emby servers * use emby path replacements for playback	2021-05-24 09:03:39 -05:00
Jason DoveandGitHub	266bfbad23	add link to release notes (#203 )	2021-05-23 10:02:26 -05:00
Jason DoveandGitHub	60a9640009	use ffmpeg 4.3 in docker (#202 ) * Revert "fix ffmpeg 4.4 compatibility" This reverts commit `1ca0df038c`. * use ffmpeg 4.3 in docker	2021-05-23 09:55:40 -05:00
Jason Dove	9291a6b6ed	add emby docs	2021-05-23 03:50:00 -05:00
Jason Dove	9afec19888	cleanup	2021-05-23 03:27:20 -05:00
Jason DoveandGitHub	50529ee6ad	add emby media source (#201 ) * properly scope jellyfin disconnect * add emby entities * add emby media source page * add emby media source editor * sync emby libraries * enable emby library sync toggle * add emby path replacements editor * add emby movie synchronization * fix emby artwork * sync emby television * code cleanup * add jellyfin/emby address placeholder * tweak jellyfin/emby address form	2021-05-23 03:05:23 -05:00
Jason DoveandGitHub	0b105bf6e1	fix schedule item duration under one hour (#200 )	2021-05-22 07:45:44 -05:00
Jason Dove	5356f7f293	update dependencies	2021-05-22 05:59:30 -05:00
Jason DoveandGitHub	1d35efa429	fix jellyfin artwork (#198 )	2021-05-21 21:21:32 -05:00
Jason DoveandGitHub	04da4b2964	single-file app publishing (#197 ) * attempt to fix single file app publishing * update release workflow	2021-05-21 15:17:24 -05:00