feat: updated official_info structure

apps/directory/src/routes/path/Home.jsx

@@ -21,7 +21,7 @@ const voiceOnAtom = atomWithStorage('voiceOn', false)
 let lastVoiceState = 'ended'
 
 export default function Home() {
-    // eslint-disable-next-line no-unused-vars
+    // eslint-disable-next-line
     const _trackEvt = useInsight()
     const { setTitle, setTabs, currentTab, setHeaderIcon, setFastNavigation } =
         useHeader()
@@ -190,15 +190,14 @@ export default function Home() {
                                 <section
                                     className={`${classes['styled-selection']}`}
                                 >
-                                    {officialUpdate.dates
+                                    {officialUpdate.info
-                                        .reduce((acc, cur) => {
+                                        .filter(
-                                            const op = officialUpdate.info[cur]
+                                            (e) =>
-                                            return [...acc, ...op]
+                                                !operators.find(
-                                        }, [])
+                                                    (o) =>
-                                        .slice(
+                                                        o.official_id ===
-                                            0,
+                                                        e.id.toString()
-                                            officialUpdate.length -
+                                                )
-                                                operators.length
                                         )
                                         .map((entry, index) => {
                                             return (
@@ -251,12 +250,21 @@ export default function Home() {
                                                                         classes.title
                                                                     }
                                                                 >
-                                                                    {
+                                                                    {language ===
+                                                                    'zh-CN'
+                                                                        ? entry.type ===
+                                                                          'skin'
+                                                                            ? `${
                                                                                   entry
-                                                                            .codename[
+                                                                                      .skinName[
-                                                                            language
+                                                                                      'zh-CN'
                                                                                   ]
-                                                                    }
+                                                                              } · ${entry.operatorName}`
+                                                                            : entry.operatorName
+                                                                        : entry
+                                                                              .skinName[
+                                                                              'en-US'
+                                                                          ]}
                                                                 </section>
                                                                 <section
                                                                     className={

packages/official-info/index.ts

@@ -4,10 +4,10 @@ import { file } from '@aklive2d/libs'
 import config from '@aklive2d/config'
 import type {
     OfficialArray,
-    OfficialInfo,
+    OfficialInfoV2,
     OfficialOperatorInfo,
     OfficialInfoMapping,
-    OfficialInfoOperatorConfig,
+    OfficialInfoOperatorConfigV2,
 } from './types'
 
 const AUTO_UPDATE_FOLDER = path.resolve(
@@ -39,70 +39,64 @@ export const update = async () => {
     if (!data) throw new Error('No data found')
     const rows = (data as OfficialArray)[0][3].initialData
 
-    const dict: OfficialInfo = {
+    const dict: OfficialInfoV2 = {
         length: rows.length,
         dates: [],
-        info: {},
+        info: [],
     }
 
     let current_displayTime = rows[0].displayTime
-    let current_block = []
 
     for (const row of rows) {
         const displayTime = row.displayTime
         if (displayTime !== current_displayTime) {
-            dict.info[current_displayTime] = current_block
             dict.dates.push(current_displayTime)
             current_displayTime = row.displayTime
-            current_block = []
         }
-        current_block.push(get_row(row))
+        dict.info.push(get_row(row, current_displayTime))
     }
-    dict.info[current_displayTime] = current_block
     dict.dates.push(current_displayTime)
 
     file.writeSync(JSON.stringify(dict, null, 4), OFFICIAL_INFO_JSON)
 }
 
-const get_row = (row: OfficialOperatorInfo): OfficialInfoOperatorConfig => {
+const get_row = (
+    row: OfficialOperatorInfo,
+    date: string
+): OfficialInfoOperatorConfigV2 => {
     const type = row.type
-    let codename_zhCN, item_type: 'operator' | 'skin'
+    let item_type: 'operator' | 'skin'
     switch (type) {
         case 0:
-            codename_zhCN = row.charName
             item_type = 'operator'
             break
         case 1:
-            codename_zhCN = row.suitName + ' · ' + row.charName
             item_type = 'skin'
             break
         default:
             throw 'unknown type'
     }
     return {
-        codename: {
+        operatorName: row.charName,
-            'zh-CN': codename_zhCN,
+        skinName: {
+            'zh-CN': row.suitName,
             'en-US': row.codename,
         },
         type: item_type,
         link: `https://ak.hypergryph.com/archive/dynamicCompile/${row.cid}.html`,
-        id: row.cid,
+        id: Number(row.cid),
+        date,
     }
 }
 
 const generateMapping = () => {
     const mapping: OfficialInfoMapping = {}
-    const content = file.readSync(OFFICIAL_INFO_JSON)
+    const content = file.readSync(OFFICIAL_INFO_JSON) as string
     if (!content) throw new Error('Failed to read official info JSON')
-    const data: OfficialInfo = JSON.parse(content)
+    const data: OfficialInfoV2 = JSON.parse(content)
     if (!data) throw new Error('Failed to parse official info JSON')
-    Object.keys(data.info).forEach((date) => {
+    data.info.forEach((e) => {
-        data.info[date].forEach((operator) => {
+        mapping[e.id] = e
-            mapping[operator.id] = {
-                date,
-                ...operator,
-            }
-        })
     })
     return mapping
 }

packages/official-info/types.ts

@@ -21,30 +21,8 @@ type UnrelatedDataArray = ['$', string, null, unknown]
 
 export type OfficialArray = [OfficialDataArray, UnrelatedDataArray]
 
-export type OfficialInfo = {
-    length: number
-    dates: string[]
-    info: {
-        [date: string]: OfficialInfoOperatorConfig[]
-    }
-}
-
-export interface OfficialInfoOperatorConfig {
-    codename: {
-        'zh-CN': string
-        'en-US': string
-    }
-    type: 'operator' | 'skin'
-    link: string
-    id: string
-}
-
-export interface OperatorConfig extends OfficialInfoOperatorConfig {
-    date: string
-}
-
 export type OfficialInfoMapping = {
-    [id: string]: OperatorConfig
+    [id: string]: OfficialInfoOperatorConfigV2
 }
 
 export type OfficialInfoV2 = {

packages/operator/index.ts

@@ -145,8 +145,8 @@ const generateMapping = () => {
             const type = operatorInfo.type
             const name =
                 type === 'skin'
-                    ? operatorInfo.codename['zh-CN'].split(' · ')[0]
+                    ? operatorInfo.skinName['zh-CN']
-                    : operatorInfo.codename['en-US']
+                    : operatorInfo.skinName['en-US']
             const skinEntry = findSkinEntry(skinTable, name, type)
             operator.filename = skinEntry.dynIllustId.replace(/_2$/, '')
             operator.fallback_name =

packages/operator/libs/initer.ts

@@ -31,8 +31,8 @@ export const init = (name: string, id: string) => {
     try {
         const entryName =
             currentOpertor.type === 'skin'
-                ? currentOpertor.codename['zh-CN'].split(' · ')[0]
+                ? currentOpertor.skinName['zh-CN']
-                : currentOpertor.codename['en-US']
+                : currentOpertor.skinName['en-US']
         const skinEntry = findSkinEntry(
             skinTable,
             entryName,
@@ -41,7 +41,16 @@ export const init = (name: string, id: string) => {
         template.codename = findCodename(skinEntry, currentOpertor)
     } catch (e: unknown) {
         console.log(e as string)
-        template.codename = currentOpertor.codename
+        template.codename =
+            currentOpertor.type === 'skin'
+                ? {
+                      'zh-CN': `${currentOpertor.skinName['zh-CN']} · ${currentOpertor.operatorName}`,
+                      'en-US': `${currentOpertor.skinName['en-US']} / ${currentOpertor.operatorName}`,
+                  }
+                : {
+                      'zh-CN': `${currentOpertor.operatorName}`,
+                      'en-US': `${currentOpertor.skinName['en-US']}`,
+                  }
     }
 
     file.writeSync(

packages/operator/libs/utils.ts

@@ -10,7 +10,7 @@ import {
     SkinTableJsonCharSkinEntry,
     Codename,
 } from '../types.ts'
-import type { OfficialInfoOperatorConfig } from '@aklive2d/official-info/types'
+import type { OfficialInfoOperatorConfigV2 } from '@aklive2d/official-info/types'
 
 export const getExtractedFolder = (name: string) => {
     return path.join(OPERATOR_SOURCE_FOLDER, name, config.dir_name.extracted)
@@ -111,7 +111,7 @@ export const findSkinEntry = (
  */
 export const findCodename = (
     skinEntry: SkinTableJsonCharSkinEntry,
-    officialInfo: OfficialInfoOperatorConfig
+    officialInfo: OfficialInfoOperatorConfigV2
 ) => {
     const UPPER_CASE_EXCEPTION_WORDS = [
         'the',
@@ -144,7 +144,7 @@ export const findCodename = (
         modelNameNormalized = modelNameNormalizedArray.join(' ')
     }
     if (skinEntry.displaySkin.skinName) {
-        let engSkinName = officialInfo.codename['en-US']
+        let engSkinName = officialInfo.skinName['en-US']
         const engkinNameArray = engSkinName.split(' ')
         engkinNameArray.forEach((word, index) => {
             if (/^[a-zA-Z]+$/.test(word)) {
@@ -158,10 +158,11 @@ export const findCodename = (
             }
         })
         engSkinName = engkinNameArray.join(' ')
-        codename['zh-CN'] = officialInfo.codename['zh-CN'].replace(/ +$/, '')
+        codename['zh-CN'] =
+            `${officialInfo.skinName['zh-CN']} · ${officialInfo.operatorName}`
         codename['en-US'] = `${engSkinName} / ${modelNameNormalized}`
     } else {
-        codename['zh-CN'] = officialInfo.codename['zh-CN'].replace(/ +$/, '')
+        codename['zh-CN'] = officialInfo.operatorName
         codename['en-US'] = modelNameNormalized
     }
     return codename