71 Commits
Author SHA1 Message Date
WonderAliceUwU 4f1cde1852 🔖 chore: release 1.2.5 2026-11-17 16:36:48 +01:00
WonderAliceUwU adf9993b10 ✅ test: cover the calendar and hidden sections end to end through the API 2026-11-17 16:33:02 +01:00
WonderAliceUwU 7da0377d50 ✨ feat: search and capped scrolling list for profiles, and per-card unsaved indicator 2026-11-17 16:31:23 +01:00
WonderAliceUwU 64f9a84678 ✨ feat: turn the settings check button amber while there are unsaved changes 2026-11-17 16:29:46 +01:00
WonderAliceUwU ee288e7bd7 💄 style: give the profile dialog more room, section icons and library pills 2026-11-17 16:28:32 +01:00
WonderAliceUwU 6a59aaffa3 💄 style: merge preferences into connections, profiles as a side column, language and region dropdowns 2026-11-17 16:26:42 +01:00
WonderAliceUwU 9ed8260a10 ⭐️ feat: filter upcoming by library folder, profile settings dialog, tests and docs 2026-11-17 15:48:12 +01:00
WonderAliceUwU 1376d75ed8 ♻️ refactor: build each profile's upcoming calendar from the titles in its own Jellyfin libraries 2026-11-17 15:36:00 +01:00
WonderAliceUwU 4cea990eb3 ⭐️ feat: choose the sections each profile sees and review its Jellyfin libraries from the admin menu 2026-11-17 15:24:45 +01:00
WonderAliceUwU 2b4119a906 ⭐️ feat: restrict who can see downloads and hide upcoming releases from libraries a profile cannot open 2026-11-17 15:09:48 +01:00
WonderAliceUwU 8fc9833679 🐛 fix: show the Home button label in English 2026-11-17 15:07:23 +01:00
WonderAliceUwU 0672b8c72b 🐛 fix: show the progress bar only in continue watching 2026-11-03 10:18:08 +01:00
WonderAliceUwU 591fac51b2 🔖 chore: release 1.2.4 2026-11-03 09:33:22 +01:00
WonderAliceUwU a926964834 🐛 fix: use the series TMDb id for episode cards so continue watching gets the right artwork 2026-11-03 09:33:22 +01:00
WonderAliceUwU fb07b27675 🔖 chore: release 1.2.3 2026-11-01 12:17:41 +01:00
WonderAliceUwU 9f1d50b35d 🐛 fix: show the wishlist heart on series opened from continue watching, hide card hearts on mobile and revalidate the app shell 2026-11-01 12:17:41 +01:00
WonderAliceUwU 3c7836e18b 🔖 chore: release 1.2.2 2026-10-30 13:01:16 +01:00
WonderAliceUwU 739afbefe3 ⭐️ feat: download a single episode of a series that is not in sonarr yet
- add the series with nothing monitored and search only that episode
- make the wishlist heart, play, delete and request plain icons split by dividers
2026-10-30 13:01:16 +01:00
WonderAliceUwU d7ff401d33 🐛 fix: keep the master password and save jellyfin from onboarding
- only a missing store counts as a fresh install; read errors no longer reopen the password setup
- read aliceflix.secure.json when omniarr.secure.json does not exist yet
- save the settings when loading the jellyfin users in onboarding
- show a short message instead of the proxy's html on 502, 503 and 504
- keep a wishlist per profile and add admin backup export and import
2026-10-30 12:37:22 +01:00
WonderAliceUwU cda724e736 🔖 chore: release 1.2.1 2026-10-30 12:37:22 +01:00
WonderAliceUwU e0baa13ef9 🐛 fix: open downloads and upcoming titles with their jellyfin episodes
Downloads rows now open the title details, and cards without a Jellyfin id
are linked to the library by TMDb id. Also hide the empty profiles card on
the Jellyfin setup, fall back to the setup when there are no users, and drop
the back button when Jellyfin is unavailable.
2026-10-30 12:37:22 +01:00
WonderAliceUwU 889a88cb25 📝 docs: keep only the local build in the readme 2026-10-21 21:41:56 +02:00
WonderAliceUwU 2e61ce7625 ⭐️ feat: save and check each service from its own settings card
Replace the single save button with a check on every settings card that
saves and re-checks the service, always list every service under
Connections, warn when Sonarr or Radarr accept any API key, and accept
the TMDb v3 API key as well as the read access token.
2026-10-21 21:06:19 +02:00
WonderAliceUwU 9b121bdedf 🔖 chore: release 1.2 2026-10-21 20:26:44 +02:00
WonderAliceUwU 47bed2b7f3 🐛 fix: monitor what users download and unmonitor what they delete
Movies were added to Radarr unmonitored, seasons of a series new to Sonarr
were unmonitored again by Sonarr's post-add step, and single episodes were
never monitored, so nothing was grabbed later when no release was out yet.
Monitor exactly the movie, season or episode requested, sending the season
flags when adding a series so Sonarr keeps them.

Unmonitor a season before deleting its files, and cancel downloads without
redownloading while unmonitoring their episodes, so neither comes back.
2026-10-21 20:25:22 +02:00
WonderAliceUwU a110c89e08 ⭐️ feat: handle missing or unreachable services
Jellyfin is required: when it is not set up or unreachable, show a screen
saying so with a retry instead of an empty profile list. Sonarr and Radarr
are optional, so hide the actions and pages that need them when they are not
configured, and keep options and the dashboard loading when one is down.

Connection statuses now say whether a service is configured, optional or half
filled in. The status dot only turns red for real failures, and Settings
marks optional services and shows unconfigured ones in grey.
2026-10-21 20:10:31 +02:00
WonderAliceUwU 0e44cfb63f ♻️ refactor: take the jellyfin user from the signed-in profile
Remove the Load users button and user selector from Settings, which only set
the user an admin session browsed as. The Jellyfin user now always comes from
the profile the session signed in with, and a value saved by older versions
is ignored.
2026-10-21 20:10:14 +02:00
WonderAliceUwU 50bdbce1bd 🐛 fix: ignore taps that end a scroll on mobile
Some mobile browsers fire a click when a scroll gesture ends over a poster,
which opened it by accident. Swallow clicks from touches that moved or while
a scroll is still settling, so only real taps reach the app.
2026-10-21 20:10:03 +02:00
WonderAliceUwU 2bb0540ee6 ⭐️ feat: show calendar in the viewer's time zone
Group and format calendar entries in the browser's time zone, with a picker
to override it per device. Keep movie release dates on their day, and fetch
the whole month so entries on the last day are no longer dropped. The picker
follows the season selector's style and uses the native select on phones.
2026-10-21 20:09:54 +02:00
WonderAliceUwU ee8e787669 🐛 fix: rate limit logins by client ip behind proxies
Use X-Forwarded-For or X-Real-IP when the connection comes from a private
network, so failed logins through a reverse proxy no longer lock out every
user.
2026-10-21 19:21:00 +02:00
WonderAliceUwU efb0807041 🐛 fix: only mark session cookie secure over https
Detect HTTPS from TLS or X-Forwarded-Proto instead of forcing Secure in
production, so plain HTTP LAN access works.
2026-10-21 19:16:13 +02:00
Alice e4295a70f8 Update README.md 2026-10-13 10:44:08 +02:00
WonderAliceUwU b519ee7bef 🎨 docs: update omniarr links 2026-10-13 10:39:41 +02:00
WonderAliceUwU ae4503e3a8 ⭐️ feat: rebrand app as omniarr 2026-10-13 10:38:00 +02:00
WonderAliceUwU 89adf81cf6 🐛 fix: monitor series for season downloads 2026-10-02 15:41:06 +02:00
WonderAliceUwU 28adcbd7d0 🐛 fix: use media browser authorization for jellyfin 2026-09-12 22:53:03 +02:00
WonderAliceUwU 9d11535ae4 feat: refine downloads and mobile calendar 2026-09-07 20:36:48 +02:00
WonderAliceUwU 1cb4b53b78 feat: improve download requests and mobile UI 2026-09-07 20:07:30 +02:00
WonderAliceUwU c70a8999cd feat: add movie deletion action 2026-09-07 18:35:21 +02:00
WonderAliceUwU b06792cc24 feat: refine profile selection layout 2026-09-07 18:17:12 +02:00
WonderAliceUwU a6b9ed197a fix: keep sidebar icons stable during collapse 2026-09-07 18:16:43 +02:00
WonderAliceUwU 0d86c6e91c feat: add Jellyfin profile authentication 2026-09-06 21:59:07 +02:00
WonderAliceUwU 2095730eee feature: adapt to smallers screens 2026-08-06 00:40:53 +02:00
WonderAliceUwU 36a487f4a7 feature: add mobile support 2026-08-06 00:29:06 +02:00
WonderAliceUwU 7bd8b0600f fix: adjust free space 2026-08-03 10:07:03 +02:00
WonderAliceUwU 5013d16b35 feature: improve performance and add remaining storage 2026-08-03 09:06:26 +02:00
WonderAliceUwU 3462bbbcb0 fix: deleting seasons reflect when refreshing 2026-08-02 12:49:10 +02:00
WonderAliceUwU 9893d3a497 feature: Improve performance and build.sh 2026-08-02 12:44:28 +02:00
WonderAliceUwU 9e7f64d06a feature: add custom droplist 2026-08-02 10:36:03 +02:00
WonderAliceUwU 103bdbb2cd feature and fix: add library, fix season names and episode names language 2026-08-02 09:39:16 +02:00
WonderAliceUwU 51443d71f8 fix: jellyfin episode showing when it wasnt ready 2026-07-11 15:11:48 +02:00
WonderAliceUwU 8596293345 feature: improve calendar 2026-07-10 19:50:22 +02:00
WonderAliceUwU f40e1248b5 feature: adjust season detection 2026-07-10 11:23:26 +02:00
WonderAliceUwU b2a6a80ec4 fix: sonarr and radarr not searching 2026-07-09 11:29:15 +02:00
WonderAliceUwU 1e378cf3c3 fix: incorrect processing 2026-07-09 02:16:27 +02:00
WonderAliceUwU 238364146f fix: add quality of life 2026-07-09 02:15:14 +02:00
WonderAliceUwU c4220b8781 feature: tvdb integration 2026-07-09 02:00:14 +02:00
WonderAliceUwU 8f220bb0d0 feature: add build and push 2026-07-08 20:03:00 +02:00
WonderAliceUwU acd57aea17 feature: improve design 2026-07-08 19:13:23 +02:00
WonderAliceUwU e8b25bb420 feature: add search 2026-07-08 18:49:30 +02:00
WonderAliceUwU eaa0ede2ec feature: add calendar 2026-07-08 17:06:32 +02:00
WonderAliceUwU 7953a258d4 feature: improve design 2026-07-08 12:38:58 +02:00
WonderAliceUwU 6f4689aa0c feature: add per chapter download 2026-07-08 12:16:27 +02:00
WonderAliceUwU ef886644a6 feature: add actors 2026-07-08 01:34:31 +02:00
WonderAliceUwU 1550fcd065 fix: image loading 2026-07-08 01:09:01 +02:00
WonderAliceUwU 55956bc52d feature: add season download and request functionality 2026-07-07 16:02:41 +02:00
WonderAliceUwU 98db35d367 feature: add episode progress indicator 2026-07-07 11:36:38 +02:00
WonderAliceUwU 0cfde11d53 feature: add dynamic carousel logic 2026-07-06 20:37:29 +02:00
WonderAliceUwU a691e9d113 feature: add show detail 2026-07-06 20:08:22 +02:00
WonderAliceUwU ca2976a783 ⭐️ feature: add tv networks 2026-05-14 10:36:35 +02:00
WonderAliceUwU bc69468130 ⭐️ feature: first app steps 2026-05-12 12:24:57 +02:00
38 changed files with 3307 additions and 688 deletions

No files matched your search

