mirror of
https://github.com/streamyfin/streamyfin.git
synced 2026-06-02 12:08:37 +01:00
Compare commits
3 Commits
cleanup/de
...
ci/auto-up
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c8369ea4d | ||
|
|
338fb9713b | ||
|
|
939fd2512d |
4
.github/ISSUE_TEMPLATE/issue_report.yml
vendored
4
.github/ISSUE_TEMPLATE/issue_report.yml
vendored
@@ -77,10 +77,12 @@ body:
|
|||||||
label: Streamyfin Version
|
label: Streamyfin Version
|
||||||
description: What version of Streamyfin are you running?
|
description: What version of Streamyfin are you running?
|
||||||
options:
|
options:
|
||||||
|
- 0.54.1 (TestFlight)
|
||||||
|
- 0.51.0
|
||||||
- 0.47.1
|
- 0.47.1
|
||||||
- 0.30.2
|
- 0.30.2
|
||||||
|
- 0.28.0
|
||||||
- older
|
- older
|
||||||
- TestFlight/Development build
|
|
||||||
validations:
|
validations:
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
|
|||||||
108
.github/workflows/update-issue-form.yml
vendored
108
.github/workflows/update-issue-form.yml
vendored
@@ -1,67 +1,91 @@
|
|||||||
name: 🐛 Update Bug Report Template
|
name: 🐛 Update Issue Form Versions
|
||||||
|
|
||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
types: [published] # Run on every published release on any branch
|
# Also fire on drafts/prereleases so versions that aren't a full release yet
|
||||||
|
# (TestFlight / dev builds) still land in the dropdown.
|
||||||
|
types: [published, released, prereleased, created, deleted]
|
||||||
|
schedule:
|
||||||
|
- cron: "0 3 * * 1" # Weekly safety net (Mondays 03:00 UTC) in case a release event was missed
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: update-issue-form-${{ github.event.release.tag_name || github.run_id }}
|
group: update-issue-form-${{ github.event.release.tag_name || github.run_id }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
update-bug-report:
|
update-issue-form:
|
||||||
|
name: 🔢 Populate version dropdown
|
||||||
|
runs-on: ubuntu-24.04
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
issues: write
|
|
||||||
runs-on: ubuntu-24.04
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: 📥 Checkout repository
|
- name: 📥 Checkout repository
|
||||||
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
||||||
|
|
||||||
- name: "🟢 Setup Node.js"
|
- name: 🍞 Setup Bun
|
||||||
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
|
||||||
with:
|
with:
|
||||||
node-version: '24.x'
|
bun-version: latest
|
||||||
cache: 'npm'
|
|
||||||
|
|
||||||
- name: 🔍 Extract minor version from app.json
|
- name: 🔢 Populate version dropdown from GitHub releases
|
||||||
id: minor
|
id: populate
|
||||||
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # main
|
run: bun scripts/update-issue-form.mjs
|
||||||
with:
|
env:
|
||||||
result-encoding: string
|
GH_TOKEN: ${{ github.token }}
|
||||||
script: |
|
GITHUB_REPOSITORY: ${{ github.repository }}
|
||||||
const fs = require('fs-extra');
|
|
||||||
const semver = require('semver');
|
|
||||||
const content = fs.readJsonSync('./app.json');
|
|
||||||
const version = content.expo.version;
|
|
||||||
const minorVersion = semver.minor(version);
|
|
||||||
return minorVersion.toString();
|
|
||||||
|
|
||||||
- name: 📝 Update bug report version
|
- name: 📬 Create pull request
|
||||||
uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
|
id: cpr
|
||||||
with:
|
|
||||||
semver: '^0.${{ steps.minor.outputs.result }}.0'
|
|
||||||
dry_run: no-push
|
|
||||||
|
|
||||||
- name: ⚙️ Update bug report node version dropdown
|
|
||||||
uses: ShaMan123/gha-populate-form-version@be012141ca560dbb92156e3fe098c46035f6260d #v2.0.5
|
|
||||||
with:
|
|
||||||
dropdown: _node_version
|
|
||||||
package: node
|
|
||||||
semver: '>=24.0.0'
|
|
||||||
dry_run: no-push
|
|
||||||
|
|
||||||
- name: 📬 Commit and create pull request
|
|
||||||
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
|
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
|
||||||
with:
|
with:
|
||||||
add-paths: .github/ISSUE_TEMPLATE/bug_report.yml
|
add-paths: .github/ISSUE_TEMPLATE/issue_report.yml
|
||||||
branch: ci-update-bug-report
|
branch: ci/update-issue-form
|
||||||
base: develop
|
base: develop
|
||||||
delete-branch: true
|
delete-branch: true
|
||||||
labels: ⚙️ ci, 🤖 github-actions
|
labels: ⚙️ ci, 🤖 github-actions
|
||||||
title: 'chore(): Update bug report template to match release version'
|
commit-message: "chore: update issue form version dropdown"
|
||||||
|
title: "chore: update issue form version dropdown"
|
||||||
|
# Follows .github/pull_request_template.md so the bot PR isn't flagged by PR validation.
|
||||||
body: |
|
body: |
|
||||||
Automated update to `.github/ISSUE_TEMPLATE/bug_report.yml`
|
# 📦 Pull Request
|
||||||
Triggered by workflow run [${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
|
|
||||||
|
## 📝 Description
|
||||||
|
|
||||||
|
Automated update of the **Streamyfin Version** dropdown in `.github/ISSUE_TEMPLATE/issue_report.yml`, populated from the latest GitHub releases by `scripts/update-issue-form.mjs` (draft releases shown as `X (TestFlight)`).
|
||||||
|
|
||||||
|
**Version dropdown now lists:** ${{ steps.populate.outputs.versions }}
|
||||||
|
|
||||||
|
Triggered by `${{ github.event_name }}`${{ github.event.release.tag_name && format(' — release {0}', github.event.release.tag_name) || '' }} · [run ${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
|
||||||
|
|
||||||
|
## 🏷️ Ticket / Issue
|
||||||
|
|
||||||
|
N/A — automated maintenance.
|
||||||
|
|
||||||
|
### 🖼️ Screenshots / GIFs (if UI)
|
||||||
|
|
||||||
|
N/A — issue-template metadata only, no app UI.
|
||||||
|
|
||||||
|
## ✅ Checklist
|
||||||
|
|
||||||
|
- [x] I’ve read the [contribution guidelines](CONTRIBUTING.md)
|
||||||
|
- [x] Verified that changes behave as expected for all platforms
|
||||||
|
- [x] Code passes lint/formatting and type checks (`tsc`/`biome`)
|
||||||
|
- [x] No secrets, hardcoded credentials, or private config files are included
|
||||||
|
- [x] I've declared if AI was used to assist with this PR (by uncommenting the line at the bottom, or not)
|
||||||
|
|
||||||
|
## 🔍 Testing Instructions
|
||||||
|
|
||||||
|
N/A — generated by CI from published releases; review the dropdown diff in `issue_report.yml`.
|
||||||
|
|
||||||
|
- name: 🔀 Enable auto-merge
|
||||||
|
if: steps.cpr.outputs.pull-request-operation == 'created'
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
run: |
|
||||||
|
gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" \
|
||||||
|
|| echo "::warning::Could not enable auto-merge — enable 'Allow auto-merge' in repo settings (and branch protection); merge the PR manually for now."
|
||||||
|
|||||||
@@ -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/update-issue-form.mjs
Normal file
119
scripts/update-issue-form.mjs
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
#!/usr/bin/env bun
|
||||||
|
/**
|
||||||
|
* Populates the "Streamyfin Version" dropdown in the issue report form with the
|
||||||
|
* latest GitHub releases. Run by the "Update Issue Form Versions" workflow on
|
||||||
|
* release events + a weekly cron (and manually via workflow_dispatch).
|
||||||
|
*
|
||||||
|
* Source: GitHub releases, newest first, INCLUDING drafts and prereleases — those
|
||||||
|
* are the builds release.yml pushes to TestFlight (iOS) / beta (Android), and the
|
||||||
|
* app shows that same version to users. Draft releases are labelled "X (TestFlight)".
|
||||||
|
* Non-version sentinels (e.g. "older") are preserved at the end of the list.
|
||||||
|
*
|
||||||
|
* Usage:
|
||||||
|
* bun scripts/update-issue-form.mjs # rewrite the form in place
|
||||||
|
* ISSUE_FORM_LIMIT=8 bun scripts/update-issue-form.mjs
|
||||||
|
* bun scripts/update-issue-form.mjs --dry-run # print the new options, don't write
|
||||||
|
*
|
||||||
|
* Env: GITHUB_REPOSITORY (owner/repo), GH_TOKEN/GITHUB_TOKEN (for gh, provided in CI).
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { execFileSync } from "node:child_process";
|
||||||
|
import {
|
||||||
|
appendFileSync,
|
||||||
|
readFileSync as read,
|
||||||
|
writeFileSync as write,
|
||||||
|
} from "node:fs";
|
||||||
|
|
||||||
|
const FORM = ".github/ISSUE_TEMPLATE/issue_report.yml";
|
||||||
|
const DROPDOWN_ID = "version"; // the `id:` of the dropdown to populate
|
||||||
|
const parsedLimit = Number.parseInt(process.env.ISSUE_FORM_LIMIT ?? "", 10);
|
||||||
|
const LIMIT =
|
||||||
|
Number.isInteger(parsedLimit) && parsedLimit > 0 ? parsedLimit : 5;
|
||||||
|
const REPO = process.env.GITHUB_REPOSITORY || "streamyfin/streamyfin";
|
||||||
|
const DRY = process.argv.includes("--dry-run");
|
||||||
|
|
||||||
|
// Matches "0.54.1" and prerelease/beta tags like "0.54.0-beta.1".
|
||||||
|
const isVersion = (s) => /^\d+\.\d+/.test(s.trim());
|
||||||
|
|
||||||
|
// 1. Fetch releases (newest first) with their draft flag. Drafts are the builds pushed
|
||||||
|
// to TestFlight (iOS) / beta (Android) by release.yml, so they aren't a full release
|
||||||
|
// yet — we label those "X (TestFlight)". (Listing drafts needs the token to have repo
|
||||||
|
// write access, which the workflow grants.)
|
||||||
|
const raw = execFileSync(
|
||||||
|
"gh",
|
||||||
|
[
|
||||||
|
"api",
|
||||||
|
`repos/${REPO}/releases`,
|
||||||
|
"--paginate",
|
||||||
|
"--jq",
|
||||||
|
".[] | [.tag_name, .draft] | @tsv",
|
||||||
|
],
|
||||||
|
{ encoding: "utf8" },
|
||||||
|
);
|
||||||
|
const seen = new Set();
|
||||||
|
const versions = [];
|
||||||
|
for (const line of raw.split("\n")) {
|
||||||
|
const [tag, draft] = line.split("\t");
|
||||||
|
if (!tag) continue;
|
||||||
|
const ver = tag.trim().replace(/^v/, "");
|
||||||
|
if (!isVersion(ver) || seen.has(ver)) continue;
|
||||||
|
seen.add(ver);
|
||||||
|
versions.push(draft === "true" ? `${ver} (TestFlight)` : ver);
|
||||||
|
if (versions.length >= LIMIT) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!versions.length) {
|
||||||
|
console.error("No release versions found — leaving the form untouched.");
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. rewrite the dropdown options, preserving non-version sentinels (e.g. "older").
|
||||||
|
// The old generic "TestFlight/Development build" entry is dropped — TestFlight
|
||||||
|
// versions are now shown individually as "X (TestFlight)".
|
||||||
|
const lines = read(FORM, "utf8").split("\n");
|
||||||
|
const idIdx = lines.findIndex((l) =>
|
||||||
|
l.match(new RegExp(`^\\s*id:\\s*${DROPDOWN_ID}\\s*$`)),
|
||||||
|
);
|
||||||
|
if (idIdx === -1)
|
||||||
|
throw new Error(`dropdown id: ${DROPDOWN_ID} not found in ${FORM}`);
|
||||||
|
const optIdx = lines.findIndex(
|
||||||
|
(l, i) => i > idIdx && /^\s*options:\s*$/.test(l),
|
||||||
|
);
|
||||||
|
if (optIdx === -1)
|
||||||
|
throw new Error(`options: not found after id: ${DROPDOWN_ID}`);
|
||||||
|
|
||||||
|
const itemIndent = lines[optIdx].match(/^\s*/)[0] + " "; // options items are nested one level deeper
|
||||||
|
let end = optIdx + 1;
|
||||||
|
const sentinels = [];
|
||||||
|
while (end < lines.length && /^\s*-\s+/.test(lines[end])) {
|
||||||
|
const val = lines[end].replace(/^\s*-\s+/, "");
|
||||||
|
if (!isVersion(val) && !/testflight/i.test(val)) sentinels.push(val);
|
||||||
|
end++;
|
||||||
|
}
|
||||||
|
|
||||||
|
const newOptions = [...versions, ...sentinels].map(
|
||||||
|
(v) => `${itemIndent}- ${v}`,
|
||||||
|
);
|
||||||
|
const updated = [
|
||||||
|
...lines.slice(0, optIdx + 1),
|
||||||
|
...newOptions,
|
||||||
|
...lines.slice(end),
|
||||||
|
].join("\n");
|
||||||
|
|
||||||
|
console.log(
|
||||||
|
`Versions: ${versions.join(", ")}${sentinels.length ? ` | kept: ${sentinels.join(", ")}` : ""}`,
|
||||||
|
);
|
||||||
|
if (DRY) {
|
||||||
|
console.log("--dry-run: not writing.");
|
||||||
|
} else {
|
||||||
|
write(FORM, updated);
|
||||||
|
console.log(`Updated ${FORM}.`);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expose the resulting list for the workflow (PR description).
|
||||||
|
if (process.env.GITHUB_OUTPUT) {
|
||||||
|
appendFileSync(
|
||||||
|
process.env.GITHUB_OUTPUT,
|
||||||
|
`versions=${versions.join(", ")}\n`,
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -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