mirror of
https://github.com/streamyfin/streamyfin.git
synced 2026-06-02 20:18:29 +01:00
Compare commits
5 Commits
fix/refres
...
ci/pr-vali
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
935cacff81 | ||
|
|
5f59dce0c7 | ||
|
|
3de9b65b7d | ||
|
|
338fb9713b | ||
|
|
939fd2512d |
32
.github/workflows/linting.yml
vendored
32
.github/workflows/linting.yml
vendored
@@ -12,38 +12,6 @@ permissions:
|
|||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
validate_pr_title:
|
|
||||||
name: "📝 Validate PR Title"
|
|
||||||
if: github.event_name == 'pull_request'
|
|
||||||
runs-on: ubuntu-24.04
|
|
||||||
permissions:
|
|
||||||
pull-requests: write
|
|
||||||
contents: read
|
|
||||||
steps:
|
|
||||||
- uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
|
|
||||||
id: lint_pr_title
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- uses: marocchino/sticky-pull-request-comment@0ea0beb66eb9baf113663a64ec522f60e49231c0 # v3.0.4
|
|
||||||
if: always() && (steps.lint_pr_title.outputs.error_message != null)
|
|
||||||
with:
|
|
||||||
header: pr-title-lint-error
|
|
||||||
message: |
|
|
||||||
Hey there and thank you for opening this pull request! 👋🏼
|
|
||||||
We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/).
|
|
||||||
|
|
||||||
**Error details:**
|
|
||||||
```
|
|
||||||
${{ steps.lint_pr_title.outputs.error_message }}
|
|
||||||
```
|
|
||||||
|
|
||||||
- if: ${{ steps.lint_pr_title.outputs.error_message == null }}
|
|
||||||
uses: marocchino/sticky-pull-request-comment@0ea0beb66eb9baf113663a64ec522f60e49231c0 # v3.0.4
|
|
||||||
with:
|
|
||||||
header: pr-title-lint-error
|
|
||||||
delete: true
|
|
||||||
|
|
||||||
dependency-review:
|
dependency-review:
|
||||||
name: 🔍 Vulnerable Dependencies
|
name: 🔍 Vulnerable Dependencies
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
|
|||||||
136
.github/workflows/pr-validation.yml
vendored
Normal file
136
.github/workflows/pr-validation.yml
vendored
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
name: 🚦 PR Validation
|
||||||
|
|
||||||
|
# Uses pull_request_target so the jobs get a write token even on fork PRs (to comment
|
||||||
|
# and label) — same as seerr. SECURITY: never check out or run the PR head's code here;
|
||||||
|
# we only read the title/body from the event payload and run our own scripts from the base.
|
||||||
|
on:
|
||||||
|
pull_request_target:
|
||||||
|
types: [opened, edited, synchronize, reopened]
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
permissions: {}
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: pr-validation-${{ github.event.pull_request.number || github.ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
validate_pr_title:
|
||||||
|
name: "📝 Validate PR Title"
|
||||||
|
if: github.event_name == 'pull_request_target'
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
permissions:
|
||||||
|
pull-requests: write
|
||||||
|
contents: read
|
||||||
|
steps:
|
||||||
|
- uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
|
||||||
|
id: lint_pr_title
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- uses: marocchino/sticky-pull-request-comment@0ea0beb66eb9baf113663a64ec522f60e49231c0 # v3.0.4
|
||||||
|
if: always() && (steps.lint_pr_title.outputs.error_message != null)
|
||||||
|
with:
|
||||||
|
header: pr-title-lint-error
|
||||||
|
message: |
|
||||||
|
Hey there and thank you for opening this pull request! 👋🏼
|
||||||
|
We require pull request titles to follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/).
|
||||||
|
|
||||||
|
**Error details:**
|
||||||
|
```
|
||||||
|
${{ steps.lint_pr_title.outputs.error_message }}
|
||||||
|
```
|
||||||
|
|
||||||
|
- if: ${{ steps.lint_pr_title.outputs.error_message == null }}
|
||||||
|
uses: marocchino/sticky-pull-request-comment@0ea0beb66eb9baf113663a64ec522f60e49231c0 # v3.0.4
|
||||||
|
with:
|
||||||
|
header: pr-title-lint-error
|
||||||
|
delete: true
|
||||||
|
|
||||||
|
validate_pr_template:
|
||||||
|
name: "📋 Validate PR Template"
|
||||||
|
# Skip pushes to an existing PR (the body rarely changes) and bot-authored PRs.
|
||||||
|
if: >-
|
||||||
|
github.event_name == 'pull_request_target' &&
|
||||||
|
github.event.action != 'synchronize' &&
|
||||||
|
github.actor != 'renovate[bot]' &&
|
||||||
|
github.actor != 'github-actions[bot]'
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
|
permissions:
|
||||||
|
pull-requests: write
|
||||||
|
issues: write
|
||||||
|
contents: read
|
||||||
|
steps:
|
||||||
|
- name: "📥 Checkout"
|
||||||
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||||
|
|
||||||
|
- name: "🍞 Setup Bun"
|
||||||
|
uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
|
||||||
|
with:
|
||||||
|
bun-version: latest
|
||||||
|
|
||||||
|
- name: "📝 Write PR body to file"
|
||||||
|
env:
|
||||||
|
PR_BODY: ${{ github.event.pull_request.body }}
|
||||||
|
run: printf '%s' "$PR_BODY" > /tmp/pr-body.txt
|
||||||
|
|
||||||
|
- name: "📂 List changed files"
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
gh api "repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files" \
|
||||||
|
--paginate --jq '.[].filename' > /tmp/pr-files.txt
|
||||||
|
|
||||||
|
- name: "🔎 Validate body against template"
|
||||||
|
id: check
|
||||||
|
env:
|
||||||
|
AUTHOR_ASSOCIATION: ${{ github.event.pull_request.author_association }}
|
||||||
|
PR_FILES: /tmp/pr-files.txt
|
||||||
|
run: |
|
||||||
|
set +e
|
||||||
|
bun scripts/check-pr-template.mjs /tmp/pr-body.txt > /tmp/pr-issues.json
|
||||||
|
echo "code=$?" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: "💬 Report problems"
|
||||||
|
if: steps.check.outputs.code != '0'
|
||||||
|
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v8.0.0
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const fs = require('fs');
|
||||||
|
let issues;
|
||||||
|
try { issues = JSON.parse(fs.readFileSync('/tmp/pr-issues.json', 'utf8')); }
|
||||||
|
catch { issues = ["The PR template check could not parse the description. Please make sure it follows the template."]; }
|
||||||
|
if (!Array.isArray(issues) || issues.length === 0) issues = ["The PR description does not follow the template."];
|
||||||
|
const body = [
|
||||||
|
"👋 Thanks for the PR! A few things in the description need attention before review:",
|
||||||
|
"",
|
||||||
|
...issues.map((i) => `- ${i}`),
|
||||||
|
"",
|
||||||
|
"Please update the PR description ([template](https://github.com/${{ github.repository }}/blob/develop/.github/pull_request_template.md)). This check re-runs when you edit it.",
|
||||||
|
].join("\n");
|
||||||
|
const { owner, repo } = context.repo;
|
||||||
|
const issue_number = context.payload.pull_request.number;
|
||||||
|
const marker = "<!-- pr-template-check -->";
|
||||||
|
const comments = await github.paginate(github.rest.issues.listComments, { owner, repo, issue_number });
|
||||||
|
const existing = comments.find((c) => c.body?.includes(marker));
|
||||||
|
const payload = `${marker}\n${body}`;
|
||||||
|
if (existing) await github.rest.issues.updateComment({ owner, repo, comment_id: existing.id, body: payload });
|
||||||
|
else await github.rest.issues.createComment({ owner, repo, issue_number, body: payload });
|
||||||
|
const label = "blocked: template";
|
||||||
|
try { await github.rest.issues.getLabel({ owner, repo, name: label }); }
|
||||||
|
catch { await github.rest.issues.createLabel({ owner, repo, name: label, color: "d93f0b", description: "PR description does not follow the template" }); }
|
||||||
|
await github.rest.issues.addLabels({ owner, repo, issue_number, labels: [label] });
|
||||||
|
core.setFailed(`PR template check failed:\n- ${issues.join("\n- ")}`);
|
||||||
|
|
||||||
|
- name: "✅ Clear problems on success"
|
||||||
|
if: steps.check.outputs.code == '0'
|
||||||
|
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v8.0.0
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const { owner, repo } = context.repo;
|
||||||
|
const issue_number = context.payload.pull_request.number;
|
||||||
|
const marker = "<!-- pr-template-check -->";
|
||||||
|
const comments = await github.paginate(github.rest.issues.listComments, { owner, repo, issue_number });
|
||||||
|
const existing = comments.find((c) => c.body?.includes(marker));
|
||||||
|
if (existing) await github.rest.issues.deleteComment({ owner, repo, comment_id: existing.id });
|
||||||
|
try { await github.rest.issues.removeLabel({ owner, repo, issue_number, name: "blocked: template" }); } catch {}
|
||||||
@@ -59,6 +59,7 @@ function SettingsMobile() {
|
|||||||
|
|
||||||
<QuickConnect className='mb-4' />
|
<QuickConnect className='mb-4' />
|
||||||
|
|
||||||
|
{Platform.OS !== "ios" && (
|
||||||
<View className='mb-4'>
|
<View className='mb-4'>
|
||||||
<ListGroup title={t("pairing.pair_with_phone_title")}>
|
<ListGroup title={t("pairing.pair_with_phone_title")}>
|
||||||
<ListItem
|
<ListItem
|
||||||
@@ -70,6 +71,7 @@ function SettingsMobile() {
|
|||||||
/>
|
/>
|
||||||
</ListGroup>
|
</ListGroup>
|
||||||
</View>
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
<View className='mb-4'>
|
<View className='mb-4'>
|
||||||
<AppLanguageSelector />
|
<AppLanguageSelector />
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ export default function StreamystatsPage() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleRefreshFromServer = useCallback(async () => {
|
const handleRefreshFromServer = useCallback(async () => {
|
||||||
const newPluginSettings = await refreshStreamyfinPluginSettings(true);
|
const newPluginSettings = await refreshStreamyfinPluginSettings();
|
||||||
// Update local state with new values
|
// Update local state with new values
|
||||||
const newUrl = newPluginSettings?.streamyStatsServerUrl?.value || "";
|
const newUrl = newPluginSettings?.streamyStatsServerUrl?.value || "";
|
||||||
setUrl(newUrl);
|
setUrl(newUrl);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { t } from "i18next";
|
import { t } from "i18next";
|
||||||
import React, { useCallback, useState } from "react";
|
import React, { useCallback, useState } from "react";
|
||||||
import { ScrollView, View } from "react-native";
|
import { Platform, ScrollView, View } from "react-native";
|
||||||
import { Button } from "@/components/Button";
|
import { Button } from "@/components/Button";
|
||||||
import { Text } from "@/components/common/Text";
|
import { Text } from "@/components/common/Text";
|
||||||
import { useScaledTVTypography } from "@/constants/TVTypography";
|
import { useScaledTVTypography } from "@/constants/TVTypography";
|
||||||
@@ -107,7 +107,7 @@ export const TVAddServerForm: React.FC<TVAddServerFormProps> = ({
|
|||||||
</View>
|
</View>
|
||||||
|
|
||||||
{/* Pair with Phone */}
|
{/* Pair with Phone */}
|
||||||
{onStartPairing && (
|
{Platform.OS !== "ios" && onStartPairing && (
|
||||||
<View>
|
<View>
|
||||||
<Button
|
<Button
|
||||||
onPress={onStartPairing}
|
onPress={onStartPairing}
|
||||||
|
|||||||
@@ -196,7 +196,10 @@ export const OtherSettings: React.FC = () => {
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</ListItem>
|
</ListItem>
|
||||||
<ListItem title={t("home.settings.other.max_auto_play_episode_count")}>
|
<ListItem
|
||||||
|
title={t("home.settings.other.max_auto_play_episode_count")}
|
||||||
|
disabled={pluginSettings?.maxAutoPlayEpisodeCount?.locked}
|
||||||
|
>
|
||||||
<PlatformDropdown
|
<PlatformDropdown
|
||||||
groups={autoPlayEpisodeOptions}
|
groups={autoPlayEpisodeOptions}
|
||||||
trigger={
|
trigger={
|
||||||
|
|||||||
@@ -229,7 +229,10 @@ export const PlaybackControlsSettings: React.FC = () => {
|
|||||||
|
|
||||||
<ListItem
|
<ListItem
|
||||||
title={t("home.settings.other.max_auto_play_episode_count")}
|
title={t("home.settings.other.max_auto_play_episode_count")}
|
||||||
disabled={!settings.autoPlayNextEpisode}
|
disabled={
|
||||||
|
!settings.autoPlayNextEpisode ||
|
||||||
|
pluginSettings?.maxAutoPlayEpisodeCount?.locked
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<PlatformDropdown
|
<PlatformDropdown
|
||||||
groups={autoPlayEpisodeOptions}
|
groups={autoPlayEpisodeOptions}
|
||||||
|
|||||||
119
scripts/check-pr-template.mjs
Normal file
119
scripts/check-pr-template.mjs
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
#!/usr/bin/env bun
|
||||||
|
/**
|
||||||
|
* Validates that a pull request body follows .github/pull_request_template.md:
|
||||||
|
* required sections are filled in and the key checklist items are ticked.
|
||||||
|
*
|
||||||
|
* Usage: bun scripts/check-pr-template.mjs <path-to-pr-body.txt>
|
||||||
|
* Output: a JSON array of human-readable problems (empty array = all good).
|
||||||
|
* Exit: 0 = ok, 1 = one or more problems, 2 = no body file given.
|
||||||
|
*
|
||||||
|
* Env: AUTHOR_ASSOCIATION — when OWNER/MEMBER/COLLABORATOR, the AI-disclosure
|
||||||
|
* check is skipped (maintainers self-police).
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { existsSync, readFileSync } from "node:fs";
|
||||||
|
|
||||||
|
const bodyFile = process.argv[2];
|
||||||
|
if (!bodyFile) {
|
||||||
|
console.error("usage: bun scripts/check-pr-template.mjs <pr-body-file>");
|
||||||
|
process.exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
let body;
|
||||||
|
try {
|
||||||
|
body = readFileSync(bodyFile, "utf8").replace(/\r\n/g, "\n");
|
||||||
|
} catch (e) {
|
||||||
|
console.error(`cannot read body file ${bodyFile}: ${e.message}`);
|
||||||
|
process.exit(2);
|
||||||
|
}
|
||||||
|
const association = (process.env.AUTHOR_ASSOCIATION || "").toUpperCase();
|
||||||
|
const isMaintainer = ["OWNER", "MEMBER", "COLLABORATOR"].includes(association);
|
||||||
|
|
||||||
|
// Strip HTML comments in a single linear pass: remove complete `<!-- … -->`
|
||||||
|
// blocks, then drop any leftover unterminated `<!-- …` to end-of-string. This
|
||||||
|
// leaves no `<!--` behind (satisfies CodeQL) without the quadratic re-scan loop
|
||||||
|
// a malicious deeply-nested body could abuse for CPU-DoS.
|
||||||
|
const stripComments = (s) =>
|
||||||
|
s
|
||||||
|
.replace(/<!--[\s\S]*?-->/g, "")
|
||||||
|
.replace(/<!--[\s\S]*$/, "")
|
||||||
|
.trim();
|
||||||
|
|
||||||
|
// Grab the text under a heading whose title contains `keyword`, up to the next heading
|
||||||
|
// or the end of the body.
|
||||||
|
const section = (keyword) => {
|
||||||
|
const re = new RegExp(
|
||||||
|
`(?:^|\\n)#{1,4}\\s*[^\\n]*${keyword}[^\\n]*\\n([\\s\\S]*?)(?=\\n#{1,4}\\s|$)`,
|
||||||
|
"i",
|
||||||
|
);
|
||||||
|
const m = body.match(re);
|
||||||
|
return m ? m[1] : null;
|
||||||
|
};
|
||||||
|
|
||||||
|
const isFilled = (content) => {
|
||||||
|
if (content == null) return false;
|
||||||
|
// Template guidance lives in HTML comments; once stripped, a real answer remains.
|
||||||
|
return stripComments(content).length > 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
const issues = [];
|
||||||
|
|
||||||
|
if (section("Description") === null)
|
||||||
|
issues.push("The **Description** section is missing.");
|
||||||
|
else if (!isFilled(section("Description")))
|
||||||
|
issues.push(
|
||||||
|
"The **Description** section is empty — describe what changed and why.",
|
||||||
|
);
|
||||||
|
|
||||||
|
if (section("Ticket") === null)
|
||||||
|
issues.push("The **Ticket / Issue** section is missing.");
|
||||||
|
else if (!isFilled(section("Ticket")))
|
||||||
|
issues.push(
|
||||||
|
"The **Ticket / Issue** section is empty — link an issue or write `N/A`.",
|
||||||
|
);
|
||||||
|
|
||||||
|
if (section("Testing Instructions") === null)
|
||||||
|
issues.push("The **Testing Instructions** section is missing.");
|
||||||
|
else if (!isFilled(section("Testing Instructions")))
|
||||||
|
issues.push(
|
||||||
|
"The **Testing Instructions** section is empty — tell reviewers how to test this, or write `N/A`.",
|
||||||
|
);
|
||||||
|
|
||||||
|
const checklist = section("Checklist");
|
||||||
|
if (checklist === null) {
|
||||||
|
issues.push("The **Checklist** section is missing.");
|
||||||
|
} else {
|
||||||
|
if (!/- \[x\][^\n]*contribution guidelines/i.test(checklist))
|
||||||
|
issues.push(
|
||||||
|
"Please read and tick the **contribution guidelines** checklist item.",
|
||||||
|
);
|
||||||
|
if (!isMaintainer && !/- \[x\][^\n]*declared if AI/i.test(checklist))
|
||||||
|
issues.push(
|
||||||
|
"Please tick the **AI disclosure** checklist item (declare whether AI was used).",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Require the Screenshots section when the PR changes UI (.tsx under app/ or components/).
|
||||||
|
// PR_FILES points to a newline list of changed paths (provided by the workflow).
|
||||||
|
const filesPath = process.env.PR_FILES;
|
||||||
|
if (filesPath && existsSync(filesPath)) {
|
||||||
|
const changed = readFileSync(filesPath, "utf8").split("\n").filter(Boolean);
|
||||||
|
const touchesUI = changed.some(
|
||||||
|
(f) =>
|
||||||
|
/^(app|components)\/.*\.tsx$/.test(f) && !/\.(test|spec)\.tsx$/.test(f),
|
||||||
|
);
|
||||||
|
if (touchesUI) {
|
||||||
|
const shots = section("Screenshots");
|
||||||
|
if (shots === null)
|
||||||
|
issues.push(
|
||||||
|
"This PR changes UI (`.tsx`) — add the **Screenshots / GIFs** section with before/after media.",
|
||||||
|
);
|
||||||
|
else if (!isFilled(shots))
|
||||||
|
issues.push(
|
||||||
|
"This PR changes UI — the **Screenshots / GIFs** section is empty; add screenshots (or write `N/A` if it's genuinely not visual).",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(JSON.stringify(issues));
|
||||||
|
process.exit(issues.length ? 1 : 0);
|
||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
type SortOrder,
|
type SortOrder,
|
||||||
SubtitlePlaybackMode,
|
SubtitlePlaybackMode,
|
||||||
} from "@jellyfin/sdk/lib/generated-client";
|
} from "@jellyfin/sdk/lib/generated-client";
|
||||||
|
import { t } from "i18next";
|
||||||
import { atom, useAtom, useAtomValue } from "jotai";
|
import { atom, useAtom, useAtomValue } from "jotai";
|
||||||
import { useCallback, useEffect, useMemo } from "react";
|
import { useCallback, useEffect, useMemo } from "react";
|
||||||
import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
|
import { BITRATES, type Bitrate } from "@/components/BitrateSelector";
|
||||||
@@ -121,6 +122,46 @@ export interface MaxAutoPlayEpisodeCount {
|
|||||||
value: number;
|
value: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The plugin may send object-typed settings as plain primitives.
|
||||||
|
* Resolve to the proper option object from the available choices.
|
||||||
|
*/
|
||||||
|
const normalizePluginValue = (
|
||||||
|
settingsKey: keyof Settings,
|
||||||
|
value: unknown,
|
||||||
|
): unknown => {
|
||||||
|
if (typeof value !== "object" || value === null) {
|
||||||
|
const defaultVal = defaultValues[settingsKey];
|
||||||
|
if (
|
||||||
|
typeof defaultVal === "object" &&
|
||||||
|
defaultVal !== null &&
|
||||||
|
"key" in defaultVal &&
|
||||||
|
"value" in defaultVal
|
||||||
|
) {
|
||||||
|
// defaultBitrate needs a lookup because its keys are human-readable
|
||||||
|
// (e.g. "8 Mb/s") that can't be derived from the raw value (e.g. 8000000).
|
||||||
|
// Other { key, value } settings like maxAutoPlayEpisodeCount work with
|
||||||
|
// the fallback because their keys are just String(value) (e.g. "5").
|
||||||
|
if (settingsKey === "defaultBitrate") {
|
||||||
|
const match = BITRATES.find(
|
||||||
|
(b) => b.key === value || b.value === value,
|
||||||
|
);
|
||||||
|
if (match) return match;
|
||||||
|
}
|
||||||
|
// maxAutoPlayEpisodeCount: 0 is invalid (breaks autoplay), clamp to -1
|
||||||
|
// -1 key must match the translated dropdown label so the UI shows "Disabled"
|
||||||
|
if (
|
||||||
|
settingsKey === "maxAutoPlayEpisodeCount" &&
|
||||||
|
(value === 0 || value === -1)
|
||||||
|
) {
|
||||||
|
return { key: t("home.settings.other.disabled"), value: -1 };
|
||||||
|
}
|
||||||
|
return { key: String(value), value };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
};
|
||||||
|
|
||||||
export type HomeSectionLatestResolver = {
|
export type HomeSectionLatestResolver = {
|
||||||
parentId?: string;
|
parentId?: string;
|
||||||
limit?: number;
|
limit?: number;
|
||||||
@@ -427,8 +468,7 @@ export const useSettings = () => {
|
|||||||
[_setPluginSettings],
|
[_setPluginSettings],
|
||||||
);
|
);
|
||||||
|
|
||||||
const refreshStreamyfinPluginSettings = useCallback(
|
const refreshStreamyfinPluginSettings = useCallback(async () => {
|
||||||
async (forceOverride = false) => {
|
|
||||||
if (!api) {
|
if (!api) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -441,37 +481,16 @@ export const useSettings = () => {
|
|||||||
);
|
);
|
||||||
setPluginSettings(newPluginSettings);
|
setPluginSettings(newPluginSettings);
|
||||||
|
|
||||||
// Apply plugin values to settings
|
// Locked/unlocked values are handled by the settings memo, which
|
||||||
|
// applies locked values at runtime without overwriting user storage.
|
||||||
|
// We only handle auto-enabling Streamystats here.
|
||||||
if (newPluginSettings && _settings) {
|
if (newPluginSettings && _settings) {
|
||||||
const updates: Partial<Settings> = {};
|
|
||||||
for (const [key, setting] of Object.entries(newPluginSettings)) {
|
|
||||||
if (setting && !setting.locked && setting.value !== undefined) {
|
|
||||||
const settingsKey = key as keyof Settings;
|
|
||||||
const effectiveValue = getEffectiveSettingValue(
|
|
||||||
_settings,
|
|
||||||
settingsKey,
|
|
||||||
);
|
|
||||||
// Apply if forceOverride is true, or if neither persisted settings
|
|
||||||
// nor app defaults provide a meaningful value.
|
|
||||||
if (forceOverride || !hasMeaningfulSettingValue(effectiveValue)) {
|
|
||||||
(updates as any)[settingsKey] = setting.value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Auto-enable Streamystats if server URL is provided
|
|
||||||
const streamyStatsUrl = newPluginSettings.streamyStatsServerUrl;
|
const streamyStatsUrl = newPluginSettings.streamyStatsServerUrl;
|
||||||
if (
|
if (streamyStatsUrl?.value && _settings.searchEngine !== "Streamystats") {
|
||||||
streamyStatsUrl?.value &&
|
|
||||||
_settings.searchEngine !== "Streamystats"
|
|
||||||
) {
|
|
||||||
updates.searchEngine = "Streamystats";
|
|
||||||
}
|
|
||||||
if (Object.keys(updates).length > 0) {
|
|
||||||
const newSettings = {
|
const newSettings = {
|
||||||
...defaultValues,
|
...defaultValues,
|
||||||
..._settings,
|
..._settings,
|
||||||
...updates,
|
searchEngine: "Streamystats",
|
||||||
} as Settings;
|
} as Settings;
|
||||||
setSettings(newSettings);
|
setSettings(newSettings);
|
||||||
saveSettings(newSettings);
|
saveSettings(newSettings);
|
||||||
@@ -479,9 +498,7 @@ export const useSettings = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return newPluginSettings;
|
return newPluginSettings;
|
||||||
},
|
}, [api, _settings]);
|
||||||
[api, _settings],
|
|
||||||
);
|
|
||||||
|
|
||||||
const updateSettings = (update: Partial<Settings>) => {
|
const updateSettings = (update: Partial<Settings>) => {
|
||||||
if (!_settings) {
|
if (!_settings) {
|
||||||
@@ -512,8 +529,13 @@ export const useSettings = () => {
|
|||||||
Partial<Settings>
|
Partial<Settings>
|
||||||
>((acc, [key, setting]) => {
|
>((acc, [key, setting]) => {
|
||||||
if (setting) {
|
if (setting) {
|
||||||
const { value, locked } = setting;
|
let { value } = setting;
|
||||||
|
const { locked } = setting;
|
||||||
const settingsKey = key as keyof Settings;
|
const settingsKey = key as keyof Settings;
|
||||||
|
|
||||||
|
// Normalize object-typed settings from plugin (plain primitive → { key, value })
|
||||||
|
value = normalizePluginValue(settingsKey, value);
|
||||||
|
|
||||||
const effectiveValue = getEffectiveSettingValue(_settings, settingsKey);
|
const effectiveValue = getEffectiveSettingValue(_settings, settingsKey);
|
||||||
|
|
||||||
(acc as any)[settingsKey] = locked
|
(acc as any)[settingsKey] = locked
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ export function startPairingListener(
|
|||||||
});
|
});
|
||||||
|
|
||||||
socket.on("error", (err) => {
|
socket.on("error", (err) => {
|
||||||
|
if (!active) return;
|
||||||
if (__DEV__) console.error("[PairingService] Socket error:", err);
|
if (__DEV__) console.error("[PairingService] Socket error:", err);
|
||||||
onError?.(err.message);
|
onError?.(err.message);
|
||||||
cleanup();
|
cleanup();
|
||||||
|
|||||||
Reference in New Issue
Block a user