From 338c332743d9c500041d44c9472f1aefb919db25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=80=E1=B4=8D=E1=B4=9B=E1=B4=8F=E1=B4=80=E1=B4=87?=
 =?UTF-8?q?=CA=80?= <amtoaer@gmail.com>
Date: Mon, 13 Jul 2026 10:41:37 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=B8=83=E5=B1=80=E5=92=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20(#729)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crates/bili_sync/build.rs                     |   1 +
 .../components/filter-option-editor.svelte    | 339 +++++++++---------
 web/src/routes/settings/+page.svelte          |  24 +-
 web/src/routes/video-sources/+page.svelte     |  25 +-
 4 files changed, 198 insertions(+), 191 deletions(-)

diff --git a/crates/bili_sync/build.rs b/crates/bili_sync/build.rs
index d8f91cb..5881cba 100644
--- a/crates/bili_sync/build.rs
+++ b/crates/bili_sync/build.rs
@@ -1,3 +1,4 @@
 fn main() {
+    println!("cargo::rerun-if-changed=../../web/build");
     built::write_built_file().expect("Failed to acquire build-time information");
 }
diff --git a/web/src/lib/components/filter-option-editor.svelte b/web/src/lib/components/filter-option-editor.svelte
index 5b7df12..ad9d981 100644
--- a/web/src/lib/components/filter-option-editor.svelte
+++ b/web/src/lib/components/filter-option-editor.svelte
@@ -10,174 +10,179 @@
 		$props();
 </script>
 
-<div class="space-y-4">
-	<Label>流质量过滤</Label>
-	<div class="grid grid-cols-1 gap-6 lg:grid-cols-2">
-		<div class="space-y-2">
-			<Label for="video-max-quality">最高视频质量</Label>
-			<select
-				id="video-max-quality"
-				class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
-				bind:value={value.video_max_quality}
-				{disabled}
-			>
-				<option value="Quality360p">360p</option>
-				<option value="Quality480p">480p</option>
-				<option value="Quality720p">720p</option>
-				<option value="Quality1080p">1080p</option>
-				<option value="Quality1080pPLUS">1080p+</option>
-				<option value="Quality1080p60">1080p60</option>
-				<option value="Quality4k">4K</option>
-				<option value="QualityHdr">HDR</option>
-				<option value="QualityDolby">杜比视界</option>
-				<option value="Quality8k">8K</option>
-			</select>
-		</div>
-		<div class="space-y-2">
-			<Label for="video-min-quality">最低视频质量</Label>
-			<select
-				id="video-min-quality"
-				class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
-				bind:value={value.video_min_quality}
-				{disabled}
-			>
-				<option value="Quality360p">360p</option>
-				<option value="Quality480p">480p</option>
-				<option value="Quality720p">720p</option>
-				<option value="Quality1080p">1080p</option>
-				<option value="Quality1080pPLUS">1080p+</option>
-				<option value="Quality1080p60">1080p60</option>
-				<option value="Quality4k">4K</option>
-				<option value="QualityHdr">HDR</option>
-				<option value="QualityDolby">杜比视界</option>
-				<option value="Quality8k">8K</option>
-			</select>
-		</div>
-		<div class="space-y-2">
-			<Label for="audio-max-quality">最高音频质量</Label>
-			<select
-				id="audio-max-quality"
-				class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
-				bind:value={value.audio_max_quality}
-				{disabled}
-			>
-				<option value="Quality64k">64k</option>
-				<option value="Quality132k">132k</option>
-				<option value="Quality192k">192k</option>
-				<option value="QualityDolby">杜比全景声</option>
-				<option value="QualityHiRES">Hi-RES</option>
-			</select>
-		</div>
-		<div class="space-y-2">
-			<Label for="audio-min-quality">最低音频质量</Label>
-			<select
-				id="audio-min-quality"
-				class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
-				bind:value={value.audio_min_quality}
-				{disabled}
-			>
-				<option value="Quality64k">64k</option>
-				<option value="Quality132k">132k</option>
-				<option value="Quality192k">192k</option>
-				<option value="QualityDolby">杜比全景声</option>
-				<option value="QualityHiRES">Hi-RES</option>
-			</select>
-		</div>
-	</div>
-</div>
-
-<Separator />
-
-<div class="space-y-4">
-	<Label>视频编码格式偏好（按优先级排序）</Label>
-	<p class="text-muted-foreground text-sm">排在前面的编码格式优先级更高</p>
-	<div class="space-y-2">
-		{#each value.codecs as codec, index (index)}
-			<div class="flex items-center space-x-2 rounded-lg border p-3">
-				<Badge variant="secondary">{index + 1}</Badge>
-				<span class="flex-1 font-medium">{codec}</span>
-				<div class="flex space-x-1">
-					<Button
-						type="button"
-						size="sm"
-						variant="outline"
-						disabled={disabled || index === 0}
-						onclick={() => {
-							const codecs = [...value.codecs];
-							[codecs[index - 1], codecs[index]] = [codecs[index], codecs[index - 1]];
-							value.codecs = codecs;
-						}}
-					>
-						↑
-					</Button>
-					<Button
-						type="button"
-						size="sm"
-						variant="outline"
-						disabled={disabled || index === value.codecs.length - 1}
-						onclick={() => {
-							const codecs = [...value.codecs];
-							[codecs[index], codecs[index + 1]] = [codecs[index + 1], codecs[index]];
-							value.codecs = codecs;
-						}}
-					>
-						↓
-					</Button>
-					<Button
-						type="button"
-						size="sm"
-						variant="destructive"
-						{disabled}
-						onclick={() => (value.codecs = value.codecs.filter((_, i) => i !== index))}
-					>
-						×
-					</Button>
-				</div>
-			</div>
-		{/each}
-
-		{#if value.codecs.length < 3}
+<div class="space-y-6">
+	<div class="space-y-4">
+		<Label>流质量过滤</Label>
+		<p class="text-muted-foreground text-sm">
+			根据质量过滤视频音频流，条件过于严苛可能导致视频无可用流
+		</p>
+		<div class="grid grid-cols-1 gap-6 lg:grid-cols-2">
 			<div class="space-y-2">
-				<Label>添加编码格式</Label>
-				<div class="flex gap-2">
-					{#each ['AV1', 'HEV', 'AVC'] as codec (codec)}
-						{#if !value.codecs.includes(codec)}
-							<Button
-								type="button"
-								size="sm"
-								variant="outline"
-								{disabled}
-								onclick={() => (value.codecs = [...value.codecs, codec])}
-							>
-								+ {codec}
-							</Button>
-						{/if}
-					{/each}
-				</div>
+				<Label for="video-max-quality">最高视频质量</Label>
+				<select
+					id="video-max-quality"
+					class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+					bind:value={value.video_max_quality}
+					{disabled}
+				>
+					<option value="Quality360p">360p</option>
+					<option value="Quality480p">480p</option>
+					<option value="Quality720p">720p</option>
+					<option value="Quality1080p">1080p</option>
+					<option value="Quality1080pPLUS">1080p+</option>
+					<option value="Quality1080p60">1080p60</option>
+					<option value="Quality4k">4K</option>
+					<option value="QualityHdr">HDR</option>
+					<option value="QualityDolby">杜比视界</option>
+					<option value="Quality8k">8K</option>
+				</select>
 			</div>
-		{/if}
-	</div>
-</div>
-
-<Separator />
-
-<div class="space-y-4">
-	<Label>特殊流排除选项</Label>
-	<p class="text-muted-foreground text-sm">排除某些类型的特殊流</p>
-	<div class="flex items-center space-x-2">
-		<Switch id="no-dolby-video" bind:checked={value.no_dolby_video} {disabled} />
-		<Label for="no-dolby-video">排除杜比视界视频</Label>
-	</div>
-	<div class="flex items-center space-x-2">
-		<Switch id="no-dolby-audio" bind:checked={value.no_dolby_audio} {disabled} />
-		<Label for="no-dolby-audio">排除杜比全景声音频</Label>
-	</div>
-	<div class="flex items-center space-x-2">
-		<Switch id="no-hdr" bind:checked={value.no_hdr} {disabled} />
-		<Label for="no-hdr">排除HDR视频</Label>
-	</div>
-	<div class="flex items-center space-x-2">
-		<Switch id="no-hires" bind:checked={value.no_hires} {disabled} />
-		<Label for="no-hires">排除Hi-RES音频</Label>
+			<div class="space-y-2">
+				<Label for="video-min-quality">最低视频质量</Label>
+				<select
+					id="video-min-quality"
+					class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+					bind:value={value.video_min_quality}
+					{disabled}
+				>
+					<option value="Quality360p">360p</option>
+					<option value="Quality480p">480p</option>
+					<option value="Quality720p">720p</option>
+					<option value="Quality1080p">1080p</option>
+					<option value="Quality1080pPLUS">1080p+</option>
+					<option value="Quality1080p60">1080p60</option>
+					<option value="Quality4k">4K</option>
+					<option value="QualityHdr">HDR</option>
+					<option value="QualityDolby">杜比视界</option>
+					<option value="Quality8k">8K</option>
+				</select>
+			</div>
+			<div class="space-y-2">
+				<Label for="audio-max-quality">最高音频质量</Label>
+				<select
+					id="audio-max-quality"
+					class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+					bind:value={value.audio_max_quality}
+					{disabled}
+				>
+					<option value="Quality64k">64k</option>
+					<option value="Quality132k">132k</option>
+					<option value="Quality192k">192k</option>
+					<option value="QualityDolby">杜比全景声</option>
+					<option value="QualityHiRES">Hi-RES</option>
+				</select>
+			</div>
+			<div class="space-y-2">
+				<Label for="audio-min-quality">最低音频质量</Label>
+				<select
+					id="audio-min-quality"
+					class="border-input bg-background ring-offset-background placeholder:text-muted-foreground focus-visible:ring-ring flex h-10 w-full rounded-md border px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+					bind:value={value.audio_min_quality}
+					{disabled}
+				>
+					<option value="Quality64k">64k</option>
+					<option value="Quality132k">132k</option>
+					<option value="Quality192k">192k</option>
+					<option value="QualityDolby">杜比全景声</option>
+					<option value="QualityHiRES">Hi-RES</option>
+				</select>
+			</div>
+		</div>
+	</div>
+
+	<Separator />
+
+	<div class="space-y-4">
+		<Label>视频编码格式偏好（按优先级排序）</Label>
+		<p class="text-muted-foreground text-sm">排在前面的编码格式优先级更高</p>
+		<div class="space-y-2">
+			{#each value.codecs as codec, index (index)}
+				<div class="flex items-center space-x-2 rounded-lg border p-3">
+					<Badge variant="secondary">{index + 1}</Badge>
+					<span class="flex-1 font-medium">{codec}</span>
+					<div class="flex space-x-1">
+						<Button
+							type="button"
+							size="sm"
+							variant="outline"
+							disabled={disabled || index === 0}
+							onclick={() => {
+								const codecs = [...value.codecs];
+								[codecs[index - 1], codecs[index]] = [codecs[index], codecs[index - 1]];
+								value.codecs = codecs;
+							}}
+						>
+							↑
+						</Button>
+						<Button
+							type="button"
+							size="sm"
+							variant="outline"
+							disabled={disabled || index === value.codecs.length - 1}
+							onclick={() => {
+								const codecs = [...value.codecs];
+								[codecs[index], codecs[index + 1]] = [codecs[index + 1], codecs[index]];
+								value.codecs = codecs;
+							}}
+						>
+							↓
+						</Button>
+						<Button
+							type="button"
+							size="sm"
+							variant="destructive"
+							{disabled}
+							onclick={() => (value.codecs = value.codecs.filter((_, i) => i !== index))}
+						>
+							×
+						</Button>
+					</div>
+				</div>
+			{/each}
+
+			{#if value.codecs.length < 3}
+				<div class="space-y-2">
+					<Label>添加编码格式</Label>
+					<div class="flex gap-2">
+						{#each ['AV1', 'HEV', 'AVC'] as codec (codec)}
+							{#if !value.codecs.includes(codec)}
+								<Button
+									type="button"
+									size="sm"
+									variant="outline"
+									{disabled}
+									onclick={() => (value.codecs = [...value.codecs, codec])}
+								>
+									+ {codec}
+								</Button>
+							{/if}
+						{/each}
+					</div>
+				</div>
+			{/if}
+		</div>
+	</div>
+
+	<Separator />
+
+	<div class="space-y-4">
+		<Label>特殊流排除选项</Label>
+		<p class="text-muted-foreground text-sm">排除某些类型的特殊流</p>
+		<div class="flex items-center space-x-2">
+			<Switch id="no-dolby-video" bind:checked={value.no_dolby_video} {disabled} />
+			<Label for="no-dolby-video">排除杜比视界视频</Label>
+		</div>
+		<div class="flex items-center space-x-2">
+			<Switch id="no-dolby-audio" bind:checked={value.no_dolby_audio} {disabled} />
+			<Label for="no-dolby-audio">排除杜比全景声音频</Label>
+		</div>
+		<div class="flex items-center space-x-2">
+			<Switch id="no-hdr" bind:checked={value.no_hdr} {disabled} />
+			<Label for="no-hdr">排除HDR视频</Label>
+		</div>
+		<div class="flex items-center space-x-2">
+			<Switch id="no-hires" bind:checked={value.no_hires} {disabled} />
+			<Label for="no-hires">排除Hi-RES音频</Label>
+		</div>
 	</div>
 </div>
diff --git a/web/src/routes/settings/+page.svelte b/web/src/routes/settings/+page.svelte
index 1596aea..aab7d48 100644
--- a/web/src/routes/settings/+page.svelte
+++ b/web/src/routes/settings/+page.svelte
@@ -609,17 +609,6 @@
 				<!-- 通知设置 -->
 				<Tabs.Content value="notifiers" class="mt-6 space-y-6">
 					<div class="space-y-4">
-						<div class="flex items-center justify-between rounded-lg border p-4">
-							<div class="space-y-1">
-								<Label for="ignore-common-errors">忽略常见错误</Label>
-								<p class="text-muted-foreground text-sm">
-									b 站接口频繁出现 -503
-									服务暂不可用，在通知器内通知容易刷屏，开启该选项以忽略此错误通知
-								</p>
-							</div>
-							<Switch id="ignore-common-errors" bind:checked={formData.ignore_common_errors} />
-						</div>
-
 						<div class="flex items-center justify-between">
 							<div>
 								<h3 class="text-lg font-semibold">通知器管理</h3>
@@ -678,6 +667,19 @@
 							</div>
 						{/if}
 					</div>
+
+					<Separator />
+
+					<div class="flex items-center justify-between rounded-lg border p-4">
+						<div class="space-y-1">
+							<Label for="ignore-common-errors">忽略常见错误</Label>
+							<p class="text-muted-foreground text-sm">
+								接口偶发 -503 服务暂不可用或 -504
+								服务调用超时，在通知器内容易刷屏，开启该选项以忽略此类错误通知
+							</p>
+						</div>
+						<Switch id="ignore-common-errors" bind:checked={formData.ignore_common_errors} />
+					</div>
 				</Tabs.Content>
 
 				<!-- 高级设置 -->
diff --git a/web/src/routes/video-sources/+page.svelte b/web/src/routes/video-sources/+page.svelte
index b18de5e..ffc2471 100644
--- a/web/src/routes/video-sources/+page.svelte
+++ b/web/src/routes/video-sources/+page.svelte
@@ -607,23 +607,22 @@
 					</div>
 				{/if}
 
-				<div class="space-y-4">
-					<div class="flex items-center space-x-2">
-						<Switch bind:checked={useCustomFilterOption} />
-						<div>
-							<Label class="text-sm font-medium">使用自定义流过滤设置</Label>
-							<p class="text-muted-foreground text-sm">关闭时继承全局过滤设置</p>
-						</div>
-					</div>
-					{#if editFilterOption}
-						<FilterOptionEditor bind:value={editFilterOption} disabled={!useCustomFilterOption} />
-					{/if}
-				</div>
-
 				<!-- 规则编辑器 -->
 				<div>
 					<RuleEditor rule={editForm.rule} onRuleChange={(rule) => (editForm.rule = rule)} />
 				</div>
+
+				<div class="space-y-4">
+					<div class="flex items-center space-x-2">
+						<Switch bind:checked={useCustomFilterOption} />
+						<Label class="text-sm font-medium">覆盖全局流设置</Label>
+					</div>
+					{#if editFilterOption}
+						<div class="border-muted ml-3 border-l-2 pl-6">
+							<FilterOptionEditor bind:value={editFilterOption} disabled={!useCustomFilterOption} />
+						</div>
+					{/if}
+				</div>
 			</div>
 			<div class="mt-8 flex justify-end gap-3">
 				<Button variant="outline" onclick={() => (showEditDialog = false)} disabled={saving}>