diff --git a/README.md b/README.md index 0906926b..ed7c5e6f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ - Images built for AMD64 (x86_64), ARM64, ARMv7 and ARMv6 - Supports all Raspberry Pi's, most SBCs & Apple Silicon - Full i18n support with automatic language detection - - Translations for Chinese, Dutch, French, German, Norwegian Bokmål, Polish, Portuguese, Russian, Spanish and Swedish + - Translations for Chinese, Dutch, French, German, Hebrew, Hungarian, Norwegian Bokmål, Polish, Portuguese, Russian, Spanish and Swedish - Want to help translate? [Join the Weblate project](https://hosted.weblate.org/engage/homepage/) - Service & Web Bookmarks - Docker Integration @@ -17,7 +17,7 @@ - Automatic service discovery (via labels) - Service Integration - Sonarr, Radarr, Readarr, Prowlarr, Bazarr, Lidarr, Emby, Jellyfin, Tautulli (Plex) - - Ombi, Overseerr, Jellyseerr, Jackett, NZBGet, SABnzbd, ruTorrent, Transmission + - Ombi, Overseerr, Jellyseerr, Jackett, NZBGet, SABnzbd, ruTorrent, Transmission, qBittorrent - Portainer, Traefik, Speedtest Tracker, PiHole, AdGuard Home, Nginx Proxy Manager, Gotify - Information Providers - Coin Market Cap @@ -120,14 +120,16 @@ Huge thanks to the all the contributors who have helped make this project what i - [aidenpwnz](https://github.com/benphelps/homepage/commits?author=aidenpwnz) - Nginx Proxy Manager, Search Bar Widget - [AlexFullmoon](https://github.com/benphelps/homepage/commits?author=AlexFullmoon) - OpenWeatherMap Widget - [AmadeusGraves](https://github.com/benphelps/homepage/commits?author=AmadeusGraves) - Spanish Translation +- [andrii-kryvoviaz](https://github.com/benphelps/homepage/commits?author=andrii-kryvoviaz) - Background opacity option - [boerniee](https://github.com/benphelps/homepage/commits?author=boerniee) - German Translation - [comradekingu](https://github.com/benphelps/homepage/commits?author=comradekingu) - Norwegian Bokmål Translation +- [Daniel Varga] - German & Hungarian Translation - [deffcolony](https://github.com/benphelps/homepage/commits?author=deffcolony) - Dutch Translation - [desolaris](https://github.com/benphelps/homepage/commits?author=desolaris) - Russian Translation - [ilusi0n](https://github.com/benphelps/homepage/commits?author=ilusi0n) - Jellyseerr Integration - [ItsJustMeChris](https://github.com/benphelps/homepage/commits?author=ItsJustMeChris) - Coin Market Cap Widget - [jackblk](https://github.com/benphelps/homepage/commits?author=jackblk) - Vietnamese Translation -- [JazzFisch](https://github.com/benphelps/homepage/commits?author=JazzFisch) - Readarr, Bazarr, Lidarr, SABnzbd & Transmission Integrations +- [JazzFisch](https://github.com/benphelps/homepage/commits?author=JazzFisch) - Readarr, Bazarr, Lidarr, SABnzbd, Transmission & qBittorrent Integrations - [juanmanuelbc](https://github.com/benphelps/homepage/commits?author=juanmanuelbc) - Spanish and Catalan Translations - [modem7](https://github.com/benphelps/homepage/commits?author=modem7) - Impvoed Docker Image - [nicedc](https://github.com/benphelps/homepage/commits?author=nicedc) - Chinese Translation @@ -136,5 +138,6 @@ Huge thanks to the all the contributors who have helped make this project what i - [psychodracon](https://github.com/benphelps/homepage/commits?author=psychodracon) - Polish Translation - [quod](https://github.com/benphelps/homepage/commits?author=quod) - Fixed Typos - [schklom](https://github.com/benphelps/homepage/commits?author=schklom) - ARM64, ARMv7 and ARMv6 +- [ShlomiPorush](https://github.com/benphelps/homepage/commits?author=ShlomiPorush) - Hebrew Translation - [SuperDOS](https://github.com/benphelps/homepage/commits?author=SuperDOS) - Swedish Translation - [xicopitz](https://github.com/benphelps/homepage/commits?author=xicopitz) - Gotify & Prowlarr Integration diff --git a/public/locales/ca/common.json b/public/locales/ca/common.json index 26e1f3e5..a0763633 100644 --- a/public/locales/ca/common.json +++ b/public/locales/ca/common.json @@ -97,7 +97,7 @@ "pihole": { "queries": "Consultes", "blocked": "Bloquejat", - "gravity": "Gravetat" + "gravity": "Gravity" }, "portainer": { "running": "Executant", @@ -147,14 +147,14 @@ "albums": "Àlbums" }, "adguard": { - "queries": "Queries", - "blocked": "Blocked", - "filtered": "Filtered", - "latency": "Latency" + "queries": "Consultes", + "blocked": "Bloquejat", + "filtered": "Filtrat", + "latency": "Latència" }, "qbittorrent": { - "download": "Download", - "upload": "Upload", + "download": "Descàrrega", + "upload": "Càrrega", "leech": "Leech", "seed": "Seed" } diff --git a/public/locales/de/common.json b/public/locales/de/common.json index a224030a..08ddddd7 100644 --- a/public/locales/de/common.json +++ b/public/locales/de/common.json @@ -11,7 +11,7 @@ "total": "Gesamt", "free": "Frei", "used": "Gebraucht", - "load": "Load" + "load": "Belastung" }, "docker": { "rx": "Rx", @@ -24,13 +24,13 @@ "playing": "Spielen", "transcoding": "Transcodierung", "bitrate": "Bitrate", - "no_active": "No Active Streams" + "no_active": "Keine aktive Streams" }, "tautulli": { "playing": "Spielen", "transcoding": "Transcodierung", "bitrate": "Bitrate", - "no_active": "No Active Streams" + "no_active": "Keine aktiven streamen" }, "rutorrent": { "active": "Aktiv", diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 22e1545a..d5d32ce0 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -88,8 +88,8 @@ "total": "Total" }, "weather": { - "current": "Ubicación actual", - "allow": "Haga clic para permitir", + "current": "Localización Actual", + "allow": "Clic para permitir", "updating": "Actualizando", "wait": "Espere, por favor" }, @@ -153,9 +153,9 @@ "latency": "Latencia" }, "qbittorrent": { - "download": "Download", - "upload": "Upload", - "leech": "Leech", - "seed": "Seed" + "download": "Descarga", + "upload": "Subida", + "leech": "Compañeros", + "seed": "Semillas" } } diff --git a/public/locales/fr/common.json b/public/locales/fr/common.json index b558b66f..14544d2d 100644 --- a/public/locales/fr/common.json +++ b/public/locales/fr/common.json @@ -34,8 +34,8 @@ }, "rutorrent": { "active": "Actif", - "upload": "Téléverser", - "download": "Télécharger" + "upload": "Envoi", + "download": "Réception" }, "sonarr": { "wanted": "Demandé", @@ -68,8 +68,8 @@ "gravity": "Listes dom. bloqués" }, "speedtest": { - "upload": "Téléversement", - "download": "Téléchargement", + "upload": "Envoi", + "download": "Récep.", "ping": "Ping" }, "portainer": { @@ -164,8 +164,8 @@ "latency": "Latence" }, "qbittorrent": { - "download": "Download", - "upload": "Upload", + "download": "Récep.", + "upload": "Envoi", "leech": "Leech", "seed": "Seed" } diff --git a/public/locales/he/common.json b/public/locales/he/common.json new file mode 100644 index 00000000..fcd4e2cb --- /dev/null +++ b/public/locales/he/common.json @@ -0,0 +1,161 @@ +{ + "widget": { + "missing_type": "סוג ווידג'ט חסר: {{type}}", + "api_error": "שגיאת API", + "status": "סטטוס" + }, + "weather": { + "current": "מיקום נוכחי", + "allow": "יש ללחוץ כדי לאשר", + "updating": "מעדכן", + "wait": "המתן בבקשה" + }, + "search": { + "placeholder": "חיפוש…" + }, + "resources": { + "total": "סה\"כ", + "free": "פנוי", + "used": "בשימוש", + "load": "עומס" + }, + "docker": { + "rx": "RX", + "tx": "TX", + "mem": "זיכרון", + "cpu": "מעבד", + "offline": "כבוי" + }, + "emby": { + "playing": "מנגן", + "transcoding": "מקודד", + "bitrate": "סיביות", + "no_active": "אין הזרמות פעילות" + }, + "tautulli": { + "playing": "מנגן", + "transcoding": "מקודד", + "bitrate": "סיביות", + "no_active": "אין הזרמות פעילות" + }, + "nzbget": { + "rate": "יחס", + "remaining": "נותר", + "downloaded": "הורד" + }, + "sabnzbd": { + "rate": "יחס", + "queue": "תור", + "timeleft": "זמן שנותר" + }, + "rutorrent": { + "active": "פעיל", + "upload": "העלאה", + "download": "הורדה" + }, + "transmission": { + "download": "הורדה", + "upload": "העלאה", + "leech": "בהורדה", + "seed": "בשיתוף" + }, + "qbittorrent": { + "download": "הורדה", + "upload": "העלאה", + "leech": "בהורדה", + "seed": "בשיתוף" + }, + "sonarr": { + "wanted": "מבוקש", + "queued": "בתור", + "series": "סדרות" + }, + "radarr": { + "wanted": "מבוקש", + "queued": "בתור", + "movies": "סרטים" + }, + "lidarr": { + "wanted": "מבוקש", + "queued": "בתור", + "albums": "אלבומים" + }, + "readarr": { + "wanted": "מבוקש", + "queued": "בתור", + "books": "ספרים" + }, + "bazarr": { + "missingEpisodes": "פרקים חסרים", + "missingMovies": "סרטים חסרים" + }, + "ombi": { + "pending": "ממתין", + "approved": "מאושר", + "available": "זמין" + }, + "jellyseerr": { + "pending": "ממתין", + "approved": "מאושר", + "available": "זמין" + }, + "overseerr": { + "pending": "ממתין", + "approved": "מאושר", + "available": "זמין" + }, + "pihole": { + "queries": "שאילתות", + "blocked": "נחסם", + "gravity": "Gravity" + }, + "adguard": { + "queries": "שאילתות", + "blocked": "נחסם", + "filtered": "מסונן", + "latency": "השהיה" + }, + "speedtest": { + "upload": "העלאה", + "download": "הורדה", + "ping": "פינג" + }, + "portainer": { + "running": "פעיל", + "stopped": "נעצר", + "total": "סה\"כ" + }, + "traefik": { + "routers": "ניתובים", + "services": "שירותים", + "middleware": "מתווך" + }, + "npm": { + "enabled": "מופעל", + "disabled": "מבוטל", + "total": "סה\"כ" + }, + "coinmarketcap": { + "configure": "קבע את התצורה של מטבע קריפטו אחד או יותר למעקב", + "1hour": "שעה אחת", + "1day": "יום 1", + "7days": "7 יום", + "30days": "30 יום" + }, + "gotify": { + "apps": "אפליקציות", + "clients": "לקוחות", + "messages": "הודעות" + }, + "prowlarr": { + "enableIndexers": "אינדקסים", + "numberOfGrabs": "Grabs", + "numberOfQueries": "שאילתות", + "numberOfFailGrabs": "Fail Grabs", + "numberOfFailQueries": "Fail Queries" + }, + "jackett": { + "configured": "מוגדר", + "errored": "שגיאה" + } +} diff --git a/public/locales/hu/common.json b/public/locales/hu/common.json index 972b12f5..a3a3abb4 100644 --- a/public/locales/hu/common.json +++ b/public/locales/hu/common.json @@ -1,9 +1,9 @@ { "resources": { - "total": "Total", - "free": "Free", - "used": "Used", - "load": "Load" + "total": "Összes", + "free": "Szabad", + "used": "Használt", + "load": "Terhelés" }, "docker": { "rx": "RX", @@ -13,149 +13,149 @@ "offline": "Offline" }, "lidarr": { - "albums": "Albums", - "wanted": "Wanted", - "queued": "Queued" + "albums": "Albumok", + "wanted": "Keresett", + "queued": "Sorban áll" }, "readarr": { - "wanted": "Wanted", - "queued": "Queued", - "books": "Books" + "wanted": "Keresett", + "queued": "Sorban áll", + "books": "Könyvek" }, "bazarr": { - "missingEpisodes": "Missing Episodes", - "missingMovies": "Missing Movies" + "missingEpisodes": "Hiányzó epizódok", + "missingMovies": "Hiányzó filmek" }, "widget": { - "missing_type": "Missing Widget Type: {{type}}", - "api_error": "API Error", - "status": "Status" + "missing_type": "Hiányzó Widget Típus: {{type}}", + "api_error": "API Hiba", + "status": "Státusz" }, "weather": { - "current": "Current Location", - "allow": "Click to allow", - "updating": "Updating", - "wait": "Please wait" + "current": "Aktuális hely", + "allow": "Kattints az engedélyezéshez", + "updating": "Frissítés", + "wait": "Kérlek várj" }, "search": { - "placeholder": "Search…" + "placeholder": "Keresés…" }, "emby": { - "playing": "Playing", - "transcoding": "Transcoding", - "bitrate": "Bitrate", - "no_active": "No Active Streams" + "playing": "Lejátszás", + "transcoding": "Átkódolás", + "bitrate": "Bitráta", + "no_active": "Nincs aktív lejátszás" }, "tautulli": { - "playing": "Playing", - "transcoding": "Transcoding", - "bitrate": "Bitrate", - "no_active": "No Active Streams" + "playing": "Lejátszás folyamatban", + "transcoding": "Átkódolás", + "bitrate": "Bitráta", + "no_active": "Nincs aktív lejátszás" }, "nzbget": { - "rate": "Rate", - "remaining": "Remaining", - "downloaded": "Downloaded" + "rate": "Ráta", + "remaining": "Hátralévő", + "downloaded": "Letöltött" }, "sabnzbd": { - "rate": "Rate", - "queue": "Queue", - "timeleft": "Time Left" + "rate": "Ráta", + "queue": "Sor", + "timeleft": "Hátralévő idő" }, "rutorrent": { - "active": "Active", - "upload": "Upload", - "download": "Download" + "active": "Aktív", + "upload": "Feltöltés", + "download": "Letöltés" }, "transmission": { - "leech": "Leech", - "seed": "Seed", - "download": "Download", - "upload": "Upload" + "leech": "Leechelés", + "seed": "Seedelés", + "download": "Letöltés", + "upload": "Feltöltés" }, "qbittorrent": { - "download": "Download", - "upload": "Upload", - "leech": "Leech", - "seed": "Seed" + "download": "Letöltés", + "upload": "Feltöltés", + "leech": "Leechelés", + "seed": "Seedelés" }, "sonarr": { - "wanted": "Wanted", - "queued": "Queued", - "series": "Series" + "wanted": "Keresett", + "queued": "Sorban áll", + "series": "Sorozat" }, "radarr": { - "wanted": "Wanted", - "queued": "Queued", - "movies": "Movies" + "wanted": "Keresett", + "queued": "Sorban áll", + "movies": "Filmek" }, "ombi": { - "pending": "Pending", - "approved": "Approved", - "available": "Available" + "pending": "Függőben", + "approved": "Engedélyezett", + "available": "Elérhető" }, "jellyseerr": { - "pending": "Pending", - "approved": "Approved", - "available": "Available" + "pending": "Függőben", + "approved": "Engedélyezett", + "available": "Elérhető" }, "overseerr": { - "pending": "Pending", - "approved": "Approved", - "available": "Available" + "pending": "Függőben", + "approved": "Engedélyezett", + "available": "Elérhető" }, "pihole": { - "queries": "Queries", - "blocked": "Blocked", - "gravity": "Gravity" + "queries": "Lekérdezések", + "blocked": "Blokkolt", + "gravity": "Gravitáció" }, "adguard": { - "queries": "Queries", - "blocked": "Blocked", - "filtered": "Filtered", - "latency": "Latency" + "queries": "Lekérdezések", + "blocked": "Blokkolt", + "filtered": "Szűrt", + "latency": "Késleltetés" }, "speedtest": { - "upload": "Upload", - "download": "Download", + "upload": "Feltöltés", + "download": "Letöltés", "ping": "Ping" }, "portainer": { - "running": "Running", - "stopped": "Stopped", - "total": "Total" + "running": "Futó", + "stopped": "Megállított", + "total": "Összes" }, "traefik": { - "routers": "Routers", - "services": "Services", - "middleware": "Middleware" + "routers": "Routerek", + "services": "Folyamatok", + "middleware": "Közvetítő" }, "npm": { - "enabled": "Enabled", - "disabled": "Disabled", - "total": "Total" + "enabled": "Bekapcsolva", + "disabled": "Kikapcsolva", + "total": "Összes" }, "coinmarketcap": { - "configure": "Configure one or more crypto currencies to track", - "1hour": "1 Hour", - "1day": "1 Day", - "7days": "7 Days", - "30days": "30 Days" + "configure": "Állíts be egy vagy több Cryptovalutát a követéshez", + "1hour": "1 Óra", + "1day": "1 Nap", + "7days": "7 Nap", + "30days": "30 Nap" }, "gotify": { - "apps": "Applications", - "clients": "Clients", - "messages": "Messages" + "apps": "Applikációk", + "clients": "Kliensek", + "messages": "Üzenetek" }, "prowlarr": { - "enableIndexers": "Indexers", - "numberOfGrabs": "Grabs", - "numberOfFailGrabs": "Fail Grabs", - "numberOfQueries": "Queries", - "numberOfFailQueries": "Fail Queries" + "enableIndexers": "Indexerek", + "numberOfGrabs": "Fogott", + "numberOfFailGrabs": "Hibás fogások", + "numberOfQueries": "Lekérdezések", + "numberOfFailQueries": "Hibás lekérdezések" }, "jackett": { - "configured": "Configured", - "errored": "Errored" + "configured": "Beállított", + "errored": "Hibás" } } diff --git a/public/locales/it/common.json b/public/locales/it/common.json index af1888ad..2e07b8f9 100644 --- a/public/locales/it/common.json +++ b/public/locales/it/common.json @@ -99,14 +99,14 @@ "available": "Disponibili" }, "sabnzbd": { - "rate": "Rate", - "queue": "Queue", - "timeleft": "Time Left" + "rate": "Rapporto", + "queue": "Coda", + "timeleft": "Tempo Rimanente" }, "nzbget": { - "rate": "Rate", - "remaining": "Remaining", - "downloaded": "Downloaded" + "rate": "Rapporto", + "remaining": "Rimanente", + "downloaded": "Scaricato" }, "coinmarketcap": { "configure": "Configure one or more crypto currencies to track", @@ -116,9 +116,9 @@ "30days": "30 Days" }, "gotify": { - "apps": "Applications", + "apps": "Applicazioni", "clients": "Clients", - "messages": "Messages" + "messages": "Messaggi" }, "prowlarr": { "enableIndexers": "Indexers", diff --git a/public/locales/nl/common.json b/public/locales/nl/common.json index 6421871a..d439e2a7 100644 --- a/public/locales/nl/common.json +++ b/public/locales/nl/common.json @@ -40,7 +40,7 @@ "playing": "Afspelen", "transcoding": "Transcodering", "bitrate": "Bitsnelheid", - "no_active": "No Active Streams" + "no_active": "Geen Actieve Steams" }, "tautulli": { "playing": "Afspelen", diff --git a/public/locales/ru/common.json b/public/locales/ru/common.json index b024d64e..73da2e36 100644 --- a/public/locales/ru/common.json +++ b/public/locales/ru/common.json @@ -113,7 +113,7 @@ "1hour": "1 Hour", "1day": "1 Day", "7days": "7 Days", - "30days": "30 Days" + "30days": "30 Дней" }, "gotify": { "apps": "Applications", diff --git a/public/locales/zh-CN/common.json b/public/locales/zh-CN/common.json index 8cc40ece..f8d9f802 100644 --- a/public/locales/zh-CN/common.json +++ b/public/locales/zh-CN/common.json @@ -21,13 +21,13 @@ "offline": "离线" }, "emby": { - "playing": "正在播放", + "playing": "播放中", "transcoding": "转码", "bitrate": "比特率", "no_active": "暂无播放" }, "tautulli": { - "playing": "正在播放", + "playing": "播放中", "transcoding": "转码", "bitrate": "比特率", "no_active": "暂无播放" @@ -38,12 +38,12 @@ "download": "下载" }, "sonarr": { - "wanted": "通缉", + "wanted": "想看", "queued": "排队", "series": "系列" }, "radarr": { - "wanted": "订阅", + "wanted": "想看", "queued": "队列", "movies": "电影" }, @@ -74,7 +74,7 @@ }, "portainer": { "running": "运行中", - "stopped": "已停止", + "stopped": "停止", "total": "总计" }, "traefik": { @@ -91,7 +91,7 @@ "current": "当前定位", "allow": "点击并允许", "updating": "更新中", - "wait": "请等待" + "wait": "请稍后" }, "overseerr": { "pending": "待办", @@ -110,10 +110,10 @@ }, "coinmarketcap": { "configure": "配置一个或多个需要追踪的加密", - "1hour": "1 Hour", - "1day": "1 Day", - "7days": "7 Days", - "30days": "30 Days" + "1hour": "1小时", + "1day": "1天", + "7days": "7天", + "30days": "30天" }, "gotify": { "apps": "应用", @@ -121,41 +121,41 @@ "messages": "信息" }, "prowlarr": { - "enableIndexers": "Indexers", - "numberOfGrabs": "Grabs", - "numberOfQueries": "Queries", - "numberOfFailGrabs": "Fail Grabs", - "numberOfFailQueries": "Fail Queries" + "enableIndexers": "索引器", + "numberOfGrabs": "抓取", + "numberOfQueries": "查询", + "numberOfFailGrabs": "抓取失败", + "numberOfFailQueries": "查询失败" }, "transmission": { "download": "下载", "upload": "上传", - "leech": "Leech", + "leech": "吸血", "seed": "做种" }, "jackett": { - "configured": "Configured", - "errored": "Errored" + "configured": "已配置", + "errored": "出错了" }, "bazarr": { - "missingEpisodes": "Missing Episodes", - "missingMovies": "Missing Movies" + "missingEpisodes": "缺少的剧集", + "missingMovies": "缺少的电影" }, "lidarr": { - "wanted": "Wanted", - "queued": "Queued", - "albums": "Albums" + "wanted": "订阅", + "queued": "队列", + "albums": "相册" }, "adguard": { - "queries": "Queries", - "blocked": "Blocked", - "filtered": "Filtered", - "latency": "Latency" + "queries": "查询", + "blocked": "阻止", + "filtered": "过滤", + "latency": "延迟" }, "qbittorrent": { - "download": "Download", - "upload": "Upload", - "leech": "Leech", - "seed": "Seed" + "download": "下载", + "upload": "上传", + "leech": "吸血", + "seed": "做种" } } diff --git a/src/components/services/item.jsx b/src/components/services/item.jsx index 2d50276e..df570fca 100644 --- a/src/components/services/item.jsx +++ b/src/components/services/item.jsx @@ -22,12 +22,6 @@ function resolveIcon(icon) { } export default function Item({ service }) { - const handleOnClick = () => { - if (service.href && service.href !== "#") { - window.open(service.href, "_blank").focus(); - } - }; - const hasLink = service.href && service.href !== "#"; return ( @@ -41,13 +35,14 @@ export default function Item({ service }) {
{service.icon && (hasLink ? ( - + ) : (
logo @@ -55,16 +50,17 @@ export default function Item({ service }) { ))} {hasLink ? ( - + ) : (
diff --git a/src/components/services/widgets/service/tautulli.jsx b/src/components/services/widgets/service/tautulli.jsx index a9e9f61f..8ca6b01b 100644 --- a/src/components/services/widgets/service/tautulli.jsx +++ b/src/components/services/widgets/service/tautulli.jsx @@ -2,7 +2,7 @@ import useSWR from "swr"; import { useTranslation } from "react-i18next"; import { BsFillPlayFill, BsPauseFill, BsCpu, BsFillCpuFill } from "react-icons/bs"; -import { MdOutlineSmartDisplay } from "react-icons/md"; +import { MdOutlineSmartDisplay, MdSmartDisplay } from "react-icons/md"; import Widget from "../widget"; @@ -37,9 +37,16 @@ function SingleSessionEntry({ session }) {
{full_title}
+ {video_decision === "direct play" && audio_decision === "direct play" && ( + + )} {video_decision === "copy" && audio_decision === "copy" && } - {video_decision !== "copy" && audio_decision !== "copy" && } - {video_decision === "copy" && audio_decision !== "copy" && } + {video_decision !== "copy" && + video_decision !== "direct play" && + (audio_decision !== "copy" || audio_decision !== "direct play") && } + {(video_decision === "copy" || video_decision === "direct play") && + audio_decision !== "copy" && + audio_decision !== "direct play" && }
@@ -92,9 +99,16 @@ function SessionEntry({ session }) {
{full_title}
+ {video_decision === "direct play" && audio_decision === "direct play" && ( + + )} {video_decision === "copy" && audio_decision === "copy" && } - {video_decision !== "copy" && audio_decision !== "copy" && } - {video_decision === "copy" && audio_decision !== "copy" && } + {video_decision !== "copy" && + video_decision !== "direct play" && + (audio_decision !== "copy" || audio_decision !== "direct play") && } + {(video_decision === "copy" || video_decision === "direct play") && + audio_decision !== "copy" && + audio_decision !== "direct play" && }
{millisecondsToString(view_offset)}
diff --git a/src/pages/api/services/proxy.js b/src/pages/api/services/proxy.js index 60e37eb9..ab4f44b9 100644 --- a/src/pages/api/services/proxy.js +++ b/src/pages/api/services/proxy.js @@ -23,7 +23,7 @@ function jsonArrayTransform(data, transform) { } function jsonArrayFilter(data, filter) { - return jsonArrayTransform(data, items => items.filter(filter)); + return jsonArrayTransform(data, (items) => items.filter(filter)); } const serviceProxyHandlers = { @@ -36,8 +36,8 @@ const serviceProxyHandlers = { maps: { movie: (data) => ({ wanted: jsonArrayFilter(data, (item) => item.isAvailable === false).length, - have: jsonArrayFilter(data, (item) => item.isAvailable === true).length - }) + have: jsonArrayFilter(data, (item) => item.isAvailable === true).length, + }), }, }, sonarr: { @@ -52,7 +52,7 @@ const serviceProxyHandlers = { proxy: genericProxyHandler, maps: { album: (data) => ({ - have: jsonArrayFilter(data, (item) => item.statistics.percentOfTracks === 100).length, + have: jsonArrayFilter(data, (item) => item?.statistics?.percentOfTracks === 100).length, }), }, }, @@ -60,7 +60,7 @@ const serviceProxyHandlers = { proxy: genericProxyHandler, maps: { book: (data) => ({ - have: jsonArrayFilter(data, (item) => item.statistics.bookFileCount > 0).length, + have: jsonArrayFilter(data, (item) => item?.statistics?.bookFileCount > 0).length, }), }, }, diff --git a/src/pages/api/validate.js b/src/pages/api/validate.js new file mode 100644 index 00000000..cdb28274 --- /dev/null +++ b/src/pages/api/validate.js @@ -0,0 +1,9 @@ +import checkAndCopyConfig from "utils/config"; + +const configs = ["docker.yaml", "settings.yaml", "services.yaml", "bookmarks.yaml"]; + +export default async function handler(req, res) { + const errors = configs.map((config) => checkAndCopyConfig(config)).filter((status) => status !== true); + + res.send(errors); +} diff --git a/src/pages/api/widgets/openweathermap.js b/src/pages/api/widgets/openweathermap.js index 28ff3dfa..93eeb93d 100644 --- a/src/pages/api/widgets/openweathermap.js +++ b/src/pages/api/widgets/openweathermap.js @@ -14,7 +14,7 @@ export default async function handler(req, res) { } if (!apiKey && provider) { - const settings = await getSettings(); + const settings = getSettings(); apiKey = settings?.providers?.openweathermap; } diff --git a/src/pages/api/widgets/weather.js b/src/pages/api/widgets/weather.js index 8b96baed..5154a6dc 100644 --- a/src/pages/api/widgets/weather.js +++ b/src/pages/api/widgets/weather.js @@ -14,7 +14,7 @@ export default async function handler(req, res) { } if (!apiKey && provider) { - const settings = await getSettings(); + const settings = getSettings(); apiKey = settings?.providers?.weatherapi; } diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 3b161d45..1b20a020 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -4,6 +4,7 @@ import Head from "next/head"; import dynamic from "next/dynamic"; import { useTranslation } from "react-i18next"; import { useEffect, useContext } from "react"; +import { BiError } from "react-icons/bi"; import ServicesGroup from "components/services/group"; import BookmarksGroup from "components/bookmarks/group"; @@ -23,17 +24,54 @@ const ColorToggle = dynamic(() => import("components/color-toggle"), { const rightAlignedWidgets = ["weatherapi", "openweathermap", "weather", "search", "datetime"]; -export async function getStaticProps() { - const settings = await getSettings(); - - return { - props: { - settings, - }, - }; +export function getStaticProps() { + try { + const settings = getSettings(); + return { + props: { + settings, + }, + }; + } catch (e) { + return { + props: { + settings: {}, + }, + }; + } } -export default function Home({ settings }) { +export default function Index({ settings }) { + const { data: errorsData } = useSWR("/api/validate"); + + if (errorsData && errorsData.length > 0) { + return ( +
+
+ {errorsData.map((error, i) => ( +
+
+ + {error.config} +
+
+ 
{error.reason}
+ 
{error.mark.snippet}
+
+
+ ))} +
+
+ ); + } + + return ; +} + +function Home({ settings }) { const { i18n } = useTranslation(); const { theme, setTheme } = useContext(ThemeContext); const { color, setColor } = useContext(ColorContext); diff --git a/src/skeleton/bookmarks.yaml b/src/skeleton/bookmarks.yaml index bf8a13e1..871e9134 100644 --- a/src/skeleton/bookmarks.yaml +++ b/src/skeleton/bookmarks.yaml @@ -1,3 +1,4 @@ +--- # For configuration options and examples, please see: # https://github.com/benphelps/homepage/wiki/Bookmarks diff --git a/src/skeleton/docker.yaml b/src/skeleton/docker.yaml index a20926a7..724c2281 100644 --- a/src/skeleton/docker.yaml +++ b/src/skeleton/docker.yaml @@ -1,9 +1,10 @@ +--- # For configuration options and examples, please see: # https://github.com/benphelps/homepage/wiki/Docker-Integration -my-docker: - host: 127.0.0.1 - port: 2375 +# my-docker: +# host: 127.0.0.1 +# port: 2375 -other-docker: - socket: /var/run/docker.sock +# my-docker: +# socket: /var/run/docker.sock diff --git a/src/skeleton/services.yaml b/src/skeleton/services.yaml index d6a010ab..9514f67e 100644 --- a/src/skeleton/services.yaml +++ b/src/skeleton/services.yaml @@ -1,3 +1,4 @@ +--- # For configuration options and examples, please see: # https://github.com/benphelps/homepage/wiki/Services diff --git a/src/skeleton/settings.yaml b/src/skeleton/settings.yaml index c9f13888..623781c6 100644 --- a/src/skeleton/settings.yaml +++ b/src/skeleton/settings.yaml @@ -1,3 +1,4 @@ +--- # For configuration options and examples, please see: # https://github.com/benphelps/homepage/wiki/Settings diff --git a/src/skeleton/widgets.yaml b/src/skeleton/widgets.yaml index 72094b1f..a5c6a911 100644 --- a/src/skeleton/widgets.yaml +++ b/src/skeleton/widgets.yaml @@ -1,3 +1,4 @@ +--- # For configuration options and examples, please see: # https://github.com/benphelps/homepage/wiki/Information-Widgets diff --git a/src/utils/config.js b/src/utils/config.js index 7b70de37..16861de8 100644 --- a/src/utils/config.js +++ b/src/utils/config.js @@ -1,6 +1,6 @@ /* eslint-disable no-console */ import { join } from "path"; -import { existsSync, copyFile, promises as fs } from "fs"; +import { existsSync, copyFile, readFileSync } from "fs"; import yaml from "js-yaml"; @@ -15,13 +15,22 @@ export default function checkAndCopyConfig(config) { } console.info("%s was copied to the config folder", config); }); + + return true; + } + + try { + yaml.load(readFileSync(configYaml, "utf8")); + return true; + } catch (e) { + return { ...e, config }; } } -export async function getSettings() { +export function getSettings() { checkAndCopyConfig("settings.yaml"); const settingsYaml = join(process.cwd(), "config", "settings.yaml"); - const fileContents = await fs.readFile(settingsYaml, "utf8"); + const fileContents = readFileSync(settingsYaml, "utf8"); return yaml.load(fileContents); }