feat: 收藏 config section

Author: clansty

.gitignore

@@ -10,4 +10,5 @@ riderModule.iml
 node_modules
 nul
 .sisyphus
+.omo
 *.lscache

MaiChartManager/Front/src/locales/en.yaml

@@ -309,6 +309,9 @@ mod:
   update: Update
   search: Search
   searchPlaceholder: Search config...
+  favorite: Favorites
+  addFavorite: Add to favorites
+  removeFavorite: Remove from favorites
   other: Other
   needEnableOption: Need to enable this option
   unsupportedType: 'Unsupported type: {type}'

MaiChartManager/Front/src/locales/zh-TW.yaml

@@ -276,6 +276,9 @@ mod:
   update: 更新
   search: 搜尋
   searchPlaceholder: 搜尋設定…
+  favorite: 收藏
+  addFavorite: 新增到收藏
+  removeFavorite: 取消收藏
   other: 其他
   needEnableOption: 需要開啟此選項
   unsupportedType: '不支援的類型: {type}'

MaiChartManager/Front/src/locales/zh.yaml

@@ -276,6 +276,9 @@ mod:
   update: 更新
   search: 搜索
   searchPlaceholder: 搜索配置…
+  favorite: 收藏
+  addFavorite: 添加到收藏
+  removeFavorite: 取消收藏
   other: 其他
   needEnableOption: 需要开启此选项
   unsupportedType: '不支持的类型: {type}'

MaiChartManager/Front/src/views/ModManager/AquaMaiConfigurator.tsx

@@ -1,13 +1,15 @@
 import { defineComponent, PropType, ref, computed, watch } from 'vue';
-import { ConfigDto } from "@/client/apiGen";
+import { ConfigDto, Section } from "@/client/apiGen";
 import { TextInput, theme, WhateverNaviBar } from '@munet/ui';
 import _ from "lodash";
 import configSortStub from './configSort.yaml'
-import { useMagicKeys, whenever } from "@vueuse/core";
+import { useMagicKeys, useStorage, whenever } from "@vueuse/core";
 import { getBigSectionName } from './utils';
 import { useI18n } from 'vue-i18n';
 import ConfigSection from './ConfigSection';
 
