隐藏行时间戳功能

Author: Linho1219

src/core/convert/formats/lrc.ts

@@ -3,6 +3,7 @@ import type { LyricLine, Persist } from '@core/types'
 import { coreCreate } from '@states/stores/core'
 
 import { str2ms } from '@utils/formatTime'
+import { pairwise } from '@utils/pairwise'
 
 import MANIFEST from '../manifest.json'
 import type { Convert as CV } from '../types'
@@ -67,11 +68,8 @@ export function parseLRC(lrc: string): Persist {
     })
   })
   lyricLines.sort((a, b) => a.startTime - b.startTime)
-  for (let i = lyricLines.length - 1; i > 0; i--) {
-    const line = lyricLines[i]!
-    const prevLine = lyricLines[i - 1]!
-    prevLine.endTime = line.startTime
-    prevLine.syllables[0]!.endTime = line.startTime
+  for (const [prev, curr] of pairwise(lyricLines)) {
+    prev.endTime = prev.syllables[0]!.endTime = curr.startTime
   }
   if (lyricLines.length && metadata.length && metadata.length.length) {
     const length = str2ms(metadata.length[0]!)

src/core/pref/schema.ts

@@ -18,6 +18,7 @@ export interface PreferenceSchema {
   alwaysIgnoreBackground: boolean
   hideLineTiming: boolean
   autoConnectLineTimes: boolean
+  autoConnectThresholdMs: number
   // Roman
   sylRomanEnabled: boolean
   swapTranslateRoman: boolean
@@ -39,6 +40,7 @@ export const getDefaultPref = (): PreferenceSchema => ({
   alwaysIgnoreBackground: false,
   hideLineTiming: false,
   autoConnectLineTimes: false,
+  autoConnectThresholdMs: 100,
   sylRomanEnabled: false,
   swapTranslateRoman: false,
   sidebarWidth: 360,

src/states/services/port.ts

@@ -1,8 +1,11 @@
 import { cloneDeep } from 'lodash-es'
 
-import type { MetadataKey, Persist } from '@core/types'
+import type { LyricLine, MetadataKey, Persist } from '@core/types'
 
-import { useCoreStore, useRuntimeStore } from '@states/stores'
+import { useCoreStore, usePrefStore, useRuntimeStore } from '@states/stores'
+
+import { alignLineTime } from '@utils/alignLineSylTime'
+import { pairwise } from '@utils/pairwise'
 
 import { editHistory } from './history'
 
@@ -23,12 +26,36 @@ export function applyPersist(data: Persist) {
 
 export function collectPersist(): Persist {
   const coreStore = useCoreStore()
+  const prefStore = usePrefStore()
+  const lines = cloneDeep(coreStore.lyricLines)
+  if (prefStore.hideLineTiming) lines.forEach((line) => alignLineTime(line))
+  if (prefStore.autoConnectLineTimes) connectLineTimes(lines, prefStore.autoConnectThresholdMs)
   const outputData: Persist = {
     metadata: [...coreStore.metadata].reduce(
       (obj, { key, values }) => ((obj[key] = [...values]), obj),
       {} as Record<MetadataKey, string[]>,
     ),
-    lines: cloneDeep(coreStore.lyricLines),
+    lines,
   }
   return outputData
 }
+
+function connectLineTimes(lines: LyricLine[], thresMs: number) {
+  function classifyLines(lines: LyricLine[]) {
+    type Groups = [normal: LyricLine[], duet: LyricLine[], bg: LyricLine[], duetBg: LyricLine[]]
+    const groups: Groups = [[], [], [], []]
+    const classifier = (line: LyricLine): 0 | 1 | 2 | 3 => {
+      if (line.duet && line.background) return 3
+      if (line.duet) return 1
+      if (line.background) return 2
+      return 0
+    }
+    lines.forEach((l) => groups[classifier(l)].push(l))
+    return groups
+  }
+  function connectLines(lines: LyricLine[]) {
+    for (const [prev, curr] of pairwise(lines))
+      if (curr.startTime - prev.endTime <= thresMs) prev.endTime = curr.startTime
+  }
+  classifyLines(lines).forEach((group) => connectLines(group))
+}

src/ui/editor/content/context.ts

@@ -88,7 +88,7 @@ export function useContentCtxItems({ lineIndex, sylIndex }: ContentCtxStates) {
         runtimeStore.selectLine(...newLines)
         nextTick(() =>
           staticStore.scrollToHook?.(
-            newLines.reduce((acc, line) => Math.max(acc, coreStore.lyricLines.indexOf(line)), 0),
+            Math.max(0, ...newLines.map((l) => coreStore.lyricLines.indexOf(l))),
             { align: 'nearest' },
           ),
         )

src/ui/sidebar/tabs/preference/PreferenceTab.vue

@@ -121,6 +121,15 @@ const displayName = __APP_DISPLAY_NAME__
         :disabled="!prefStore.hideLineTiming"
         experimental
       />
+      <PrefNumberItem
+        pref-key="autoConnectThresholdMs"
+        label="连接阈值"
+        desc="连接相邻行时允许的最大间隔 (毫秒)"
+        :min="0"
+        :max="5000"
+        :disabled="!prefStore.hideLineTiming || !prefStore.autoConnectLineTimes"
+        experimental
+      />
     </div>
     <div class="pref-group">
       <div class="pref-group-title">音译</div>

src/utils/pairwise.ts

@@ -0,0 +1,15 @@
+/**
+ * Returns consecutive pairs from the given iterable.
+ *
+ * Example: `0, 1, 2, 3` -> `[0, 1], [1, 2], [2, 3]`
+ */
+export function* pairwise<T>(iterable: Iterable<T>): Generator<[T, T], void, unknown> {
+  let prev: T | undefined
+  let hasPrev = false
+
+  for (const curr of iterable) {
+    if (hasPrev) yield [prev!, curr]
+    prev = curr
+    hasPrev = true
+  }
+}