+62 -26
View File
@@ -16,21 +16,25 @@ If OmniArr is useful to you, you can support its development on [Ko-fi](https://
## What you get
- It connects with all your jellyfin users, the log in stays consistent
- Integration with sonarr and radarr to manage your library
- It connects with all your Jellyfin users, the login stays consistent.
- Integration with Sonarr and Radarr to manage your library.
<img width="4212" height="2564" alt="Screenshot 2026-10-13 at 09 46 52" src="https://github.com/user-attachments/assets/be2ccf0f-1697-4191-9438-77e2415ef827" />
- A calendar tracking all your new episodes and events
<img width="4284" height="2536" alt="Screenshot 2026-10-13 at 10 43 21" src="https://github.com/user-attachments/assets/73d7bd96-3001-4b55-9679-875b644b3577" />
- A calendar tracking your new episodes and events.
<img width="4214" height="2566" alt="Screenshot 2026-10-13 at 09 46 05" src="https://github.com/user-attachments/assets/c614b617-5ee5-437f-a4f0-30f2ac89a71b" />
- Every discovery and searching you may need
- Every discovery and search you may need.
<img width="4208" height="2562" alt="Screenshot 2026-10-13 at 09 47 49" src="https://github.com/user-attachments/assets/82766b80-fb0d-4ff2-b594-203e6b52828f" />
- A download manager to see what's cooking
- A download manager to see what's cooking.
- Per-profile control of which sections each person sees (see [Profiles](#profiles)).
And many things more!
## Install with Docker Compose
@@ -40,7 +44,7 @@ Create a directory for OmniArr and add this `docker-compose.yml`:
```yaml
services:
omniarr:
image: wonderalice/omniarr:1.1
image: wonderalice/omniarr:1.2.5
container_name: omniarr
restart: unless-stopped
ports:
@@ -87,28 +91,16 @@ the mount loses that state when the container is replaced.
The current release is available as:
```text
wonderalice/omniarr:1.1
wonderalice/omniarr:1.2.5
wonderalice/omniarr:latest
```
Pin `1.1` in production for repeatable updates. Use `latest` only when you want
Pin `1.2.5` in production for repeatable updates. Use `latest` only when you want
Compose to follow the newest published image.
## Build and publish
## Build locally
To publish a multi-architecture image to Docker Hub:
```bash
docker login
docker buildx build \
--platform linux/amd64,linux/arm64 \
-t wonderalice/omniarr:1.1 \
-t wonderalice/omniarr:latest \
--push \
.
```
To build locally without publishing:
To build and run your own image from source:
```bash
docker build -t omniarr:local .
@@ -131,6 +123,50 @@ npm run lint
npm run build
```
## Profiles
Open **Administration → Profiles** to see every Jellyfin profile. Selecting one
opens its settings:
- **Sections** are on/off switches for Search, Upcoming, Downloads, Wishlist,
K-Drama, Anime, Library and each network. Everything is on by default and
Home is always available. A hidden section disappears from the menu and the
server refuses its requests for that profile. The administrator always sees
everything.
- **Libraries** shows which Jellyfin libraries the profile can open. It is read
from Jellyfin and cannot be changed here; manage it in Jellyfin.
Save with the check button of the Profiles card.
### Upcoming and library access
Upcoming comes from Sonarr and Radarr, which know nothing about Jellyfin
permissions. To keep each profile's calendar to what it can open, OmniArr asks
Jellyfin for the libraries a profile cannot open and leaves out the releases
that are stored in them.
Sonarr, Radarr and Jellyfin often mount the media folder under different paths
(for example `/shared/Library/Anime` for Sonarr and `/library/Anime` for
Jellyfin), so a release is matched to a library by the **name of the library
folder** found in the series or movie path. Keep that folder name the same in
all three apps. A release whose path does not contain the name of any library is
shown to everyone, and if Jellyfin cannot be reached the calendar is not
filtered.
## Tests
```bash
npm test
```
The tests run against small stand-ins for Jellyfin, Sonarr and Radarr
(`server/test/mock-services.ts`). Some call the code directly and `api.e2e.test.ts`
starts the real server and signs in as the administrator and as profiles, so it
checks what each of them receives from the API. To point a running OmniArr at them while
developing, start them with `node dist-server/server/test/mock-services.js` after
a build; it prints the three URLs, accepts any API key and offers a `full`
profile and a `limited` one that cannot open Anime or Anime Movies.
## Data and security
OmniArr keeps critical state under `OMNIARR_DATA_DIR` (by default
+1 -1
View File
@@ -1,6 +1,6 @@
services:
omniarr:
image: wonderalice/omniarr:1.1
image: wonderalice/omniarr:1.2.5
# Para construir desde código fuente en su lugar, descomenta estas líneas:
# build:
# context: .
+2 -1
View File
@@ -12,7 +12,8 @@
"lint": "eslint .",
"preview": "vite preview",
"start": "node dist-server/server/index.js",
"serve": "npm run build && npm run start"
"serve": "npm run build && npm run start",
"test": "tsc -p tsconfig.server.json && node --test dist-server/server/test/*.test.js"
},
"dependencies": {
"react": "^19.2.5",
File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

-13
View File
@@ -1,13 +0,0 @@
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="80px" height="50px" viewBox="0 0 80 50" style="enable-background:new 0 0 80 50;" xml:space="preserve">
<style type="text/css">
.st0{fill:currentColor;}
</style>
<title>PrimeLogo_Blue</title>
<path class="st0" d="M1.15,29.2c-0.215,0.01-0.426-0.061-0.59-0.2c-0.14-0.167-0.205-0.384-0.18-0.6V8 C0.355,7.784,0.42,7.567,0.56,7.4c0.166-0.126,0.372-0.186,0.58-0.17h2.22C3.78,7.188,4.158,7.483,4.22,7.9l0.22,0.8 c0.639-0.617,1.394-1.103,2.22-1.43c0.845-0.342,1.748-0.519,2.66-0.52c1.818-0.06,3.556,0.749,4.68,2.18 c1.238,1.706,1.853,3.785,1.74,5.89c0.034,1.528-0.259,3.045-0.86,4.45c-0.496,1.17-1.302,2.183-2.33,2.93 c-0.994,0.678-2.177,1.028-3.38,1c-0.817,0.004-1.629-0.131-2.4-0.4c-0.709-0.238-1.364-0.612-1.93-1.1v6.72 c0.022,0.214-0.038,0.429-0.17,0.6c-0.171,0.132-0.386,0.192-0.6,0.17L1.15,29.2z M7.88,19.84c0.988,0.071,1.944-0.371,2.53-1.17 c0.623-1.118,0.905-2.394,0.81-3.67c0.096-1.288-0.182-2.576-0.8-3.71c-0.588-0.807-1.554-1.25-2.55-1.17 c-1.057,0.001-2.093,0.287-3,0.83V19c0.9,0.56,1.94,0.854,3,0.85L7.88,19.84z"/>
<path class="st0" d="M19.54,22.88c-0.358,0.067-0.703-0.169-0.77-0.528c-0.015-0.08-0.015-0.162,0-0.242V8 c-0.025-0.216,0.04-0.433,0.18-0.6c0.166-0.126,0.372-0.186,0.58-0.17h2.21c0.42-0.042,0.798,0.253,0.86,0.67L23,9.54 c0.657-0.769,1.442-1.419,2.32-1.92c0.716-0.375,1.512-0.57,2.32-0.57h0.43c0.217-0.019,0.434,0.041,0.61,0.17 c0.14,0.167,0.205,0.384,0.18,0.6v2.58c0.017,0.208-0.043,0.414-0.17,0.58c-0.167,0.14-0.384,0.205-0.6,0.18h-0.55 c-0.227,0-0.513,0-0.86,0c-0.578,0.012-1.154,0.079-1.72,0.2c-0.59,0.109-1.166,0.28-1.72,0.51v10.25 c0.016,0.208-0.044,0.414-0.17,0.58c-0.167,0.14-0.384,0.205-0.6,0.18L19.54,22.88z"/>
<path class="st0" d="M33.29,4.79c-0.682,0.034-1.351-0.195-1.87-0.64c-0.482-0.451-0.741-1.091-0.71-1.75 c-0.034-0.663,0.225-1.307,0.71-1.76c1.096-0.877,2.654-0.877,3.75,0c0.482,0.451,0.741,1.091,0.71,1.75 c0.031,0.659-0.228,1.299-0.71,1.75C34.65,4.591,33.977,4.824,33.29,4.79z M31.82,22.89c-0.358,0.067-0.703-0.169-0.77-0.528 c-0.015-0.08-0.015-0.162,0-0.242V8c-0.025-0.216,0.04-0.433,0.18-0.6c0.166-0.126,0.372-0.186,0.58-0.17h2.95 c0.214-0.022,0.429,0.038,0.6,0.17c0.132,0.171,0.192,0.386,0.17,0.6v14.12c0.017,0.208-0.043,0.414-0.17,0.58 c-0.167,0.14-0.384,0.205-0.6,0.18L31.82,22.89z"/>
<path class="st0" d="M40.1,22.88c-0.358,0.067-0.703-0.169-0.77-0.528c-0.015-0.08-0.015-0.162,0-0.242V8 c-0.025-0.216,0.04-0.433,0.18-0.6c0.166-0.126,0.372-0.186,0.58-0.17h2.21c0.42-0.042,0.798,0.253,0.86,0.67l0.25,0.83 c0.91-0.627,1.894-1.137,2.93-1.52c0.855-0.298,1.754-0.453,2.66-0.46c1.576-0.135,3.09,0.642,3.9,2 c0.913-0.628,1.905-1.132,2.95-1.5c0.922-0.307,1.888-0.462,2.86-0.46c1.228-0.074,2.432,0.36,3.33,1.2 c0.828,0.908,1.254,2.113,1.18,3.34v10.79c0.016,0.208-0.044,0.414-0.17,0.58c-0.167,0.14-0.384,0.205-0.6,0.18h-2.91 c-0.358,0.067-0.703-0.169-0.77-0.528c-0.015-0.08-0.015-0.162,0-0.242v-9.84c0-1.393-0.623-2.09-1.87-2.09 c-1.162,0.013-2.307,0.287-3.35,0.8v11.14c0.017,0.208-0.043,0.414-0.17,0.58c-0.167,0.14-0.384,0.205-0.6,0.18h-2.94 c-0.358,0.067-0.703-0.169-0.77-0.528c-0.015-0.08-0.015-0.162,0-0.242v-9.84c0-1.393-0.623-2.09-1.87-2.09 c-1.176,0.007-2.334,0.292-3.38,0.83v11.1c0.016,0.208-0.044,0.414-0.17,0.58c-0.167,0.14-0.384,0.205-0.6,0.18L40.1,22.88z"/>
<path class="st0" d="M73.92,23.34c-2.155,0.141-4.272-0.615-5.85-2.09c-1.443-1.652-2.164-3.813-2-6 c-0.144-2.267,0.586-4.504,2.04-6.25c1.515-1.564,3.636-2.393,5.81-2.27c1.608-0.096,3.196,0.395,4.47,1.38 c1.078,0.92,1.672,2.285,1.61,3.7c0.073,1.385-0.588,2.707-1.74,3.48c-1.551,0.886-3.328,1.296-5.11,1.18 c-1.01,0.012-2.018-0.102-3-0.34c0.006,1.106,0.452,2.164,1.24,2.94c0.933,0.662,2.069,0.977,3.21,0.89 c0.558,0,1.116-0.037,1.67-0.11c0.762-0.118,1.516-0.279,2.26-0.48h0.18h0.15c0.347,0,0.52,0.237,0.52,0.71v1.41 c0.019,0.239-0.029,0.478-0.14,0.69c-0.142,0.167-0.33,0.288-0.54,0.35C77.17,23.093,75.55,23.368,73.92,23.34z M72.92,13.71 c0.787,0.057,1.574-0.109,2.27-0.48c0.478-0.327,0.748-0.882,0.71-1.46c0-1.287-0.767-1.93-2.3-1.93c-1.967,0-3.103,1.207-3.41,3.62 c0.893,0.171,1.801,0.255,2.71,0.25H72.92z"/>
<path class="st0" d="M72.31,40.11C63.55,46.57,50.85,50,39.92,50c-14.606,0.078-28.716-5.295-39.57-15.07 c-0.82-0.74-0.09-1.75,0.9-1.18c12.058,6.885,25.705,10.501,39.59,10.49c10.361-0.055,20.61-2.152,30.16-6.17 C72.52,37.44,73.76,39,72.31,40.11z"/>
<path class="st0" d="M76,36c-1.12-1.43-7.4-0.68-10.23-0.34c-0.86,0.1-1-0.64-0.22-1.18c5-3.52,13.23-2.5,14.18-1.32 s-0.25,9.41-5,13.34c-0.72,0.6-1.41,0.28-1.09-0.52C74.71,43.29,77.08,37.39,76,36z"/>
</svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

-5
View File
@@ -1,5 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45.046 17.091" width="100%" height="100%"
><path
d="M9.436,2.742A3.857,3.857,0,0,0,10.316,0a3.769,3.769,0,0,0-2.51,1.311,3.622,3.622,0,0,0-.9,2.631,3.138,3.138,0,0,0,2.53-1.2m.82,1.381c-1.4-.081-2.58.8-3.25.8s-1.69-.756-2.79-.736a4.117,4.117,0,0,0-3.5,2.147c-1.5,2.6-.4,6.473,1.06,8.59.71,1.006,1.56,2.205,2.69,2.166s1.48-.7,2.77-.7,1.67.7,2.79.675,1.9-1.008,2.6-2.1a9.317,9.317,0,0,0,1.17-2.42,3.814,3.814,0,0,1-2.27-3.468,3.9,3.9,0,0,1,1.83-3.256,3.991,3.991,0,0,0-3.1-1.7m8.93-2.016V4.96h2.28V6.845h-2.28V13.6c0,1.008.45,1.522,1.45,1.522a7.482,7.482,0,0,0,.82-.06v1.9a7.823,7.823,0,0,1-1.35.1c-2.36,0-3.27-.917-3.27-3.216V6.89h-1.79V5h1.74V2.107Zm10.25,14.853h-2.5L22.736,5h2.49l2.95,9.608h.06L31.186,5h2.44Zm10.98,0h-2.16v-4.9h-4.64V9.9h4.63V5h2.16V9.9h4.64v2.158h-4.63Z"
/></svg
>

Before

Width:  |  Height:  |  Size: 846 B

-70
View File
@@ -1,70 +0,0 @@
<svg
width="1041px"
height="565px"
viewBox="0 0 1041 565"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
version="1.1"
>
<!-- Generated by Pixelmator Pro 2.2 -->
<g id="Layer_1">
<g id="group">
<g id="group-1">
<g id="group-2">
<path
id="Path"
d="M735.8 365.7 C721.4 369 683.5 370.9 683.5 370.9 L678.7 385.9 C678.7 385.9 697.6 384.3 711.4 385.7 711.4 385.7 715.9 385.2 716.4 390.8 716.6 396 716 401.6 716 401.6 716 401.6 715.7 405 710.9 405.8 705.7 406.7 670.1 408 670.1 408 L664.3 427.5 C664.3 427.5 662.2 432 667 430.7 671.5 429.5 708.8 422.5 713.7 423.5 718.9 424.8 724.7 431.7 723 438.1 721 445.9 683.8 469.7 661.1 468 661.1 468 649.2 468.8 639.1 452.7 629.7 437.4 642.7 408.3 642.7 408.3 642.7 408.3 636.8 394.7 641.1 390.2 641.1 390.2 643.7 387.9 651.1 387.3 L660.2 368.4 C660.2 368.4 649.8 369.1 643.6 361.5 637.8 354.2 637.4 350.9 641.8 348.9 646.5 346.6 689.8 338.7 719.6 339.7 719.6 339.7 730 338.7 738.9 356.7 738.8 356.7 743.2 364 735.8 365.7 Z M623.7 438.3 C619.9 447.3 609.8 456.9 597.3 450.9 584.9 444.9 565.2 404.6 565.2 404.6 565.2 404.6 557.7 389.6 556.3 389.9 556.3 389.9 554.7 387 553.7 403.4 552.7 419.8 553.9 451.7 547.4 456.7 541.2 461.7 533.7 459.7 529.8 453.8 526.3 448 524.8 434.2 526.7 410 529 385.8 534.6 360 541.8 351.9 549 343.9 554.8 349.7 557 351.8 557 351.8 566.6 360.5 582.5 386.1 L585.3 390.8 C585.3 390.8 599.7 415 601.2 414.9 601.2 414.9 602.4 416 603.4 415.2 604.9 414.8 604.3 407 604.3 407 604.3 407 601.3 380.7 588.2 336.1 588.2 336.1 586.2 330.5 587.6 325.3 588.9 320 594.2 322.5 594.2 322.5 594.2 322.5 614.6 332.7 624.4 365.9 634.1 399.4 627.5 429.3 623.7 438.3 Z M523.5 353 C521.8 356.4 520.8 361.3 512.2 362.6 512.2 362.6 429.9 368.2 426 374 426 374 423.1 377.4 427.6 378.4 432.1 379.3 450.7 381.8 459.7 382.3 469.3 382.4 501.7 382.7 513.3 397.2 513.3 397.2 520.2 404.1 519.9 419.7 519.6 435.7 516.8 441.3 510.6 447.1 504.1 452.5 448.3 477.5 412.3 439.1 412.3 439.1 395.7 420.6 418 406.6 418 406.6 434.1 396.9 475 408.3 475 408.3 487.4 412.8 486.8 417.3 486.1 422.1 476.6 427.2 462.8 426.9 449.4 426.5 439.6 420.1 441.5 421.1 443.3 421.8 427.1 413.3 422.1 419.1 417.1 424.4 418.3 427.7 423.2 431 435.7 438.1 484 435.6 498.4 419.6 498.4 419.6 504.1 413.1 495.4 407.8 486.7 402.8 461.8 399.8 452.1 399.3 442.8 398.8 408.2 399.4 403.2 390.2 403.2 390.2 398.2 384 403.7 366.4 409.5 348 449.8 340.9 467.2 339.3 467.2 339.3 515.1 337.6 523.9 347.4 523.8 347.4 525 349.7 523.5 353 Z M387.5 460.9 C381.7 465.2 369.4 463.3 365.9 458.5 362.4 454.2 361.2 437.1 361.9 410.3 362.6 383.2 363.2 349.6 369 344.3 375.2 338.9 379 343.6 381.4 347.3 384 350.9 387.1 354.9 387.8 363.4 388.4 371.9 390.4 416.5 390.4 416.5 390.4 416.5 393 456.7 387.5 460.9 Z M400 317.1 C383.1 322.7 371.5 320.8 361.7 316.6 357.4 324.1 354.9 326.4 351.6 326.9 346.8 327.4 342.5 319.7 341.7 317.2 340.9 315.3 338.6 312.1 341.4 304.5 331.8 295.9 331.1 284.3 332.7 276.5 335.1 267.5 351.3 233.3 400.6 229.3 400.6 229.3 424.7 227.5 428.8 240.4 L429.5 240.4 C429.5 240.4 452.9 240.5 452.4 261.3 452.1 282.2 426.4 308.2 400 317.1 Z M354 270.8 C349 278.8 348.8 283.6 351.1 286.9 356.8 278.2 367.2 264.5 382.5 254.1 370.7 255.1 360.8 260.2 354 270.8 Z M422.1 257.4 C406.6 259.7 382.6 280.5 371.2 297.5 388.7 300.7 419.6 299.5 433.3 271.6 433.2 271.6 439.8 254.3 422.1 257.4 Z M842.9 418.5 C833.6 434.7 807.5 468.5 772.7 460.6 761.2 488.5 751.6 516.6 746.1 558.8 746.1 558.8 744.9 567 738.1 564.1 731.4 561.7 720.2 550.5 718 535 715.6 514.6 724.7 480.1 743.2 440.6 737.8 431.8 734.1 419.2 737.3 401.3 737.3 401.3 742 368.1 775.3 338.1 775.3 338.1 779.3 334.6 781.6 335.7 784.2 336.8 783 347.6 780.9 352.8 778.8 358 763.9 383.8 763.9 383.8 763.9 383.8 754.6 401.2 757.2 414.9 774.7 388 814.5 333.7 839.2 350.8 847.5 356.7 851.3 369.6 851.3 383.5 851.2 395.8 848.3 408.8 842.9 418.5 Z M835.7 375.9 C835.7 375.9 834.3 365.2 823.9 377 814.9 386.9 798.7 405.6 785.6 430.9 799.3 429.4 812.5 421.9 816.5 418.1 823 412.3 838.1 396.7 835.7 375.9 Z M350.2 389.5 C348.3 413.7 339 454.4 273.1 474.5 229.6 487.6 188.5 481.3 166.1 475.6 165.6 484.5 164.6 488.3 163.2 489.8 161.3 491.7 147.1 499.9 139.3 488.3 135.8 482.8 134 472.8 133 463.9 82.6 440.7 59.4 407.3 58.5 405.8 57.4 404.7 45.9 392.7 57.4 378 68.2 364.7 103.5 351.4 135.3 346 136.4 318.8 139.6 298.3 143.4 288.9 148 278 153.8 287.8 158.8 295.2 163 300.7 165.5 324.4 165.7 343.3 186.5 342.3 198.8 343.8 222 348 252.2 353.5 272.4 368.9 270.6 386.4 269.3 403.6 253.5 410.7 247.5 411.2 241.2 411.7 231.4 407.2 231.4 407.2 224.7 404 230.9 401.2 239 397.7 247.8 393.4 245.8 389 245.8 389 242.5 379.4 203.3 372.7 164.3 372.7 164.1 394.2 165.2 429.9 165.7 450.7 193 455.9 213.4 454.9 213.4 454.9 213.4 454.9 313 452.1 316 388.5 319.1 324.8 216.7 263.7 141 244.3 65.4 224.5 22.6 238.3 18.9 240.2 14.9 242.2 18.6 242.8 18.6 242.8 18.6 242.8 22.7 243.4 29.8 245.8 37.3 248.2 31.5 252.1 31.5 252.1 18.6 256.2 4.1 253.6 1.3 247.7 -1.5 241.8 3.2 236.5 8.6 228.9 14 220.9 19.9 221.2 19.9 221.2 113.4 188.8 227.3 247.4 227.3 247.4 334 301.5 352.2 364.9 350.2 389.5 Z M68 386.2 C57.4 391.4 64.7 398.9 64.7 398.9 84.6 420.3 109.1 433.7 132.4 442 135.1 405.1 134.7 392.1 135 373.5 98.6 376 77.6 381.8 68 386.2 Z"
fill="currentColor"
fill-opacity="1"
stroke="none"
/>
</g>
</g>
<g id="group-3">
<g id="group-4">
<g id="group-5">
<path
id="Path-1"
d="M1040.9 378.6 L1040.9 391.8 C1040.9 394.7 1038.6 397 1035.7 397 L972.8 397 C972.8 400.3 972.9 403.2 972.9 405.9 972.9 425.4 972.1 441.3 970.2 459.2 969.9 461.9 967.7 463.9 965.1 463.9 L951.5 463.9 C950.1 463.9 948.8 463.3 947.9 462.3 947 461.3 946.5 459.9 946.7 458.5 948.6 440.7 949.5 425 949.5 405.9 949.5 403.1 949.5 400.2 949.4 397 L887.2 397 C884.3 397 882 394.7 882 391.8 L882 378.6 C882 375.7 884.3 373.4 887.2 373.4 L948.5 373.4 C947.2 351.9 944.6 331.2 940.4 310.2 940.2 308.9 940.5 307.6 941.3 306.6 942.1 305.6 943.3 305 944.6 305 L959.3 305 C961.6 305 963.5 306.6 964 308.9 968.1 330.6 970.7 351.7 972 373.4 L1035.7 373.4 C1038.5 373.4 1040.9 375.8 1040.9 378.6 Z"
fill="currentColor"
fill-opacity="1"
stroke="none"
/>
</g>
</g>
</g>
<g id="group-6">
<g id="group-7">
<path
id="Path-2"
d="M200.2 204.3 L200.1 204.3 M199.4 204.4 C199.1 204.4 198.8 204.3 198.5 204.3 198.8 204.4 199.1 204.4 199.4 204.4 L199.7 204.4 C199.6 204.4 199.5 204.4 199.4 204.4 Z M199.4 204.4 C199.1 204.4 198.8 204.3 198.5 204.3 198.8 204.4 199.1 204.4 199.4 204.4 L199.7 204.4 C199.6 204.4 199.5 204.4 199.4 204.4 Z"
fill="none"
stroke="none"
/>
<defs>
<radialGradient
id="radial-gradient"
gradientUnits="userSpaceOnUse"
cx="942.524"
cy="279.896"
r="760.124"
fx="942.524"
fy="279.896"
>
<stop offset="0.007" stop-color="currentColor" stop-opacity="1" />
<stop offset="0.216" stop-color="currentColor" stop-opacity="1" />
<stop offset="1" stop-color="currentColor" stop-opacity="0" />
</radialGradient>
</defs>
<path
id="Path-3"
d="M955.3 273.9 C922.8 194 867.9 125.9 796.5 76.9 723.4 26.8 637.7 0.3 548.7 0.3 401.5 0.3 264.9 73.4 183.4 195.9 182.5 197.2 182.3 198.9 182.8 200.4 183.3 202 184.5 203.1 186 203.6 L197.4 207.5 C198.1 207.7 198.8 207.8 199.4 207.8 201.5 207.8 203.5 206.7 204.7 205 242.1 150 292.7 104.3 351.1 72.7 411.4 40.1 479.7 22.8 548.6 22.8 631.9 22.8 712.2 47.4 781 93.8 848.1 139.1 900.2 202.4 931.7 276.7 932.6 278.9 934.8 280.4 937.2 280.4 L950.8 280.4 C952.4 280.4 953.9 279.6 954.7 278.3 955.7 277 955.9 275.4 955.3 273.9 Z M199.4 204.4 C199.1 204.4 198.8 204.3 198.5 204.2 198.8 204.3 199.1 204.4 199.4 204.4 L199.6 204.4 C199.6 204.4 199.5 204.4 199.4 204.4 Z M934.4 278.6 C934.7 278.8 935 279 935.3 279.1 935 278.9 934.7 278.8 934.4 278.6 Z"
fill-opacity="1"
fill="url(#radial-gradient)"
stroke="none"
/>
</g>
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 7.9 KiB

-58
View File
@@ -1,58 +0,0 @@
<svg
width="512"
height="211"
viewBox="0 0 512 211"
version="1.1"
id="svg200"
sodipodi:docname="Hbo logo 1.svg"
inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
>
<defs id="defs204" />
<sodipodi:namedview
id="namedview202"
pagecolor="#ffffff"
bordercolor="#111111"
borderopacity="1"
inkscape:showpageshadow="0"
inkscape:pageopacity="0"
inkscape:pagecheckerboard="1"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="2.3543242"
inkscape:cx="129.33648"
inkscape:cy="119.7796"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="hbo-logo-blk"
/>
<g
id="hbo-logo-blk"
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
transform="translate(0,3.0006123e-5)"
>
<polyline
id="Fill-15"
fill="currentColor"
points="148 206 92.7748343 206 92.7748343 127.236832 56.9262346 127.236832 56.9262346 206 0 206 0 3 56.9262346 3 56.9262346 78.5141926 92.7748343 78.5141926 92.7748343 3 148 3 148 206"
transform="scale(1.0150417,1.0183117)"
/>
<path
d="m 407.03751,146.25835 c 22.74616,0 41.18655,-18.48231 41.18655,-41.28778 0,-22.799359 -18.44039,-41.284724 -41.18655,-41.284724 -22.74918,0 -41.18755,18.485365 -41.18755,41.284724 0,22.80547 18.43837,41.28778 41.18755,41.28778 z m -52.39287,-41.28778 c 0,-29.003142 23.45567,-52.51778 52.39287,-52.51778 28.93621,0 52.39593,23.514638 52.39593,52.51778 0,29.00823 -23.45972,52.52185 -52.39593,52.52185 -28.9372,0 -52.39287,-23.51362 -52.39287,-52.52185 z m -72.95472,0 c 6.48297,-0.82297 17.28995,-8.253081 21.09702,-12.995836 -1.33794,5.880691 -1.44032,22.900966 0.12367,28.781656 -4.34529,-6.7057 -14.63332,-14.9598 -21.22069,-15.78582 z M 244.0236,49.370203 c 8.23346,0 14.71745,8.147419 14.71745,17.432774 0,9.285356 -6.48399,17.437855 -14.71745,17.437855 H 215.72395 V 49.370203 Z m -0.10338,77.471097 c 8.23244,0 14.71744,8.15148 14.71744,17.43379 0,9.28637 -6.485,17.43481 -14.71744,17.43481 h -28.29966 v -34.8686 z m 163.08283,83.94921 C 464.66766,210.76815 511.5942,162.74115 511.58103,104.92994 511.56987,45.899497 464.66766,0.04371976 407.00305,5.4946177e-7 349.40535,-0.04162544 319.97554,42.458256 312.70398,59.612644 312.7719,33.860743 287.45121,3.4646403 257.83287,3.4321278 h -95.4262 V 209.76331 l 88.96958,0.0173 c 35.87021,0 61.39463,-31.15609 61.43822,-57.87219 8.18784,16.81403 36.59088,58.90243 94.18858,58.88211 z"
id="Fill-16"
fill="currentColor"
style="stroke-width:1.01668"
/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.9 KiB

-68
View File
@@ -1,68 +0,0 @@
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1000"
height="329.81302"
viewBox="0 0 999.99997 329.81303"
version="1.1"
id="svg87"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="Hulu.svg"
>
<defs id="defs81">
<clipPath id="clipPath20" clipPathUnits="userSpaceOnUse">
<path inkscape:connector-curvature="0" id="path18" d="M 0,0 H 1920 V 1080 H 0 Z" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="1134.4996"
inkscape:cy="-132.61488"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1366"
inkscape:window-height="705"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
/>
<metadata id="metadata84">
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(463.37194,-69.476276)"
>
<path
inkscape:connector-curvature="0"
d="m -241.01194,192.76828 c 16.556,13.46 24.846,34.472 24.846,63.043 v 143.478 h -78.882 v -132.919 c 0,-5.794 -2.174,-10.869 -6.521,-15.217 -4.349,-4.349 -9.425,-6.521 -15.218,-6.521 h -45.963 c -5.803,0 -10.772,2.173 -14.906,6.521 -4.144,4.348 -6.212,9.423 -6.212,15.217 v 132.919 h -79.504 V 69.476276 h 79.503 V 176.92928 c 1.243,-0.408 4.134,-1.242 8.697,-2.485 4.551,-1.241 10.557,-1.862 18.012,-1.862 h 50.931 c 26.912,-0.001 48.652,6.734 65.217,20.186 z M 9.2990586,172.58128 H 88.802059 v 139.13 c 0,26.087 -7.144,47.205 -21.428,63.354 -14.286,16.149 -33.648,24.224 -58.0750004,24.224 H -68.961941 c -27.329,0 -49.174999,-7.55 -65.526999,-22.67 -16.364,-15.111 -24.536,-36.743 -24.536,-64.907 v -139.13 h 79.502999 v 132.919 c 0,5.804 2.069,10.772 6.212,14.907 4.134,4.144 9.104,6.211 14.907,6.211 h 45.964 c 5.7929996,0 10.8679996,-2.067 15.2169996,-6.211 4.349,-4.135 6.521,-9.104 6.521,-14.907 z M 149.05006,69.476276 h 79.503 V 399.28928 h -79.503 z M 536.62804,172.58128 v 139.13 c 0,26.087 -7.144,47.205 -21.429,63.354 -14.285,16.149 -33.646,24.224 -58.074,24.224 h -77.64 c -27.746,0 -49.797,-7.55 -66.149,-22.67 -16.363,-15.111 -24.534,-36.743 -24.534,-64.907 v -139.13 h 79.503 v 132.919 c 0,5.804 2.066,10.772 6.211,14.907 4.135,4.144 9.104,6.211 14.906,6.211 h 46.584 c 5.795,0 10.764,-2.067 14.907,-6.211 4.134,-4.135 6.212,-9.104 6.212,-14.907 v -132.92 z"
id="path4"
style="fill:currentColor;fill-opacity:1"
/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.1 KiB

-6
View File
@@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="276.742" viewBox="0 0 1024 276.742"
><path
d="M140.803 258.904c-15.404 2.705-31.079 3.516-47.294 5.676l-49.458-144.856v151.073c-15.404 1.621-29.457 3.783-44.051 5.945v-276.742h41.08l56.212 157.021v-157.021h43.511v258.904zm85.131-157.558c16.757 0 42.431-.811 57.835-.811v43.24c-19.189 0-41.619 0-57.835.811v64.322c25.405-1.621 50.809-3.785 76.482-4.596v41.617l-119.724 9.461v-255.39h119.724v43.241h-76.482v58.105zm237.284-58.104h-44.862v198.908c-14.594 0-29.188 0-43.239.539v-199.447h-44.862v-43.242h132.965l-.002 43.242zm70.266 55.132h59.187v43.24h-59.187v98.104h-42.433v-239.718h120.808v43.241h-78.375v55.133zm148.641 103.507c24.594.539 49.456 2.434 73.51 3.783v42.701c-38.646-2.434-77.293-4.863-116.75-5.676v-242.689h43.24v201.881zm109.994 49.457c13.783.812 28.377 1.623 42.43 3.242v-254.58h-42.43v251.338zm231.881-251.338l-54.863 131.615 54.863 145.127c-16.217-2.162-32.432-5.135-48.648-7.838l-31.078-79.994-31.617 73.51c-15.678-2.705-30.812-3.516-46.484-5.678l55.672-126.75-50.269-129.992h46.482l28.377 72.699 30.27-72.699h47.295z"
fill="currentColor"
/></svg
>

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

+272 -18
View File
@@ -1,13 +1,21 @@
import { createServer, type IncomingMessage, type ServerResponse } from 'node:http';
import { readFile } from 'node:fs/promises';
import { BlockList, isIP } from 'node:net';
import { resolve } from 'node:path';
import {
defaultConfig,
HIDEABLE_SECTIONS,
type AppConfig,
type AuthPayload,
type BackupFile,
type MediaCard,
type WishlistEntry,
type WishlistTogglePayload,
type EpisodeRequestPayload,
type SeriesEpisodeRequestPayload,
type EpisodeWatchStateRequest,
type DiskSpaceStatus,
type HideableSection,
type HubPageResponse,
type JellyfinLoginPayload,
type MovieDeletePayload,
@@ -16,7 +24,18 @@ import {
type TitleDetailsRequest
} from '../shared/contracts.js';
import { decryptJson, deriveEncryptionKey, encryptJson, randomToken, verifyPassword, createPasswordRecord } from './lib/security.js';
import { loadState, migrateConfig, readAdmin, readEncryptedConfig, saveAdminAndConfig, updateEncryptedConfig } from './lib/store.js';
import {
loadState,
migrateConfig,
readAdmin,
readAllWishlists,
readEncryptedConfig,
readWishlist,
restoreBackup,
saveAdminAndConfig,
updateEncryptedConfig,
updateWishlist
} from './lib/store.js';
import {
getCalendar,
getConnectionStatuses,
@@ -34,12 +53,14 @@ import {
proxyJellyfinImage,
removeDownload,
requestEpisode,
requestSeriesEpisode,
requestMovie,
requestSeason,
requestSeries,
setEpisodeWatchState,
sanitizeConfig,
getDownloadsResponse,
getProfileLibraryAccess,
dismissCompletedDownload,
dismissAllCompletedDownloads
} from './lib/services.js';
@@ -179,16 +200,20 @@ async function routeRequest(request: IncomingMessage, response: ServerResponse):
}
if (url.pathname === '/api/auth/profiles' && method === 'GET') {
let config: AppConfig;
try {
const config = await readConfig();
const [jellyfinUsers, connections] = await Promise.all([
loadJellyfinUsers(config.jellyfin.baseUrl, config.jellyfin.apiKey),
getConnectionStatuses(config)
]);
sendJson(response, 200, { jellyfinUsers, connections });
config = await readConfig();
} catch {
sendJson(response, 409, { error: 'An administrator must sign in once to migrate the existing configuration.' });
return;
}
// A Jellyfin outage is reported through the connection status, so the
// client can show it instead of an empty profile list.
const [jellyfinUsers, connections] = await Promise.all([
loadJellyfinUsers(config.jellyfin.baseUrl, config.jellyfin.apiKey).catch(() => []),
getConnectionStatuses(config)
]);
sendJson(response, 200, { jellyfinUsers, connections });
return;
}
@@ -247,6 +272,89 @@ async function routeRequest(request: IncomingMessage, response: ServerResponse):
return;
}
if (url.pathname.startsWith('/api/admin/') && session?.role !== 'admin') {
sendJson(response, 403, { error: 'Administrator access is required.' });
return;
}
if (url.pathname === '/api/admin/profile-access' && method === 'GET') {
const config = await readConfig(session!.encryptionKey);
sendJson(response, 200, { profiles: await getProfileLibraryAccess(config) });
return;
}
// Sections the administrator switched off for this profile are closed on the
// server too, not only hidden from the menu.
const section = session?.role === 'user' && session.userId ? getSectionOfRoute(url.pathname) : null;
if (section) {
const config = await readConfig(session!.encryptionKey);
if ((config.preferences.hiddenSections[session!.userId!] ?? []).includes(section)) {
sendJson(response, 403, { error: 'This section is not available for your profile.' });
return;
}
}
if (url.pathname === '/api/admin/backup' && method === 'GET') {
const backup: BackupFile = {
app: 'omniarr',
format: 1,
exportedAt: new Date().toISOString(),
config: await readConfig(),
wishlists: await readAllWishlists()
};
const fileName = `omniarr-backup-${backup.exportedAt.slice(0, 10)}.json`;
response.writeHead(200, {
'Content-Type': 'application/json; charset=utf-8',
'Content-Disposition': `attachment; filename="${fileName}"`,
'Cache-Control': 'no-store'
});
response.end(JSON.stringify(backup, null, 2));
return;
}
if (url.pathname === '/api/admin/backup' && method === 'POST') {
let body: Partial<BackupFile>;
let config: AppConfig;
try {
body = await readJson<Partial<BackupFile>>(request);
if (body.app !== 'omniarr' || body.format !== 1 || !body.config || typeof body.config !== 'object') {
throw new Error('invalid');
}
config = mergeStoredConfig(body.config);
} catch {
sendJson(response, 400, { error: 'This file is not an OmniArr backup.' });
return;
}
config = { ...config, jellyfin: { ...config.jellyfin, userId: '' } };
await restoreBackup(
encryptJson(config, await getConfigEncryptionKey()),
sanitizeWishlists(body.wishlists)
);
sendJson(response, 200, { config, connections: await getConnectionStatuses(config) });
return;
}
if (url.pathname === '/api/wishlist' && method === 'GET') {
sendJson(response, 200, { items: await readWishlist(getWishlistOwner(session!)) });
return;
}
if (url.pathname === '/api/wishlist' && method === 'POST') {
const body = await readJson<WishlistTogglePayload>(request);
const card = sanitizeWishlistCard(body.card);
if (!card) {
sendJson(response, 400, { error: 'A title is required.' });
return;
}
const key = getWishlistKey(card);
const items = await updateWishlist(getWishlistOwner(session!), (entries) => {
const remaining = entries.filter((entry) => getWishlistKey(entry.card) !== key);
return body.wishlisted ? [{ card, addedAt: new Date().toISOString() }, ...remaining] : remaining;
});
sendJson(response, 200, { items });
return;
}
if (url.pathname === '/api/settings' && method === 'GET') {
const config = await readConfig(session!.encryptionKey);
sendJson(response, 200, session!.role === 'admin' ? config : redactConfig(config));
@@ -255,7 +363,8 @@ async function routeRequest(request: IncomingMessage, response: ServerResponse):
if (url.pathname === '/api/settings' && method === 'PUT') {
const body = await readJson<AppConfig>(request);
const config = sanitizeConfig(body);
const sanitized = sanitizeConfig(body);
const config = { ...sanitized, jellyfin: { ...sanitized.jellyfin, userId: '' } };
await updateEncryptedConfig(encryptJson(config, await getConfigEncryptionKey()));
const connections = await getConnectionStatuses(config);
sendJson(response, 200, {
@@ -420,6 +529,14 @@ async function routeRequest(request: IncomingMessage, response: ServerResponse):
return;
}
if (url.pathname === '/api/requests/series-episode' && method === 'POST') {
const config = await readConfig(session!.encryptionKey);
const body = await readJson<SeriesEpisodeRequestPayload & { user: string | null }>(request);
await requestSeriesEpisode(config, body, body.user);
sendJson(response, 200, { ok: true });
return;
}
if (url.pathname === '/api/seasons/delete' && method === 'POST') {
const config = await readConfig(session!.encryptionKey);
const body = await readJson<SeasonDeletePayload>(request);
@@ -445,7 +562,7 @@ async function routeRequest(request: IncomingMessage, response: ServerResponse):
const image = await proxyJellyfinImage(config, itemId, kind, maxWidth, tag);
if (!image) {
response.writeHead(302, {
Location: '/reiverr/placeholder.jpg',
Location: '/placeholder.jpg',
'Cache-Control': 'private, max-age=300'
});
response.end();
@@ -534,8 +651,20 @@ function getSessionToken(request: IncomingMessage): string | null {
return null;
}
// Mark the cookie Secure only when the browser reached us over HTTPS, so plain
// HTTP access on a LAN still works.
function isSecureRequest(request: IncomingMessage): boolean {
if ('encrypted' in request.socket && request.socket.encrypted) {
return true;
}
const forwardedProto = request.headers['x-forwarded-proto'];
const proto = (Array.isArray(forwardedProto) ? forwardedProto[0] : forwardedProto)?.split(',')[0].trim().toLowerCase();
return proto === 'https';
}
function setSessionCookie(request: IncomingMessage, response: ServerResponse, token: string): void {
const isSecure = request.headers['x-forwarded-proto'] === 'https' || process.env.NODE_ENV === 'production';
const isSecure = isSecureRequest(request);
response.setHeader(
'Set-Cookie',
`${SESSION_COOKIE}=${token}; HttpOnly; Path=/; SameSite=Strict; Max-Age=${Math.floor(SESSION_TTL_MS / 1000)}${isSecure ? '; Secure' : ''}`
@@ -543,7 +672,7 @@ function setSessionCookie(request: IncomingMessage, response: ServerResponse, to
}
function clearSessionCookie(request: IncomingMessage, response: ServerResponse): void {
const isSecure = request.headers['x-forwarded-proto'] === 'https' || process.env.NODE_ENV === 'production';
const isSecure = isSecureRequest(request);
response.setHeader(
'Set-Cookie',
`${SESSION_COOKIE}=; HttpOnly; Path=/; SameSite=Strict; Max-Age=0${isSecure ? '; Secure' : ''}`
@@ -562,9 +691,17 @@ async function readConfig(legacyEncryptionKey?: Buffer): Promise<AppConfig> {
throw new Error('The configuration must be unlocked by an administrator.');
}
const stored = decryptJson<Partial<AppConfig>>(encrypted, encryptionKey);
const config = mergeStoredConfig(decryptJson<Partial<AppConfig>>(encrypted, encryptionKey));
// The Jellyfin user always comes from the profile the session signed in
// with; admin sessions have none, so a userId saved by older versions is ignored.
const userId = legacyEncryptionKey ? sessionUsers.get(legacyEncryptionKey) : undefined;
return { ...config, jellyfin: { ...config.jellyfin, userId: userId || '' } };
}
const config = sanitizeConfig({
// Fills in whatever a stored config (or an imported backup) leaves out with
// the defaults, so configs saved by older versions keep loading.
function mergeStoredConfig(stored: Partial<AppConfig>): AppConfig {
return sanitizeConfig({
preferences: {
...defaultConfig.preferences,
...(stored.preferences || {})
@@ -590,8 +727,76 @@ async function readConfig(legacyEncryptionKey?: Buffer): Promise<AppConfig> {
...(stored.tvdb || {})
}
});
const userId = legacyEncryptionKey ? sessionUsers.get(legacyEncryptionKey) : undefined;
return userId ? { ...config, jellyfin: { ...config.jellyfin, userId } } : config;
}
// Profiles keep their own wishlist; the administrator has no Jellyfin profile
// and shares a single one.
// The section of the app an API route serves, if the administrator can switch it off.
function getSectionOfRoute(pathname: string): HideableSection | null {
const section = pathname.startsWith('/api/downloads') ? 'downloads'
: pathname.startsWith('/api/calendar') ? 'calendar'
: pathname.startsWith('/api/search') ? 'search'
: pathname.startsWith('/api/hubs/') ? decodeURIComponent(pathname.replace('/api/hubs/', ''))
: '';
return HIDEABLE_SECTIONS.find((candidate) => candidate.id === section)?.id ?? null;
}
function getWishlistOwner(session: SessionRecord): string {
return session.role === 'user' && session.userId ? session.userId : 'admin';
}
// The same title can reach the client as a Jellyfin card or a TMDb card, so
// titles are matched by their TMDb id when they have one.
function getWishlistKey(card: MediaCard): string {
return card.tmdbId ? `${card.mediaType === 'movie' ? 'movie' : 'tv'}:${card.tmdbId}` : card.id;
}
const WISHLIST_MEDIA_TYPES = new Set<MediaCard['mediaType']>(['movie', 'tv', 'series']);
// Only what the wishlist page needs to draw a tile and open the title is kept;
// progress and labels belong to the moment the card was saved.
function sanitizeWishlistCard(input: unknown): MediaCard | null {
if (!input || typeof input !== 'object') {
return null;
}
const card = input as Partial<MediaCard>;
const text = (value: unknown) => (typeof value === 'string' ? value : '');
const id = text(card.id);
if (!id || !card.mediaType || !WISHLIST_MEDIA_TYPES.has(card.mediaType)) {
return null;
}
return {
id,
tmdbId: Number(card.tmdbId) || undefined,
providerId: text(card.providerId) || undefined,
title: text(card.title),
subtitle: text(card.subtitle),
overview: text(card.overview),
mediaType: card.mediaType,
posterUrl: text(card.posterUrl),
backdropUrl: text(card.backdropUrl),
logoUrl: text(card.logoUrl) || undefined,
backdropLanguageFallback: card.backdropLanguageFallback ? true : undefined,
releaseDate: text(card.releaseDate) || undefined,
firstAirDate: text(card.firstAirDate) || undefined
};
}
function sanitizeWishlists(input: unknown): Record<string, WishlistEntry[]> {
const wishlists: Record<string, WishlistEntry[]> = {};
if (!input || typeof input !== 'object') {
return wishlists;
}
for (const [owner, entries] of Object.entries(input)) {
if (!Array.isArray(entries)) {
continue;
}
wishlists[owner] = entries.flatMap((entry: Partial<WishlistEntry>) => {
const card = sanitizeWishlistCard(entry?.card);
return card ? [{ card, addedAt: typeof entry.addedAt === 'string' ? entry.addedAt : new Date().toISOString() }] : [];
});
}
return wishlists;
}
async function getConfigEncryptionKey(): Promise<Buffer> {
@@ -642,14 +847,17 @@ async function serveApp(pathname: string, response: ServerResponse): Promise<voi
try {
const content = await readFile(filePath);
response.writeHead(200, {
'Content-Type': contentType(filePath)
'Content-Type': contentType(filePath),
// Hashed bundles never change; the entry page must always be revalidated so a new release reaches every browser.
'Cache-Control': relativePath.startsWith('/assets/') ? 'public, max-age=31536000, immutable' : 'no-cache'
});
response.end(content);
} catch {
try {
const indexHtml = await readFile(resolve(process.cwd(), 'dist', 'index.html'));
response.writeHead(200, {
'Content-Type': 'text/html; charset=utf-8'
'Content-Type': 'text/html; charset=utf-8',
'Cache-Control': 'no-cache'
});
response.end(indexHtml);
} catch {
@@ -683,8 +891,54 @@ function contentType(filePath: string): string {
return 'application/octet-stream';
}
const PRIVATE_NETWORKS = new BlockList();
PRIVATE_NETWORKS.addSubnet('127.0.0.0', 8, 'ipv4');
PRIVATE_NETWORKS.addSubnet('10.0.0.0', 8, 'ipv4');
PRIVATE_NETWORKS.addSubnet('172.16.0.0', 12, 'ipv4');
PRIVATE_NETWORKS.addSubnet('192.168.0.0', 16, 'ipv4');
PRIVATE_NETWORKS.addSubnet('169.254.0.0', 16, 'ipv4');
PRIVATE_NETWORKS.addAddress('::1', 'ipv6');
PRIVATE_NETWORKS.addSubnet('fc00::', 7, 'ipv6');
PRIVATE_NETWORKS.addSubnet('fe80::', 10, 'ipv6');
function normalizeAddress(address: string): string {
const trimmed = address.trim();
return trimmed.toLowerCase().startsWith('::ffff:') && isIP(trimmed.slice(7)) === 4 ? trimmed.slice(7) : trimmed;
}
function isPrivateAddress(address: string): boolean {
const version = isIP(address);
return version !== 0 && PRIVATE_NETWORKS.check(address, version === 4 ? 'ipv4' : 'ipv6');
}
// Behind a reverse proxy every request comes from the proxy's address, so the
// forwarded client IP is used instead. It is only trusted when the connection
// itself comes from a private network, where the proxy lives; requests from
// the internet cannot spoof it.
function getClientAddress(request: IncomingMessage): string {
return request.socket.remoteAddress || 'unknown';
const socketAddress = normalizeAddress(request.socket.remoteAddress || '');
if (!isPrivateAddress(socketAddress)) {
return socketAddress || 'unknown';
}
const forwardedFor = request.headers['x-forwarded-for'];
const realIp = request.headers['x-real-ip'];
const chain = (Array.isArray(forwardedFor) ? forwardedFor.join(',') : forwardedFor || (Array.isArray(realIp) ? realIp[0] : realIp) || '')
.split(',')
.map(normalizeAddress)
.filter((address) => isIP(address) !== 0);
if (chain.length === 0) {
return socketAddress;
}
// Each proxy appends the address it saw, so walk from the right and take the
// first public address; anything left of it could be forged by the client.
for (let index = chain.length - 1; index >= 0; index -= 1) {
if (!isPrivateAddress(chain[index])) {
return chain[index];
}
}
return chain[0];
}
function trackFailedAttempt(address: string): void {
+464 -200
View File
@@ -11,12 +11,15 @@ import type {
EpisodeRequestPayload,
EpisodeWatchStateRequest,
HubPageResponse,
HideableSection,
HubSection,
MediaCard,
MovieDeletePayload,
ProcessingItem,
ProfileLibraryAccess,
SeasonDeletePayload,
SeasonRequestPayload,
SeriesEpisodeRequestPayload,
SelectOption,
ServiceOptionsResponse,
TitleDetailsEpisode,
@@ -25,6 +28,7 @@ import type {
TitleDetailsSeason,
TitleDetailsCastMember
} from '../../shared/contracts.js';
import { HIDEABLE_SECTIONS } from '../../shared/contracts.js';
const TMDB_IMAGE = 'https://image.tmdb.org/t/p';
const TMDB_ARTWORK_TTL_MS = 6 * 60 * 60 * 1000;
@@ -151,6 +155,7 @@ interface JellyfinItem {
interface SonarrQueueRecord {
id?: number;
seriesId?: number;
episodeId?: number;
title?: string;
downloadId?: string;
series?: { title?: string; tmdbId?: number; images?: Array<{ coverType?: string; remoteUrl?: string; url?: string }> };
@@ -188,6 +193,7 @@ interface SonarrCalendarRecord {
series?: {
title?: string;
tmdbId?: number;
path?: string;
images?: Array<{ coverType?: string; remoteUrl?: string; url?: string }>;
year?: number;
status?: string;
@@ -238,6 +244,7 @@ interface RadarrCalendarRecord {
digitalRelease?: string;
monitored?: boolean;
hasFile?: boolean;
path?: string;
images?: Array<{ coverType?: string; remoteUrl?: string; url?: string }>;
}
@@ -369,6 +376,24 @@ let tvdbTokenCache: { token: string; expiresAt: number } | null = null;
const tmdbArtworkCache = new Map<string, { expiresAt: number; value: Promise<TmdbArtwork> }>();
const tvdbTranslationCache = new Map<string, { expiresAt: number; value: Promise<TvdbTranslationRecord | null> }>();
const HIDEABLE_SECTION_IDS = new Set<string>(HIDEABLE_SECTIONS.map((section) => section.id));
function sanitizeHiddenSections(input: unknown): Record<string, HideableSection[]> {
const hidden: Record<string, HideableSection[]> = {};
if (!input || typeof input !== 'object') {
return hidden;
}
for (const [userId, sections] of Object.entries(input)) {
const valid = Array.isArray(sections)
? [...new Set(sections.map(String))].filter((section): section is HideableSection => HIDEABLE_SECTION_IDS.has(section))
: [];
if (userId && valid.length) {
hidden[userId] = valid;
}
}
return hidden;
}
export function sanitizeConfig(input: AppConfig): AppConfig {
return {
preferences: {
@@ -381,7 +406,8 @@ export function sanitizeConfig(input: AppConfig): AppConfig {
: [],
radarrDownloadQualityProfileIds: Array.isArray(input.preferences.radarrDownloadQualityProfileIds)
? input.preferences.radarrDownloadQualityProfileIds.map(String)
: []
: [],
hiddenSections: sanitizeHiddenSections(input.preferences.hiddenSections)
},
jellyfin: {
baseUrl: normalizeBaseUrl(input.jellyfin.baseUrl),
@@ -435,12 +461,14 @@ export async function getServiceOptions(config: AppConfig): Promise<ServiceOptio
radarrRootFolders,
radarrQualityProfiles
] = await Promise.all([
getJellyfinUsers(config),
getSonarrRootFolders(config),
getSonarrQualityProfiles(config),
getSonarrLanguageProfiles(config),
getRadarrRootFolders(config),
getRadarrQualityProfiles(config)
// A service that is down only empties its own options; the connection
// status reports the failure.
getJellyfinUsers(config).catch(() => []),
getSonarrRootFolders(config).catch(() => []),
getSonarrQualityProfiles(config).catch(() => []),
getSonarrLanguageProfiles(config).catch(() => []),
getRadarrRootFolders(config).catch(() => []),
getRadarrQualityProfiles(config).catch(() => [])
]);
return {
@@ -558,7 +586,9 @@ export async function authenticateJellyfinUser(config: AppConfig, userId: string
export async function getDashboard(config: AppConfig): Promise<DashboardResponse> {
const [connections, library, downloads, tmdb] = await Promise.all([
getConnectionStatuses(config),
getLibrarySnapshot(config),
// If Jellyfin is down the client shows its unavailable screen from the
// connection status, so don't fail the whole dashboard here.
getLibrarySnapshot(config).catch(() => ({ continueWatching: [], recentlyAdded: [], allItems: [] })),
getDownloads(config),
getTmdbSnapshot(config)
]);
@@ -739,15 +769,36 @@ export async function getCalendar(config: AppConfig, start: Date, end: Date): Pr
getRadarrCalendar(config, start, end)
])
// Link each entry to its Jellyfin item, as search does, so the details can
// tell which episodes are already in the library.
const library = await getLibrarySnapshot(config).catch(() => null);
// A profile does not see releases that will be stored in a library it cannot open.
const hiddenFolders = await getHiddenLibraryFolders(config);
const sonarrItems = sonarrResult.status === 'fulfilled'
? sonarrResult.value.map((item) => mapSonarrCalendarEntry(item))
? sonarrResult.value
.filter((item) => !isInFolders(item.series?.path, hiddenFolders))
.map((item) => mapSonarrCalendarEntry(item))
: []
const radarrItems = radarrResult.status === 'fulfilled'
? radarrResult.value.map((item) => mapRadarrCalendarEntry(item))
? radarrResult.value
.filter((item) => !isInFolders(item.path, hiddenFolders))
.map((item) => mapRadarrCalendarEntry(item))
: []
const libraryProviderIds = new Map<string, string>();
for (const libraryItem of library?.allItems ?? []) {
const libraryCard = jellyfinToCard(libraryItem, libraryItem.Name || 'Library');
if (libraryCard?.tmdbId && libraryCard.providerId && (libraryCard.mediaType === 'movie' || libraryCard.mediaType === 'series')) {
libraryProviderIds.set(`${libraryCard.mediaType}:${libraryCard.tmdbId}`, libraryCard.providerId);
}
}
const allItems = [...sonarrItems, ...radarrItems]
.filter((item): item is CalendarEntry => Boolean(item));
.filter((item): item is CalendarEntry => Boolean(item))
.map((item) => {
const providerId = item.card.tmdbId ? libraryProviderIds.get(`${item.card.mediaType}:${item.card.tmdbId}`) : undefined;
return providerId ? { ...item, card: { ...item.card, providerId } } : item;
});
const backdropCache = new Map<string, Promise<TmdbBackdropChoice>>();
const cards = await applyHighResBackdropsToCards(config, allItems.map(i => i.card), shouldUseHighResBackdropForCard, backdropCache, 'en');
@@ -770,6 +821,88 @@ export async function getCalendar(config: AppConfig, start: Date, end: Date): Pr
}
}
function normalizeLibraryId(id: string | undefined): string {
return String(id || '').replace(/-/g, '').toLowerCase();
}
function getFolderNames(locations: string[] | undefined): string[] {
return (locations ?? [])
.map((location) => location.replace(/\\/g, '/').split('/').filter(Boolean).pop()?.toLowerCase() ?? '')
.filter(Boolean);
}
// Sonarr and Radarr rarely see a folder under the same path as Jellyfin (they
// mount it differently), so a release is matched to a library by the folder
// name: a series stored in /shared/Library/Shows/X belongs to the library whose
// folder is called "Shows".
export function isInFolders(path: string | undefined, folderNames: string[] | null): boolean {
if (!path || !folderNames?.length) {
return false;
}
// The last segment is the title's own folder, not a library.
const parents = path.replace(/\\/g, '/').split('/').filter(Boolean).slice(0, -1).map((segment) => segment.toLowerCase());
return parents.some((segment) => folderNames.includes(segment));
}
// The folder names of the libraries the signed-in profile cannot open, read
// from Jellyfin (its libraries, and the ones in the profile's views). Admin
// sessions have no profile and see everything.
async function getHiddenLibraryFolders(config: AppConfig): Promise<string[] | null> {
if (!config.jellyfin.userId || !config.jellyfin.baseUrl || !config.jellyfin.apiKey) {
return null;
}
try {
const [folders, views] = await Promise.all([
jellyfinFetch<Array<{ ItemId?: string; Locations?: string[] }>>(config, '/Library/VirtualFolders'),
jellyfinFetch<JellyfinItem[]>(config, `/UserViews?userId=${encodeURIComponent(config.jellyfin.userId)}`)
]);
const visibleLibraryIds = new Set(views.map((view) => normalizeLibraryId(view.Id)));
const visibleNames = new Set(folders.filter((folder) => visibleLibraryIds.has(normalizeLibraryId(folder.ItemId))).flatMap((folder) => getFolderNames(folder.Locations)));
// A name shared with a library the profile can open stays visible.
const hidden = folders
.filter((folder) => folder.ItemId && !visibleLibraryIds.has(normalizeLibraryId(folder.ItemId)))
.flatMap((folder) => getFolderNames(folder.Locations))
.filter((name) => !visibleNames.has(name));
return hidden.length ? [...new Set(hidden)] : null;
} catch (error) {
// Better to show the calendar than to break it when Jellyfin cannot be asked.
console.warn('Could not read the profile libraries; the calendar is not filtered.', error);
return null;
}
}
// What Jellyfin lets each profile open, for the administrator to review; the
// permissions themselves are managed in Jellyfin.
export async function getProfileLibraryAccess(config: AppConfig): Promise<ProfileLibraryAccess[]> {
if (!config.jellyfin.baseUrl || !config.jellyfin.apiKey) {
return [];
}
const [users, folders] = await Promise.all([
jellyfinFetch<Array<{ Id?: string; Name?: string; Policy?: { EnableAllFolders?: boolean; EnabledFolders?: string[] } }>>(config, '/Users'),
jellyfinFetch<Array<{ Name?: string; ItemId?: string }>>(config, '/Library/VirtualFolders')
]);
const libraries = folders.filter((folder) => folder.ItemId && folder.Name);
return users
.filter((user) => user.Id)
.map((user) => {
const allLibraries = user.Policy?.EnableAllFolders !== false;
const enabled = new Set((user.Policy?.EnabledFolders ?? []).map(normalizeLibraryId));
return {
userId: String(user.Id),
label: user.Name || 'User',
allLibraries,
libraries: libraries.map((folder) => ({
id: String(folder.ItemId),
name: String(folder.Name),
access: allLibraries || enabled.has(normalizeLibraryId(folder.ItemId))
}))
};
});
}
export async function searchTitles(
config: AppConfig,
rawQuery: string
@@ -858,7 +991,8 @@ export async function removeDownload(config: AppConfig, id: string): Promise<voi
const queueItem = queue.find((item) => String(item.id) === rawId);
const response = await fetch(
`${baseUrl}/api/v3/queue/${encodeURIComponent(rawId)}?removeFromClient=true&blocklist=false&skipRedownload=false`,
// skipRedownload: cancelling must not make Sonarr/Radarr grab another release.
`${baseUrl}/api/v3/queue/${encodeURIComponent(rawId)}?removeFromClient=true&blocklist=false&skipRedownload=true`,
{
method: 'DELETE',
headers: {
@@ -885,6 +1019,16 @@ export async function removeDownload(config: AppConfig, id: string): Promise<voi
}
if (source === 'sonarr' && queueItem) {
// A season pack shows up as one queue record per episode sharing a
// download; removing one cancels them all, so unmonitor all of them.
const sonarrQueue = queue as SonarrQueueRecord[];
const downloadId = (queueItem as SonarrQueueRecord).downloadId;
const cancelledEpisodeIds = sonarrQueue
.filter((item) => item === queueItem || (downloadId && item.downloadId === downloadId))
.map((item) => item.episodeId)
.filter((episodeId): episodeId is number => typeof episodeId === 'number');
await setSonarrEpisodesMonitored(config, [...new Set(cancelledEpisodeIds)], false);
const seriesId = (queueItem as SonarrQueueRecord).seriesId;
const title = (queueItem as SonarrQueueRecord).series?.title || queueItem.title;
if (title) {
@@ -952,11 +1096,30 @@ async function removeSonarrSeriesIfEmpty(
}
}
async function withLibraryProviderId(config: AppConfig, card: MediaCard): Promise<MediaCard> {
if (!card.tmdbId || (card.mediaType !== 'movie' && card.mediaType !== 'series' && card.mediaType !== 'tv')) {
return card;
}
const library = await getLibrarySnapshot(config).catch(() => null);
const wantedType = card.mediaType === 'movie' ? 'movie' : 'series';
for (const libraryItem of library?.allItems ?? []) {
const libraryCard = jellyfinToCard(libraryItem, libraryItem.Name || 'Library');
if (libraryCard?.tmdbId === card.tmdbId && libraryCard.mediaType === wantedType) {
return { ...card, providerId: libraryCard.providerId };
}
}
return card;
}
export async function getTitleDetails(
config: AppConfig,
request: TitleDetailsRequest
): Promise<TitleDetailsResponse> {
const { card, seasonId } = request;
const { seasonId } = request;
// Cards that don't come from Jellyfin (downloads, upcoming) are linked to
// their library item by TMDb id.
const card = request.card.providerId ? request.card : await withLibraryProviderId(config, request.card);
const item = card.providerId ? await getJellyfinItemDetails(config, card.providerId) : null;
const seriesItem = await resolveSeriesItem(config, card, item);
const primaryItem = seriesItem || item;
@@ -1831,6 +1994,76 @@ async function getSonarrSeriesRecord(
return response.find((series) => series.id && (!tmdbId || !series.tmdbId || series.tmdbId === tmdbId)) || response[0] || null;
}
// Download and delete are one-click actions, so OmniArr owns the monitoring:
// whatever the user downloads is monitored (so Sonarr/Radarr keep looking if
// nothing is available yet), and whatever they delete or cancel is not (so it
// isn't downloaded again).
async function setSonarrEpisodesMonitored(config: AppConfig, episodeIds: number[], monitored: boolean): Promise<void> {
if (!episodeIds.length) {
return;
}
await fetchJson(`${config.sonarr.baseUrl}/api/v3/episode/monitor`, {
method: 'PUT',
headers: {
'X-Api-Key': config.sonarr.apiKey,
'Content-Type': 'application/json'
},
body: JSON.stringify({ episodeIds, monitored })
});
}
// Sonarr cascades a season's monitored flag to its episodes when the series is
// saved with that flag changed.
async function setSonarrSeasonMonitored(
config: AppConfig,
series: SonarrSeriesRecord,
seasonNumber: number,
monitored: boolean
): Promise<void> {
const seasons = (series.seasons || []).map((season) =>
season.seasonNumber === seasonNumber ? { ...season, monitored } : season
);
await fetchJson(`${config.sonarr.baseUrl}/api/v3/series/${encodeURIComponent(String(series.id))}`, {
method: 'PUT',
headers: {
'X-Api-Key': config.sonarr.apiKey,
'Content-Type': 'application/json'
},
body: JSON.stringify({ ...series, monitored: monitored || series.monitored, seasons })
});
}
async function ensureSonarrSeriesMonitored(config: AppConfig, seriesId: number): Promise<void> {
const series = await getSonarrSeriesById(config, seriesId);
if (!series?.id || series.monitored) {
return;
}
// Seasons are sent unchanged, so no episode monitoring changes with it.
await fetchJson(`${config.sonarr.baseUrl}/api/v3/series/${encodeURIComponent(String(series.id))}`, {
method: 'PUT',
headers: {
'X-Api-Key': config.sonarr.apiKey,
'Content-Type': 'application/json'
},
body: JSON.stringify({ ...series, monitored: true })
});
}
async function setRadarrMovieMonitored(config: AppConfig, movieId: number, monitored: boolean): Promise<void> {
await fetchJson(`${config.radarr.baseUrl}/api/v3/movie/editor`, {
method: 'PUT',
headers: {
'X-Api-Key': config.radarr.apiKey,
'Content-Type': 'application/json'
},
body: JSON.stringify({ movieIds: [movieId], monitored })
});
}
async function getSonarrSeriesById(config: AppConfig, seriesId: number): Promise<SonarrSeriesRecord | null> {
if (!config.sonarr.baseUrl || !config.sonarr.apiKey || !seriesId) {
return null;
@@ -2322,7 +2555,11 @@ async function buildSeasonEpisodes(
availability,
downloadStatus,
downloadProgress: isDownloading ? getEpisodeQueueProgress(queueEntry) : undefined,
canDownload: isManagedInSonarr && availability === 'missing',
// A series that is not in Sonarr yet is added by the request itself,
// unless Jellyfin already has the episode.
canDownload: Boolean(config.sonarr.baseUrl && config.sonarr.apiKey)
&& (isManagedInSonarr || (Boolean(tmdbId) && !jellyfinKnowsAboutIt))
&& availability === 'missing',
canDelete: hasFile,
watched: jellyfinEpisode?.watched,
progress: jellyfinEpisode?.progress,
@@ -2600,8 +2837,10 @@ export async function requestMovie(config: AppConfig, tmdbId: number, user: stri
tmdbId: details.id,
year: Number(String(details.release_date || '').slice(0, 4)) || 0,
minimumAvailability: 'released',
// Radarr only reads the top-level flag; addOptions has no `monitored`.
monitored: true,
addOptions: {
monitored: config.radarr.monitor !== 'none',
monitor: config.radarr.monitor === 'movieAndCollection' ? 'movieAndCollection' : 'movieOnly',
searchForMovie: false
}
})
@@ -2629,6 +2868,12 @@ export async function requestMovie(config: AppConfig, tmdbId: number, user: stri
return;
}
// A movie that was already in Radarr may be unmonitored; without this Radarr
// would never grab it if the search below finds nothing yet.
if (!movie.monitored) {
await setRadarrMovieMonitored(config, movie.id, true);
}
// If movie is not downloaded, trigger a search.
await fetchJson(`${config.radarr.baseUrl}/api/v3/command`, {
method: 'POST',
@@ -2679,19 +2924,24 @@ export async function requestSeries(
}
const sonarrRequestConfig = await resolveSonarrRequestConfig(config);
addProcessingItem({
source: 'sonarr',
title: String(details.name || details.original_name || 'Series'),
subtitle: typeof seasonNumber === 'number' ? `Season ${seasonNumber}` : 'All seasons',
tmdbId,
posterUrl: typeof details.poster_path === 'string' && details.poster_path
? `${TMDB_IMAGE}/w342${details.poster_path}`
: undefined,
mediaType: 'series',
user: user || 'Unknown',
});
// Adding a series runs Sonarr's post-add monitoring after its first scan,
// which happens after this request returns. Monitoring a season ourselves
// afterwards would race with it, so tell Sonarr up front: send every season
// with only the requested one monitored and `skip`, which keeps those flags.
let seasons: SonarrSeriesRecord['seasons'];
if (typeof seasonNumber === 'number') {
const lookup = await fetchJson<SonarrSeriesRecord[]>(
`${config.sonarr.baseUrl}/api/v3/series/lookup?term=${encodeURIComponent(`tvdb:${tvdbId}`)}`,
{ headers: { 'X-Api-Key': config.sonarr.apiKey } }
);
const lookupSeasons = lookup[0]?.seasons || [];
if (!lookupSeasons.some((season) => season.seasonNumber === seasonNumber)) {
throw new Error(`Season ${seasonNumber} was not found in Sonarr.`);
}
seasons = lookupSeasons.map((season) => ({ seasonNumber: season.seasonNumber, monitored: season.seasonNumber === seasonNumber }));
}
const series = await fetchJson<SonarrSeriesRecord>(`${config.sonarr.baseUrl}/api/v3/series`, {
await fetchJson<SonarrSeriesRecord>(`${config.sonarr.baseUrl}/api/v3/series`, {
method: 'POST',
headers: {
'X-Api-Key': config.sonarr.apiKey,
@@ -2704,55 +2954,32 @@ export async function requestSeries(
languageProfileId: sonarrRequestConfig.languageProfileId,
rootFolderPath: sonarrRequestConfig.rootFolderPath,
seasonFolder: true,
monitored: config.sonarr.monitor !== 'none',
addOptions: {
monitor: typeof seasonNumber === 'number' ? 'none' : config.sonarr.monitor,
searchForMissingEpisodes: typeof seasonNumber !== 'number',
searchForCutoffUnmetEpisodes: typeof seasonNumber !== 'number'
}
...(seasons
? {
monitored: true,
seasons,
// Sonarr searches the monitored (requested) season itself once the
// series is added and its episodes exist.
addOptions: { monitor: 'skip', searchForMissingEpisodes: true, searchForCutoffUnmetEpisodes: false }
}
: {
monitored: config.sonarr.monitor !== 'none',
addOptions: { monitor: config.sonarr.monitor, searchForMissingEpisodes: true, searchForCutoffUnmetEpisodes: true }
})
})
});
if (typeof seasonNumber !== 'number') {
return
}
if (!series?.id) {
throw new Error('Sonarr did not return the added series.')
}
const seasons = (series.seasons || []).map((season) =>
season.seasonNumber === seasonNumber
? { ...season, monitored: true }
: { ...season, monitored: false }
)
if (!seasons.some((season) => season.seasonNumber === seasonNumber)) {
throw new Error(`Season ${seasonNumber} was not found in Sonarr.`)
}
await fetchJson(`${config.sonarr.baseUrl}/api/v3/series/${encodeURIComponent(String(series.id))}`, {
method: 'PUT',
headers: {
'X-Api-Key': config.sonarr.apiKey,
'Content-Type': 'application/json'
},
body: JSON.stringify({ ...series, monitored: true, seasons })
})
await fetchJson(`${config.sonarr.baseUrl}/api/v3/command`, {
method: 'POST',
headers: {
'X-Api-Key': config.sonarr.apiKey,
'Content-Type': 'application/json'
},
body: JSON.stringify({
name: 'SeasonSearch',
seriesId: series.id,
seasonNumber,
qualityProfileId
})
})
addProcessingItem({
source: 'sonarr',
title: String(details.name || details.original_name || 'Series'),
subtitle: typeof seasonNumber === 'number' ? `Season ${seasonNumber}` : 'All seasons',
tmdbId,
posterUrl: typeof details.poster_path === 'string' && details.poster_path
? `${TMDB_IMAGE}/w342${details.poster_path}`
: undefined,
mediaType: 'series',
user: user || 'Unknown',
});
}
export async function requestSeason(config: AppConfig, payload: SeasonRequestPayload, user: string | null): Promise<void> {
@@ -2826,6 +3053,18 @@ export async function requestEpisode(config: AppConfig, payload: EpisodeRequestP
throw new Error('Episode id is required.');
}
const episode = await fetchJson<{ seriesId?: number; title?: string; seasonNumber?: number; episodeNumber?: number; series?: { title?: string; tmdbId?: number } }>(
`${config.sonarr.baseUrl}/api/v3/episode/${encodeURIComponent(String(payload.episodeId))}`,
{ headers: { 'X-Api-Key': config.sonarr.apiKey } }
).catch(() => null);
// Monitor just this episode (and the series, which Sonarr also requires),
// not the rest of its season, so it is grabbed later if nothing is out yet.
await setSonarrEpisodesMonitored(config, [payload.episodeId], true);
if (episode?.seriesId) {
await ensureSonarrSeriesMonitored(config, episode.seriesId);
}
await fetchJson(`${config.sonarr.baseUrl}/api/v3/command`, {
method: 'POST',
headers: {
@@ -2839,31 +3078,77 @@ export async function requestEpisode(config: AppConfig, payload: EpisodeRequestP
})
});
// Try to get episode details for the processing item
try {
const episode = await fetchJson<{ title?: string; seasonNumber?: number; episodeNumber?: number; series?: { title?: string; tmdbId?: number } }>(
`${config.sonarr.baseUrl}/api/v3/episode/${encodeURIComponent(String(payload.episodeId))}`,
{ headers: { 'X-Api-Key': config.sonarr.apiKey } }
);
addProcessingItem({
source: 'sonarr',
title: episode?.series?.title || 'Series',
subtitle: episode?.seasonNumber != null && episode?.episodeNumber != null
? `S${String(episode.seasonNumber).padStart(2, '0')}E${String(episode.episodeNumber).padStart(2, '0')} \u00b7 ${episode.title || ''}`
: episode?.title || 'Episode',
tmdbId: episode?.series?.tmdbId,
mediaType: 'tv',
user: user || 'Unknown',
});
} catch {
addProcessingItem({
source: 'sonarr',
title: 'Episode',
subtitle: `Episode #${payload.episodeId}`,
mediaType: 'tv',
user: user || 'Unknown',
});
addProcessingItem({
source: 'sonarr',
title: episode?.series?.title || 'Series',
subtitle: episode?.seasonNumber != null && episode?.episodeNumber != null
? `S${String(episode.seasonNumber).padStart(2, '0')}E${String(episode.episodeNumber).padStart(2, '0')} \u00b7 ${episode.title || ''}`
: episode?.title || `Episode #${payload.episodeId}`,
tmdbId: episode?.series?.tmdbId,
mediaType: 'tv',
user: user || 'Unknown',
});
}
export async function requestSeriesEpisode(config: AppConfig, payload: SeriesEpisodeRequestPayload, user: string | null): Promise<void> {
if (!config.sonarr.baseUrl || !config.sonarr.apiKey) {
throw new Error('Sonarr is not configured.');
}
const headers = { 'X-Api-Key': config.sonarr.apiKey };
const details = await tmdbFetch(
config,
`/tv/${payload.tmdbId}?append_to_response=external_ids&language=${encodeURIComponent(config.preferences.language)}`
);
if (!details) {
throw new Error('Failed to load the series from TMDb.');
}
const tvdbId = Number(asRecord(details?.external_ids).tvdb_id || 0);
if (!tvdbId) {
throw new Error('This series does not have a TVDB ID for Sonarr.');
}
// Nothing is monitored on add, so Sonarr searches for nothing but the
// episode that is monitored and searched below.
const sonarrRequestConfig = await resolveSonarrRequestConfig(config);
const lookup = await fetchJson<SonarrSeriesRecord[]>(
`${config.sonarr.baseUrl}/api/v3/series/lookup?term=${encodeURIComponent(`tvdb:${tvdbId}`)}`,
{ headers }
);
const series = await fetchJson<SonarrSeriesRecord>(`${config.sonarr.baseUrl}/api/v3/series`, {
method: 'POST',
headers: { ...headers, 'Content-Type': 'application/json' },
body: JSON.stringify({
title: details.name || details.original_name || 'Series',
tvdbId,
qualityProfileId: payload.qualityProfileId || sonarrRequestConfig.qualityProfileId,
languageProfileId: sonarrRequestConfig.languageProfileId,
rootFolderPath: sonarrRequestConfig.rootFolderPath,
seasonFolder: true,
monitored: true,
seasons: (lookup[0]?.seasons || []).map((season) => ({ seasonNumber: season.seasonNumber, monitored: false })),
addOptions: { monitor: 'none', searchForMissingEpisodes: false, searchForCutoffUnmetEpisodes: false }
})
});
if (!series.id) {
throw new Error('Sonarr did not return the added series.');
}
// Sonarr lists the episodes only after its first scan of the new series.
for (let attempt = 0; attempt < 20; attempt += 1) {
const episodes = await fetchJson<Array<{ id?: number; seasonNumber?: number; episodeNumber?: number }>>(
`${config.sonarr.baseUrl}/api/v3/episode?seriesId=${series.id}`,
{ headers }
);
const episode = episodes.find((entry) => entry.seasonNumber === payload.seasonNumber && entry.episodeNumber === payload.episodeNumber);
if (episode?.id) {
await requestEpisode(config, { episodeId: episode.id, qualityProfileId: payload.qualityProfileId }, user);
return;
}
await new Promise((resolve) => setTimeout(resolve, 2000));
}
throw new Error('Sonarr added the series but has not listed its episodes yet. Try the episode again in a moment.');
}
export async function deleteSeasonFiles(config: AppConfig, payload: SeasonDeletePayload): Promise<void> {
@@ -2875,10 +3160,17 @@ export async function deleteSeasonFiles(config: AppConfig, payload: SeasonDelete
throw new Error('Series id and season number are required.');
}
const [episodes, files] = await Promise.all([
const [series, episodes, files] = await Promise.all([
getSonarrSeriesById(config, payload.seriesId),
getSonarrEpisodesBySeriesId(config, payload.seriesId),
getSonarrEpisodeFilesBySeriesId(config, payload.seriesId)
]);
// Unmonitor before deleting, or Sonarr sees the episodes as missing and
// downloads them again.
if (series?.id) {
await setSonarrSeasonMonitored(config, series, payload.seasonNumber, false);
}
const fileIds = new Set(
episodes
.filter((episode) => episode.seasonNumber === payload.seasonNumber && episode.episodeFileId)
@@ -3757,131 +4049,87 @@ async function getRadarrCalendar(config: AppConfig, start: Date, end: Date): Pro
)
}
async function testJellyfin(config: AppConfig): Promise<ConnectionStatus> {
if (!config.jellyfin.baseUrl || !config.jellyfin.apiKey) {
return {
key: 'jellyfin',
label: 'Jellyfin',
ok: false,
message: 'Not configured'
};
async function testService(
key: ConnectionStatus['key'],
label: string,
optional: boolean,
required: Array<[name: string, value: string]>,
check: () => Promise<string | void>
): Promise<ConnectionStatus> {
const missing = required.filter(([, value]) => !value.trim()).map(([name]) => name);
if (missing.length === required.length) {
return { key, label, ok: false, message: 'Not configured', configured: false, optional };
}
if (missing.length) {
return { key, label, ok: false, message: `Incomplete: missing ${missing.join(' and ')}`, configured: false, optional, incomplete: true };
}
try {
const note = await check();
return { key, label, ok: true, message: note || 'Connected', configured: true, optional };
} catch (error) {
const message = errorMessage(error);
// Node reports network errors as a bare "fetch failed".
return { key, label, ok: false, message: message === 'fetch failed' ? `Can't reach ${label}` : message, configured: true, optional };
}
}
function testJellyfin(config: AppConfig): Promise<ConnectionStatus> {
return testService('jellyfin', 'Jellyfin', false, [['URL', config.jellyfin.baseUrl], ['API key', config.jellyfin.apiKey]], async () => {
await fetchJson(`${config.jellyfin.baseUrl}/System/Info`, {
headers: {
Authorization: `MediaBrowser Token="${config.jellyfin.apiKey}"`
}
});
return { key: 'jellyfin', label: 'Jellyfin', ok: true, message: 'Connected' };
} catch (error) {
return {
key: 'jellyfin',
label: 'Jellyfin',
ok: false,
message: errorMessage(error)
};
}
});
}
async function testSonarr(config: AppConfig): Promise<ConnectionStatus> {
if (!config.sonarr.baseUrl || !config.sonarr.apiKey) {
return {
key: 'sonarr',
label: 'Sonarr',
ok: false,
message: 'Not configured'
};
}
try {
function testSonarr(config: AppConfig): Promise<ConnectionStatus> {
return testService('sonarr', 'Sonarr', true, [['URL', config.sonarr.baseUrl], ['API key', config.sonarr.apiKey]], async () => {
await fetchJson(`${config.sonarr.baseUrl}/api/v3/health`, {
headers: {
'X-Api-Key': config.sonarr.apiKey
}
});
return { key: 'sonarr', label: 'Sonarr', ok: true, message: 'Connected' };
} catch (error) {
return {
key: 'sonarr',
label: 'Sonarr',
ok: false,
message: errorMessage(error)
};
}
return warnIfKeyNotChecked('Sonarr', `${config.sonarr.baseUrl}/api/v3/health`);
});
}
async function testRadarr(config: AppConfig): Promise<ConnectionStatus> {
if (!config.radarr.baseUrl || !config.radarr.apiKey) {
return {
key: 'radarr',
label: 'Radarr',
ok: false,
message: 'Not configured'
};
}
try {
function testRadarr(config: AppConfig): Promise<ConnectionStatus> {
return testService('radarr', 'Radarr', true, [['URL', config.radarr.baseUrl], ['API key', config.radarr.apiKey]], async () => {
await fetchJson(`${config.radarr.baseUrl}/api/v3/health`, {
headers: {
'X-Api-Key': config.radarr.apiKey
}
});
return { key: 'radarr', label: 'Radarr', ok: true, message: 'Connected' };
} catch (error) {
return {
key: 'radarr',
label: 'Radarr',
ok: false,
message: errorMessage(error)
};
return warnIfKeyNotChecked('Radarr', `${config.radarr.baseUrl}/api/v3/health`);
});
}
// Sonarr and Radarr can skip authentication for local addresses, and then any
// key passes. Retry with a made-up key so a typo doesn't look like a success.
async function warnIfKeyNotChecked(label: string, url: string): Promise<string | undefined> {
try {
await fetchJson(url, { headers: { 'X-Api-Key': 'aliceflix-invalid-key' } });
return `Reachable, but ${label} accepts any API key from here, so the key can't be verified`;
} catch {
return undefined;
}
}
async function testTmdb(config: AppConfig): Promise<ConnectionStatus> {
if (!getTmdbToken(config)) {
return {
key: 'tmdb',
label: 'TMDb',
ok: false,
message: 'Missing token'
};
}
try {
await tmdbFetch(config, '/configuration');
return { key: 'tmdb', label: 'TMDb', ok: true, message: 'Connected' };
} catch (error) {
return {
key: 'tmdb',
label: 'TMDb',
ok: false,
message: errorMessage(error)
};
}
function testTmdb(config: AppConfig): Promise<ConnectionStatus> {
return testService('tmdb', 'TMDb', true, [['token', getTmdbToken(config)]], async () => {
// tmdbFetch swallows errors and returns null, so treat that as a failure.
if (!await tmdbFetch(config, '/configuration')) {
throw new Error('TMDb rejected the key or is unreachable');
}
});
}
async function testTvdb(config: AppConfig): Promise<ConnectionStatus> {
if (!getTvdbApiKey(config)) {
return {
key: 'tvdb',
label: 'TVDB',
ok: false,
message: 'Missing API key'
};
}
try {
function testTvdb(config: AppConfig): Promise<ConnectionStatus> {
return testService('tvdb', 'TVDB', true, [['API key', getTvdbApiKey(config)]], async () => {
await getTvdbToken(config);
return { key: 'tvdb', label: 'TVDB', ok: true, message: 'Connected' };
} catch (error) {
return {
key: 'tvdb',
label: 'TVDB',
ok: false,
message: errorMessage(error)
};
}
});
}
async function jellyfinFetch<T>(config: AppConfig, pathWithQuery: string): Promise<T> {
@@ -3908,11 +4156,17 @@ async function tmdbFetch(config: AppConfig, pathWithQuery: string): Promise<Reco
return null;
}
// TMDb hands out two credentials: the short v3 "API Key", which must go in
// the query string, and the long "API Read Access Token", sent as a bearer.
const isApiKey = /^[0-9a-f]{32}$/i.test(token);
const url = new URL(`https://api.themoviedb.org/3${pathWithQuery}`);
if (isApiKey) {
url.searchParams.set('api_key', token);
}
try {
return await fetchJson<Record<string, unknown>>(`https://api.themoviedb.org/3${pathWithQuery}`, {
headers: {
Authorization: `Bearer ${token}`
}
return await fetchJson<Record<string, unknown>>(url.toString(), {
headers: isApiKey ? {} : { Authorization: `Bearer ${token}` }
});
} catch (err) {
console.error(`TMDb fetch failed for ${pathWithQuery}:`, err);
@@ -3972,6 +4226,13 @@ async function fetchJson<T>(url: string, init?: RequestInit): Promise<T> {
}
}
// Proxies answer with a whole HTML page; it says nothing the status does not.
if (/^\s*<(!doctype|html)/i.test(detail)) detail = '';
if ([502, 503, 504].includes(response.status)) {
throw new Error(`${response.status} ${response.statusText}: the service did not answer. Check that it is running and that the URL points to it.`);
}
throw new Error(detail
? `${response.status} ${response.statusText}: ${detail}`
: `${response.status} ${response.statusText}`);
@@ -4004,7 +4265,10 @@ function jellyfinToCard(
const backdropItemId = item.ParentBackdropItemId || item.Id;
const backdropTag = item.ParentBackdropImageTags?.[0] || item.BackdropImageTags?.[0] || posterTag;
const progress = Math.round(item.UserData?.PlayedPercentage || 0);
const tmdbId = Number(item.ProviderIds?.Tmdb) || (item.SeriesId ? tmdbIdByItemId?.get(item.SeriesId) : undefined);
// An episode's own TMDb id is not its series' id, and artwork is looked up per series.
const tmdbId = item.Type === 'Episode'
? (item.SeriesId ? tmdbIdByItemId?.get(item.SeriesId) : undefined)
: Number(item.ProviderIds?.Tmdb) || (item.SeriesId ? tmdbIdByItemId?.get(item.SeriesId) : undefined);
const episodeCode = formatEpisodeCode(item.ParentIndexNumber, item.IndexNumber);
return {
+82 -21
View File
@@ -1,5 +1,7 @@
import { mkdir, readFile, writeFile } from 'node:fs/promises';
import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
import { dirname, resolve } from 'node:path';
import type { WishlistEntry } from '../../shared/contracts.js';
interface StoredAdmin {
passwordHash: string;
passwordSalt: string;
@@ -17,37 +19,75 @@ interface StoredState {
admin: StoredAdmin | null;
config: EncryptedConfig | null;
configKey: string | null;
/** Each profile's wishlist, keyed by its Jellyfin user id ('admin' for the administrator). */
wishlists: Record<string, WishlistEntry[]>;
}
const DATA_DIR = resolve(process.env.OMNIARR_DATA_DIR || resolve(process.cwd(), 'data'));
const STORE_FILE = resolve(DATA_DIR, 'omniarr.secure.json');
// The store used to be called aliceflix.secure.json; it is still read when the
// new file does not exist yet, so a rename never looks like a fresh install.
const LEGACY_STORE_FILE = resolve(DATA_DIR, 'aliceflix.secure.json');
const EMPTY_STATE: StoredState = {
version: 1,
admin: null,
config: null,
configKey: null
configKey: null,
wishlists: {}
};
export async function loadState(): Promise<StoredState> {
try {
const raw = await readFile(STORE_FILE, 'utf8');
const parsed = JSON.parse(raw) as Partial<StoredState>;
// Every write reads the file, changes it and writes it back, so writes are
// queued one after another; two profiles saving at once would otherwise drop
// one of the changes.
let writeQueue: Promise<unknown> = Promise.resolve();
return {
version: parsed.configKey ? 2 : 1,
admin: parsed.admin ?? null,
config: parsed.config ?? null,
configKey: typeof parsed.configKey === 'string' ? parsed.configKey : null
};
} catch {
return EMPTY_STATE;
async function readStoreFile(): Promise<string | null> {
for (const file of [STORE_FILE, LEGACY_STORE_FILE]) {
try {
return await readFile(file, 'utf8');
} catch (error) {
if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error;
}
}
return null;
}
// Only a store that does not exist counts as a fresh install. Any other read or
// parse failure is thrown: treating it as empty would reopen the master
// password setup and let the next visitor overwrite the real one.
export async function loadState(): Promise<StoredState> {
const raw = await readStoreFile();
if (raw === null) return EMPTY_STATE;
const parsed = JSON.parse(raw) as Partial<StoredState>;
return {
version: parsed.configKey ? 2 : 1,
admin: parsed.admin ?? null,
config: parsed.config ?? null,
configKey: typeof parsed.configKey === 'string' ? parsed.configKey : null,
wishlists: parsed.wishlists && typeof parsed.wishlists === 'object' ? parsed.wishlists : {}
};
}
export async function saveState(state: StoredState): Promise<void> {
await mkdir(dirname(STORE_FILE), { recursive: true });
await writeFile(STORE_FILE, JSON.stringify(state, null, 2), 'utf8');
// Written to a temporary file first, so a crash mid-write never leaves a
// half-written store behind.
const temporaryFile = `${STORE_FILE}.tmp`;
await writeFile(temporaryFile, JSON.stringify(state, null, 2), 'utf8');
await rename(temporaryFile, STORE_FILE);
}
export function updateState(change: (state: StoredState) => StoredState): Promise<StoredState> {
const next = writeQueue.then(async () => {
const updated = change(await loadState());
await saveState(updated);
return updated;
});
writeQueue = next.catch(() => undefined);
return next;
}
export async function readEncryptedConfig(): Promise<EncryptedConfig | null> {
@@ -60,20 +100,20 @@ export async function saveAdminAndConfig(
config: EncryptedConfig,
configKey: string
): Promise<void> {
await saveState({
await updateState((state) => ({
...state,
version: 2,
admin,
config,
configKey
});
}));
}
export async function updateEncryptedConfig(config: EncryptedConfig): Promise<void> {
const state = await loadState();
await saveState({
await updateState((state) => ({
...state,
config
});
}));
}
export async function readAdmin(): Promise<StoredAdmin | null> {
@@ -82,8 +122,29 @@ export async function readAdmin(): Promise<StoredAdmin | null> {
}
export async function migrateConfig(config: EncryptedConfig, configKey: string): Promise<void> {
await updateState((state) => ({ ...state, version: 2, config, configKey }));
}
export async function readWishlist(owner: string): Promise<WishlistEntry[]> {
const state = await loadState();
await saveState({ ...state, version: 2, config, configKey });
return state.wishlists[owner] ?? [];
}
export async function updateWishlist(owner: string, change: (entries: WishlistEntry[]) => WishlistEntry[]): Promise<WishlistEntry[]> {
const state = await updateState((current) => ({
...current,
wishlists: { ...current.wishlists, [owner]: change(current.wishlists[owner] ?? []) }
}));
return state.wishlists[owner];
}
export async function readAllWishlists(): Promise<Record<string, WishlistEntry[]>> {
const state = await loadState();
return state.wishlists;
}
export async function restoreBackup(config: EncryptedConfig, wishlists: Record<string, WishlistEntry[]>): Promise<void> {
await updateState((state) => ({ ...state, config, wishlists }));
}
export type { EncryptedConfig, StoredAdmin, StoredState };
+138
View File
@@ -0,0 +1,138 @@
import assert from 'node:assert/strict';
import { spawn, type ChildProcess } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { mkdtemp, rm } from 'node:fs/promises';
import { createServer } from 'node:net';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { after, before, describe, it } from 'node:test';
import { defaultConfig, type CalendarResponse } from '../../shared/contracts.js';
import { startMockServices } from './mock-services.js';
// The real server, started on its own port and data folder, talking to the
// mock Jellyfin, Sonarr and Radarr. It signs in through the app's own login
// endpoints, so what a profile receives is what the browser would receive.
let mocks: Awaited<ReturnType<typeof startMockServices>>;
let server: ChildProcess;
let dataDir = '';
let baseUrl = '';
let adminCookie = '';
async function freePort(): Promise<number> {
return new Promise((resolve) => {
const probe = createServer().listen(0, '127.0.0.1', () => {
const { port } = probe.address() as { port: number };
probe.close(() => resolve(port));
});
});
}
async function call(path: string, options: { method?: string; cookie?: string; body?: unknown } = {}) {
const response = await fetch(`${baseUrl}${path}`, {
method: options.method ?? 'GET',
headers: {
'Content-Type': 'application/json',
...(options.cookie ? { Cookie: options.cookie } : {})
},
body: options.body === undefined ? undefined : JSON.stringify(options.body)
});
const cookie = response.headers.get('set-cookie')?.split(';')[0] ?? '';
const text = await response.text();
return { status: response.status, cookie, json: text ? JSON.parse(text) : null };
}
async function signInAs(userId: string): Promise<string> {
const result = await call('/api/auth/profile-login', { method: 'POST', body: { userId, password: 'any-password' } });
assert.equal(result.status, 200);
return result.cookie;
}
async function calendarTitles(cookie: string): Promise<string[]> {
const result = await call('/api/calendar?start=2026-11-01&end=2026-11-30', { cookie });
assert.equal(result.status, 200);
return (result.json as CalendarResponse).items.map((item) => item.title).sort();
}
before(async () => {
mocks = await startMockServices();
dataDir = await mkdtemp(join(tmpdir(), 'omniarr-e2e-'));
const port = await freePort();
baseUrl = `http://127.0.0.1:${port}`;
server = spawn(process.execPath, ['dist-server/server/index.js'], {
env: { ...process.env, PORT: String(port), OMNIARR_DATA_DIR: dataDir },
stdio: 'ignore'
});
for (let attempt = 0; attempt < 50; attempt += 1) {
const ready = await fetch(`${baseUrl}/api/health`).then((response) => response.ok).catch(() => false);
if (ready) {
break;
}
await new Promise((resolve) => setTimeout(resolve, 100));
}
// A throwaway master password for this throwaway data folder.
const registered = await call('/api/auth/register', { method: 'POST', body: { password: randomUUID() } });
assert.equal(registered.status, 200);
adminCookie = registered.cookie;
const saved = await call('/api/settings', {
method: 'PUT',
cookie: adminCookie,
body: {
...defaultConfig,
preferences: { ...defaultConfig.preferences, hiddenSections: { limited: ['downloads', 'anime'] } },
jellyfin: { baseUrl: mocks.jellyfinUrl, apiKey: 'key', userId: '' },
sonarr: { ...defaultConfig.sonarr, baseUrl: mocks.sonarrUrl, apiKey: 'key' },
radarr: { ...defaultConfig.radarr, baseUrl: mocks.radarrUrl, apiKey: 'key' }
}
});
assert.equal(saved.status, 200);
});
after(async () => {
server?.kill();
await mocks?.close();
if (dataDir) {
await rm(dataDir, { recursive: true, force: true });
}
});
describe('upcoming calendar through the API', () => {
it('gives the administrator every release', async () => {
assert.deepEqual(await calendarTitles(adminCookie), ['Anime', 'Better Call Saul', 'Dune', 'Frieren', 'Your Name']);
});
it('gives a profile with every library every release', async () => {
assert.deepEqual(await calendarTitles(await signInAs('full')), ['Anime', 'Better Call Saul', 'Dune', 'Frieren', 'Your Name']);
});
it('keeps releases of libraries a profile cannot open out of its calendar', async () => {
assert.deepEqual(await calendarTitles(await signInAs('limited')), ['Anime', 'Better Call Saul', 'Dune']);
});
});
describe('sections hidden for a profile', () => {
it('closes the hidden sections for that profile only', async () => {
const limited = await signInAs('limited');
const full = await signInAs('full');
assert.equal((await call('/api/downloads', { cookie: limited })).status, 403);
assert.equal((await call('/api/hubs/anime', { cookie: limited })).status, 403);
assert.notEqual((await call('/api/downloads', { cookie: full })).status, 403);
assert.notEqual((await call('/api/downloads', { cookie: adminCookie })).status, 403);
});
it('lets only the administrator read the library access and change settings', async () => {
const limited = await signInAs('limited');
assert.equal((await call('/api/admin/profile-access', { cookie: limited })).status, 403);
assert.equal((await call('/api/settings', { method: 'PUT', cookie: limited, body: defaultConfig })).status, 403);
const access = await call('/api/admin/profile-access', { cookie: adminCookie });
assert.equal(access.status, 200);
assert.deepEqual(
(access.json as { profiles: Array<{ userId: string; libraries: Array<{ name: string; access: boolean }> }> })
.profiles.find((profile) => profile.userId === 'limited')?.libraries.filter((library) => library.access).map((library) => library.name),
['Shows', 'Movies']
);
});
});
@@ -0,0 +1,79 @@
import assert from 'node:assert/strict';
import { after, before, describe, it } from 'node:test';
import { defaultConfig, type AppConfig } from '../../shared/contracts.js';
import { getCalendar, getProfileLibraryAccess, isInFolders } from '../lib/services.js';
import { startMockServices } from './mock-services.js';
let mocks: Awaited<ReturnType<typeof startMockServices>>;
function configFor(userId: string): AppConfig {
return {
...defaultConfig,
jellyfin: { baseUrl: mocks.jellyfinUrl, apiKey: 'key', userId },
sonarr: { ...defaultConfig.sonarr, baseUrl: mocks.sonarrUrl, apiKey: 'key' },
radarr: { ...defaultConfig.radarr, baseUrl: mocks.radarrUrl, apiKey: 'key' }
};
}
async function calendarTitles(config: AppConfig): Promise<string[]> {
const calendar = await getCalendar(config, new Date('2026-11-01'), new Date('2026-11-30'));
return calendar.items.map((item) => item.title).sort();
}
before(async () => {
mocks = await startMockServices();
});
after(async () => {
await mocks.close();
});
describe('upcoming calendar per profile', () => {
it('shows everything to the administrator, who has no Jellyfin profile', async () => {
assert.deepEqual(await calendarTitles(configFor('')), ['Anime', 'Better Call Saul', 'Dune', 'Frieren', 'Your Name']);
});
it('shows everything to a profile that opens every library', async () => {
assert.deepEqual(await calendarTitles(configFor('full')), ['Anime', 'Better Call Saul', 'Dune', 'Frieren', 'Your Name']);
});
it('leaves out releases stored in libraries the profile cannot open', async () => {
assert.deepEqual(await calendarTitles(configFor('limited')), ['Anime', 'Better Call Saul', 'Dune']);
});
it('does not calendar-filter when Jellyfin cannot be asked', async () => {
const config = configFor('limited');
config.jellyfin.baseUrl = 'http://127.0.0.1:9';
assert.deepEqual(await calendarTitles(config), ['Anime', 'Better Call Saul', 'Dune', 'Frieren', 'Your Name']);
});
});
describe('library folder matching', () => {
it('matches a title by the library folder it is stored in', () => {
assert.equal(isInFolders('/shared/Library/Anime/Frieren', ['anime']), true);
assert.equal(isInFolders('/shared/library/ANIME/Frieren', ['anime']), true);
assert.equal(isInFolders('/shared/Library/Shows/Frieren', ['anime']), false);
});
it('ignores the title\'s own folder and handles missing data', () => {
assert.equal(isInFolders('/shared/Library/Shows/Anime', ['anime']), false);
assert.equal(isInFolders(undefined, ['anime']), false);
assert.equal(isInFolders('/shared/Library/Anime/Frieren', null), false);
assert.equal(isInFolders('C:\\Media\\Anime\\Frieren', ['anime']), true);
});
});
describe('profile library access', () => {
it('reports which libraries each Jellyfin profile can open', async () => {
const profiles = await getProfileLibraryAccess(configFor(''));
const full = profiles.find((profile) => profile.userId === 'full');
const limited = profiles.find((profile) => profile.userId === 'limited');
assert.equal(full?.allLibraries, true);
assert.ok(full?.libraries.every((library) => library.access));
assert.equal(limited?.allLibraries, false);
assert.deepEqual(
limited?.libraries.filter((library) => library.access).map((library) => library.name),
['Shows', 'Movies']
);
});
});
+95
View File
@@ -0,0 +1,95 @@
import { createServer, type Server } from 'node:http';
import type { AddressInfo } from 'node:net';
// Stand-ins for Jellyfin, Sonarr and Radarr with two profiles: "full" opens
// every library and "limited" cannot open Anime or Anime Movies. Sonarr and
// Radarr see the media under /shared/Library while Jellyfin sees /library, the
// way the Docker mounts differ in a real setup.
export const MOCK_LIBRARIES = [
{ Name: 'Shows', ItemId: 'aaaaaaaa-0000-0000-0000-000000000001', Locations: ['/library/Shows'] },
{ Name: 'Movies', ItemId: 'aaaaaaaa-0000-0000-0000-000000000002', Locations: ['/library/Movies'] },
{ Name: 'Anime', ItemId: 'aaaaaaaa-0000-0000-0000-000000000003', Locations: ['/library/Anime'] },
{ Name: 'Anime Movies', ItemId: 'aaaaaaaa-0000-0000-0000-000000000004', Locations: ['/library/AnimeMovies'] }
];
export const MOCK_USERS = [
{ Id: 'full', Name: 'Full', Policy: { EnableAllFolders: true, EnabledFolders: [] } },
{
Id: 'limited',
Name: 'Limited',
Policy: { EnableAllFolders: false, EnabledFolders: [MOCK_LIBRARIES[0].ItemId, MOCK_LIBRARIES[1].ItemId] }
}
];
const AIR_DATE = '2026-11-20T20:00:00Z';
const SONARR_CALENDAR = [
{ id: 1, title: 'Pilot', airDateUtc: AIR_DATE, seasonNumber: 1, episodeNumber: 1, series: { title: 'Better Call Saul', tmdbId: 60059, path: '/shared/Library/Shows/Better Call Saul' } },
{ id: 2, title: 'Chapter 1', airDateUtc: AIR_DATE, seasonNumber: 1, episodeNumber: 1, series: { title: 'Frieren', tmdbId: 209867, path: '/shared/Library/Anime/Frieren' } },
// A series folder that happens to be called like a library is still a Shows title.
{ id: 3, title: 'Episode 1', airDateUtc: AIR_DATE, seasonNumber: 1, episodeNumber: 1, series: { title: 'Anime', tmdbId: 1, path: '/shared/Library/Shows/Anime' } }
];
const RADARR_CALENDAR = [
{ id: 10, title: 'Dune', tmdbId: 438631, digitalRelease: AIR_DATE, path: '/shared/Library/Movies/Dune' },
{ id: 11, title: 'Your Name', tmdbId: 372058, digitalRelease: AIR_DATE, path: '/shared/Library/AnimeMovies/Your Name' }
];
function listen(server: Server): Promise<string> {
return new Promise((resolve) => {
server.listen(0, '127.0.0.1', () => resolve(`http://127.0.0.1:${(server.address() as AddressInfo).port}`));
});
}
function jsonServer(handler: (path: string, query: URLSearchParams, body: string) => unknown): Server {
return createServer((request, response) => {
const url = new URL(request.url || '/', 'http://localhost');
const chunks: Buffer[] = [];
request.on('data', (chunk: Buffer) => chunks.push(chunk));
request.on('end', () => {
response.writeHead(200, { 'Content-Type': 'application/json' });
response.end(JSON.stringify(handler(url.pathname, url.searchParams, Buffer.concat(chunks).toString('utf8'))));
});
});
}
export async function startMockServices() {
const jellyfin = jsonServer((path, query, body) => {
// Any password signs a profile in, so the app's own login can be exercised.
if (path === '/Users/AuthenticateByName') {
const username = (JSON.parse(body || '{}') as { Username?: string }).Username;
return { User: { Id: MOCK_USERS.find((user) => user.Name === username)?.Id } };
}
if (path === '/Library/VirtualFolders') {
return MOCK_LIBRARIES;
}
if (path === '/Users') {
return MOCK_USERS;
}
if (path === '/UserViews') {
const user = MOCK_USERS.find((candidate) => candidate.Id === query.get('userId'));
const visible = MOCK_LIBRARIES.filter((library) => user?.Policy.EnableAllFolders || user?.Policy.EnabledFolders.includes(library.ItemId));
return { Items: visible.map((library) => ({ Id: library.ItemId.replace(/-/g, ''), Name: library.Name })) };
}
return { Items: [] };
});
const sonarr = jsonServer(() => SONARR_CALENDAR);
const radarr = jsonServer(() => RADARR_CALENDAR);
const [jellyfinUrl, sonarrUrl, radarrUrl] = await Promise.all([listen(jellyfin), listen(sonarr), listen(radarr)]);
return {
jellyfinUrl,
sonarrUrl,
radarrUrl,
close: () => Promise.all([jellyfin, sonarr, radarr].map((server) => new Promise((resolve) => server.close(resolve))))
};
}
// `node dist-server/server/test/mock-services.js` keeps the mocks running so the
// app can be pointed at them (Jellyfin API key and Sonarr/Radarr keys: anything).
const isMain = process.argv[1] !== undefined && import.meta.url.endsWith(process.argv[1].split('/').slice(-3).join('/'));
if (isMain) {
const mocks = await startMockServices();
console.log(`Jellyfin ${mocks.jellyfinUrl}\nSonarr ${mocks.sonarrUrl}\nRadarr ${mocks.radarrUrl}`);
console.log('Profiles: "full" opens every library, "limited" cannot open Anime or Anime Movies.');
}
+69 -1
View File
@@ -12,8 +12,27 @@ export type AppRoute =
| 'library'
| 'calendar'
| 'downloads'
| 'wishlist'
| 'settings';
// Sections of the app the administrator can switch off for a profile.
export const HIDEABLE_SECTIONS = [
{ id: 'search', label: 'Search' },
{ id: 'calendar', label: 'Upcoming' },
{ id: 'downloads', label: 'Downloads' },
{ id: 'wishlist', label: 'Wishlist' },
{ id: 'dorama', label: 'K-Drama' },
{ id: 'anime', label: 'Anime' },
{ id: 'library', label: 'Library' },
{ id: 'netflix', label: 'Netflix' },
{ id: 'primevideo', label: 'Prime Video' },
{ id: 'hbo', label: 'HBO' },
{ id: 'viki', label: 'Viki' },
{ id: 'disney', label: 'Disney+' }
] as const;
export type HideableSection = (typeof HIDEABLE_SECTIONS)[number]['id'];
export interface ServiceConfig {
baseUrl: string;
}
@@ -55,6 +74,16 @@ export interface AppPreferences {
animationLevel: 'smooth' | 'reduced';
sonarrDownloadQualityProfileIds: string[];
radarrDownloadQualityProfileIds: string[];
/** Sections switched off for each Jellyfin profile, by user id; a profile that is not listed sees everything. */
hiddenSections: Record<string, HideableSection[]>;
}
export interface ProfileLibraryAccess {
userId: string;
label: string;
/** Jellyfin lets this profile open every library, including ones added later. */
allLibraries: boolean;
libraries: Array<{ id: string; name: string; access: boolean }>;
}
export interface AppConfig {
@@ -86,6 +115,12 @@ export interface ConnectionStatus {
label: string;
ok: boolean;
message: string;
/** Every field the service needs is filled in. */
configured: boolean;
/** The app works without it; only Jellyfin is required. */
optional: boolean;
/** Some of its fields are filled in but not all of them. */
incomplete?: boolean;
}
export interface DiskSpaceStatus {
@@ -297,6 +332,15 @@ export interface EpisodeRequestPayload {
qualityProfileId?: number;
}
// An episode of a series that is not in Sonarr yet: it is added with nothing
// monitored but this episode.
export interface SeriesEpisodeRequestPayload {
tmdbId: number;
seasonNumber: number;
episodeNumber: number;
qualityProfileId?: number;
}
export interface SeasonDeletePayload {
seriesId: number;
seasonNumber: number;
@@ -341,6 +385,29 @@ export interface AuthResponse {
message?: string;
}
export interface WishlistEntry {
card: MediaCard;
addedAt: string;
}
export interface WishlistResponse {
items: WishlistEntry[];
}
export interface WishlistTogglePayload {
card: MediaCard;
wishlisted: boolean;
}
/** What the administration exports: the service settings and every profile's wishlist. */
export interface BackupFile {
app: 'omniarr';
format: 1;
exportedAt: string;
config: AppConfig;
wishlists: Record<string, WishlistEntry[]>;
}
export interface ApiErrorPayload {
error: string;
}
@@ -352,7 +419,8 @@ export const defaultConfig: AppConfig = {
excludeLibraryItems: true,
animationLevel: 'smooth',
sonarrDownloadQualityProfileIds: [],
radarrDownloadQualityProfileIds: []
radarrDownloadQualityProfileIds: [],
hiddenSections: {}
},
jellyfin: {
baseUrl: '',
+1074 -140
View File
File diff suppressed because it is too large. Load diff
+25 -2
View File
@@ -2,6 +2,7 @@ import type {
AppConfig,
AuthPayload,
AuthResponse,
BackupFile,
CalendarResponse,
ConnectionStatus,
DashboardResponse,
@@ -11,15 +12,19 @@ import type {
JellyfinLoginPayload,
MediaCard,
MovieDeletePayload,
ProfileLibraryAccess,
SearchResponse,
ServiceOptionsResponse,
SessionResponse,
EpisodeWatchStateRequest,
EpisodeRequestPayload,
SeasonDeletePayload,
SeriesEpisodeRequestPayload,
SeasonRequestPayload,
TitleDetailsRequest,
TitleDetailsResponse
TitleDetailsResponse,
WishlistResponse,
WishlistTogglePayload
} from '../shared/contracts'
async function request<T>(input: string, init?: RequestInit): Promise<T> {
@@ -82,7 +87,7 @@ export const api = {
}),
getSettings: () => request<AppConfig>('/api/settings'),
saveSettings: (payload: AppConfig) =>
request<{ config: AppConfig }>('/api/settings', {
request<{ config: AppConfig; connections: ConnectionStatus[] }>('/api/settings', {
method: 'PUT',
body: JSON.stringify(payload),
}),
@@ -92,6 +97,19 @@ export const api = {
method: 'POST',
body: JSON.stringify(payload),
}),
getWishlist: () => request<WishlistResponse>('/api/wishlist'),
setWishlisted: (payload: WishlistTogglePayload) =>
request<WishlistResponse>('/api/wishlist', {
method: 'POST',
body: JSON.stringify(payload),
}),
exportBackup: () => request<BackupFile>('/api/admin/backup'),
getProfileAccess: () => request<{ profiles: ProfileLibraryAccess[] }>('/api/admin/profile-access'),
importBackup: (backup: unknown) =>
request<{ config: AppConfig; connections: ConnectionStatus[] }>('/api/admin/backup', {
method: 'POST',
body: JSON.stringify(backup),
}),
getDashboard: () => request<DashboardResponse>('/api/dashboard'),
getDiskSpace: () => request<DiskSpaceStatus | null>('/api/storage'),
getCalendar: (start: Date, end: Date) => request<CalendarResponse>(`/api/calendar?start=${start.toISOString()}&end=${end.toISOString()}`),
@@ -142,6 +160,11 @@ export const api = {
method: 'POST',
body: JSON.stringify({ ...payload, user }),
}),
requestSeriesEpisode: (payload: SeriesEpisodeRequestPayload, user: string | null) =>
request<{ ok: boolean }>('/api/requests/series-episode', {
method: 'POST',
body: JSON.stringify({ ...payload, user }),
}),
deleteSeason: (payload: SeasonDeletePayload) =>
request<{ ok: boolean }>('/api/seasons/delete', {
method: 'POST',
+890 -58
View File
File diff suppressed because it is too large. Load diff
+3
View File
@@ -2,6 +2,9 @@ import { StrictMode } from 'react'
import { createRoot } from 'react-dom/client'
import './index.css'
import App from './App'
import { installTapGuard } from './tapGuard'
installTapGuard()
createRoot(document.getElementById('root')!).render(
<StrictMode>
+51
View File
@@ -0,0 +1,51 @@
// Some mobile browsers (notably iOS, and installed web apps) fire a click when
// a scroll gesture ends on top of a poster, which opens it by accident. This
// swallows clicks that come from a touch that moved or from a scroll that was
// still settling, so only real taps reach the app.
const TAP_SLOP_PX = 10
const SCROLL_SETTLE_MS = 120
const TOUCH_CLICK_WINDOW_MS = 800
export function installTapGuard() {
let startX = 0
let startY = 0
let moved = false
let lastTouchEndAt = 0
let lastScrollAt = 0
window.addEventListener('touchstart', (event) => {
const touch = event.touches[0]
startX = touch?.clientX ?? 0
startY = touch?.clientY ?? 0
moved = false
}, { capture: true, passive: true })
window.addEventListener('touchmove', (event) => {
const touch = event.touches[0]
if (touch && Math.hypot(touch.clientX - startX, touch.clientY - startY) > TAP_SLOP_PX) {
moved = true
}
}, { capture: true, passive: true })
window.addEventListener('touchend', () => {
lastTouchEndAt = Date.now()
}, { capture: true, passive: true })
// Scroll events don't bubble, so listen in the capture phase to see every
// scroll container (page, carousels, episode lists).
document.addEventListener('scroll', () => {
lastScrollAt = Date.now()
}, { capture: true, passive: true })
window.addEventListener('click', (event) => {
const now = Date.now()
if (now - lastTouchEndAt > TOUCH_CLICK_WINDOW_MS) {
return
}
if (moved || now - lastScrollAt < SCROLL_SETTLE_MS) {
event.preventDefault()
event.stopPropagation()
}
}, { capture: true })
}