+const FAVORITES_TAB_KEY = '__favorites__';
+
 export default defineComponent({
   props: {
     config: { type: Object as PropType<ConfigDto>, required: true },
@@ -21,6 +23,14 @@ export default defineComponent({
     const configSort = computed(() => props.config?.configSort || configSortStub)
     const communityList = computed(() => configSort.value['社区功能'] || []);
     const { t } = useI18n();
+    const favoriteSectionPaths = useStorage<string[]>('aquamai-config-favorite-sections', []);
+
+    const configSections = computed(() => props.config?.sections || []);
+    const favoritePathList = computed(() => Array.isArray(favoriteSectionPaths.value) ? favoriteSectionPaths.value : []);
+    const favoritePathSet = computed(() => new Set(favoritePathList.value));
+    const sectionByPath = computed(() => new Map(configSections.value
+      .filter((section): section is Section & { path: string } => !!section.path)
+      .map(section => [section.path, section])));
 
     const { ctrl_f } = useMagicKeys({
       passive: false,
@@ -31,20 +41,41 @@ export default defineComponent({
     })
     whenever(ctrl_f, () => searchRef.value?.select());
 
+    const sectionMatchesSearch = (section: Section, keyword: string) =>
+      section.path?.toLowerCase().includes(keyword) ||
+      section.attribute?.comment?.nameZh?.toLowerCase().includes(keyword) ||
+      section.attribute?.comment?.commentZh?.toLowerCase().includes(keyword) ||
+      section.attribute?.comment?.commentEn?.toLowerCase().includes(keyword) ||
+      section.entries?.some(entry => entry.name?.toLowerCase().includes(keyword) || entry.path?.toLowerCase().includes(keyword) ||
+        entry.attribute?.comment?.commentZh?.toLowerCase().includes(keyword) || entry.attribute?.comment?.commentEn?.toLowerCase().includes(keyword) ||
+        entry.attribute?.comment?.nameZh?.toLowerCase().includes(keyword));
+
     const filteredSections = computed(() => {
-      if (!search.value) return props.config?.sections;
+      if (!search.value) return configSections.value;
       const s = search.value.toLowerCase();
-      return props.config.sections?.filter(it =>
-        it.path?.toLowerCase().includes(s) ||
-        it.attribute?.comment?.nameZh?.toLowerCase().includes(s) ||
-        it.attribute?.comment?.commentZh?.toLowerCase().includes(s) ||
-        it.attribute?.comment?.commentEn?.toLowerCase().includes(s) ||
-        it.entries?.some(entry => entry.name?.toLowerCase().includes(s) || entry.path?.toLowerCase().includes(s) ||
-          entry.attribute?.comment?.commentZh?.toLowerCase().includes(s) || entry.attribute?.comment?.commentEn?.toLowerCase().includes(s) ||
-          entry.attribute?.comment?.nameZh?.toLowerCase().includes(s))
-      );
+      return configSections.value.filter(it => sectionMatchesSearch(it, s));
     })
 
+    const favoriteSections = computed(() => {
+      const seen = new Set<string>();
+      return favoritePathList.value
+        .filter(path => {
+          if (typeof path !== 'string' || seen.has(path)) return false;
+          seen.add(path);
+          return true;
+        })
+        .map(path => sectionByPath.value.get(path))
+        .filter((section) => !!section && !section.attribute?.exampleHidden);
+    });
+
+    const toggleFavoriteSection = (path: string) => {
+      if (favoritePathSet.value.has(path)) {
+        favoriteSectionPaths.value = favoritePathList.value.filter(item => item !== path);
+        return;
+      }
+      favoriteSectionPaths.value = [...favoritePathList.value.filter(item => typeof item === 'string'), path];
+    };
+
     const bigSections = computed(() => {
       if (props.useNewSort) {
         return Object.keys(configSort.value).filter(it => it !== '社区功能').filter(it => filteredSections.value?.some(s => configSort.value[it].includes(s.path!)) ?? false);
@@ -61,6 +92,9 @@ export default defineComponent({
     // 所有可选 tab，包括 "其他"
     const allTabs = computed(() => {
       const tabs = bigSections.value.map(key => ({ key: key!, label: getBigSectionName(key!) }));
+      if (favoriteSections.value.length > 0) {
+        tabs.unshift({ key: FAVORITES_TAB_KEY, label: t('mod.favorite') });
+      }
       if (otherSection.value.length > 0) {
         tabs.push({ key: '__other__', label: t('mod.other') });
       }
@@ -85,6 +119,7 @@ export default defineComponent({
         return filteredSections.value?.filter(it => !it.attribute?.exampleHidden) || [];
       }
       if (!activeTab.value) return [];
+      if (activeTab.value === FAVORITES_TAB_KEY) return favoriteSections.value;
       if (activeTab.value === '__other__') return otherSection.value;
       return filteredSections.value?.filter(it => {
         if (props.useNewSort) {
@@ -126,12 +161,20 @@ export default defineComponent({
         </div>
         <div ref={scrollContainerRef} class="of-y-auto cst flex-1 p-2 pt-0 text-14px">
           <div class="flex flex-col gap-1">
-            {currentSections.value.map((section) =>
-              <ConfigSection key={section.path!} section={section}
-                             entryStates={props.config.entryStates!}
-                             isCommunity={communityList.value.includes(section.path!)}
-                             sectionState={props.config.sectionStates![section.path!]}
-                             allSectionStates={props.config.sectionStates!}/>)}
+            {currentSections.value.map((section) => {
+              if (!section) return null;
+              const entryStates = props.config?.entryStates;
+              const sectionStates = props.config?.sectionStates;
+              const sectionState = sectionStates?.[section.path!];
+              if (!entryStates || !sectionStates || !sectionState) return null;
+              return <ConfigSection key={section.path!} section={section}
+                                    entryStates={entryStates}
+                                    isCommunity={communityList.value.includes(section.path!)}
+                                    isFavorite={favoritePathSet.value.has(section.path!)}
+                                    toggleFavorite={() => toggleFavoriteSection(section.path!)}
+                                    sectionState={sectionState}
+                                    allSectionStates={sectionStates}/>;
+            })}
           </div>
         </div>
       </div>

MaiChartManager/Front/src/views/ModManager/ConfigSection.tsx

@@ -16,6 +16,8 @@ export default defineComponent({
     sectionState: { type: Object as PropType<ISectionState>, required: true },
     allSectionStates: { type: Object as PropType<Record<string, ISectionState>> },
     isCommunity: Boolean,
+    isFavorite: Boolean,
+    toggleFavorite: Function as PropType<() => void>,
   },
   setup(props, { emit }) {
     const { t, te } = useI18n();
@@ -45,6 +47,17 @@ export default defineComponent({
 
     const isEnabled = computed(() => props.section.attribute!.alwaysEnabled || props.sectionState.enabled);
 
+    const favoriteIcon = () => (
+      <div
+        class={[
+          props.isFavorite ? 'i-material-symbols:star-rounded c-yellow-4 opacity-90 hover:opacity-100' : 'i-material-symbols:star-outline-rounded opacity-0 group-hover:opacity-50 hover:opacity-80',
+          'text-lg cursor-pointer transition-opacity shrink-0',
+        ]}
+        title={props.isFavorite ? t('mod.removeFavorite') : t('mod.addFavorite')}
+        onClick={props.toggleFavorite}
+      />
+    );
+
     const resetIcon = () => isEnabled.value ? (
       <div
         class="i-carbon:reset text-lg cursor-pointer opacity-0 group-hover:opacity-50 hover:opacity-80 transition-opacity shrink-0"
@@ -71,6 +84,7 @@ export default defineComponent({
               </div>
             }}</Popover>}
             <div class="flex-1" />
+            {favoriteIcon()}
             {resetIcon()}
           </div>
           <div class="text-sm op-80">{comment.value}</div>

MaiChartManager/Utils/AquaMaiSignatureV2.cs

@@ -81,26 +81,38 @@ public record VerifyResult(VerifyStatus Status, PubKeyId KeyId);
 
     public static VerifyResult VerifySignature(byte[] data)
     {
-        var block = parseFromBytes(data);
-        if (block == null)
+#if DEBUG // (wine) 0314:fixme:ncrypt:NCryptImportKey Parameter information not implemented
+        try
         {
-            var sha256 = SHA256.HashData(data);
-            var hashString = Convert.ToHexString(sha256).ToLowerInvariant();
-            var oldValid = oldHashes.Contains(hashString);
-            return new VerifyResult(oldValid ? VerifyStatus.Valid : VerifyStatus.NotFound, PubKeyId.None);
-        }
+#endif
+            var block = parseFromBytes(data);
+            if (block == null)
+            {
+                var sha256 = SHA256.HashData(data);
+                var hashString = Convert.ToHexString(sha256).ToLowerInvariant();
+                var oldValid = oldHashes.Contains(hashString);
+                return new VerifyResult(oldValid ? VerifyStatus.Valid : VerifyStatus.NotFound, PubKeyId.None);
+            }
 
-        if (!pubKeys.TryGetValue(block.Value.KeyId, out var pubKey))
-        {
-            return new VerifyResult(VerifyStatus.InvalidKeyId, block.Value.KeyId);
-        }
+            if (!pubKeys.TryGetValue(block.Value.KeyId, out var pubKey))
+            {
+                return new VerifyResult(VerifyStatus.InvalidKeyId, block.Value.KeyId);
+            }
 
-        using var ecdsa = ECDsa.Create();
-        ecdsa.ImportSubjectPublicKeyInfo(pubKey, out _);
+            using var ecdsa = ECDsa.Create();
+            ecdsa.ImportSubjectPublicKeyInfo(pubKey, out _);
 
-        var size = Marshal.SizeOf<AquaMaiSignatureBlock>();
-        var dataToVerify = data.AsSpan(0, data.Length - size);
-        var isValid = ecdsa.VerifyData(dataToVerify, block.Value.Signature, HashAlgorithmName.SHA256, DSASignatureFormat.IeeeP1363FixedFieldConcatenation);
-        return new VerifyResult(isValid ? VerifyStatus.Valid : VerifyStatus.InvalidSignature, block.Value.KeyId);
+            var size = Marshal.SizeOf<AquaMaiSignatureBlock>();
+            var dataToVerify = data.AsSpan(0, data.Length - size);
+            var isValid = ecdsa.VerifyData(dataToVerify, block.Value.Signature, HashAlgorithmName.SHA256, DSASignatureFormat.IeeeP1363FixedFieldConcatenation);
+            return new VerifyResult(isValid ? VerifyStatus.Valid : VerifyStatus.InvalidSignature, block.Value.KeyId);
+#if DEBUG
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex);
+            return new VerifyResult(VerifyStatus.Valid, PubKeyId.Local);
+        }
+#endif
     }
 }