Merge branch 'dev' into feat/tauri-integration

Author: Linho1219

README.md

@@ -1,18 +1,18 @@
-<img src="./icons/normal/brand.svg" width="80px" />
+<img src="./favicons/normal/brand.svg" width="80px" />
 
 # AMLL Editor
 
-[![Version](https://img.shields.io/github/package-json/v/Linho1219/AMLL-Editor?label=Version)](https://github.com/Linho1219/AMLL-Editor/releases)
-[![Vite Version](https://img.shields.io/github/package-json/dependency-version/Linho1219/AMLL-Editor/dev/vite?label=Vite&color=646CFF&logo=vite&logoColor=white)](https://vite.dev/)
-[![Vue Version](https://img.shields.io/github/package-json/dependency-version/Linho1219/AMLL-Editor/vue?label=Vue&color=4FC08D&logo=vuedotjs&logoColor=white)](https://vuejs.org/)
-[![PrimeVue Version](https://img.shields.io/github/package-json/dependency-version/Linho1219/AMLL-Editor/primevue?label=PrimeVue&color=41B883&logo=primevue&logoColor=white)](https://primevue.org/)
-[![AMLL Core Version](https://img.shields.io/github/package-json/dependency-version/Linho1219/AMLL-Editor/%40applemusic-like-lyrics%2Fcore?label=AMLL%20Core&color=FA243C&logo=applemusic&logoColor=white)](https://amll.dev)  
+[![Version](https://img.shields.io/github/package-json/v/amll-dev/amll-editor?label=Version)](https://github.com/amll-dev/amll-editor/releases)
+[![Vite Version](https://img.shields.io/github/package-json/dependency-version/amll-dev/amll-editor/dev/vite?label=Vite&color=646CFF&logo=vite&logoColor=white)](https://vite.dev/)
+[![Vue Version](https://img.shields.io/github/package-json/dependency-version/amll-dev/amll-editor/vue?label=Vue&color=4FC08D&logo=vuedotjs&logoColor=white)](https://vuejs.org/)
+[![PrimeVue Version](https://img.shields.io/github/package-json/dependency-version/amll-dev/amll-editor/primevue?label=PrimeVue&color=41B883&logo=primevue&logoColor=white)](https://primevue.org/)
+[![AMLL Core Version](https://img.shields.io/github/package-json/dependency-version/amll-dev/amll-editor/%40applemusic-like-lyrics%2Fcore?label=AMLL%20Core&color=FA243C&logo=applemusic&logoColor=white)](https://amll.dev)  
 [![Cloudflare Pages: STABLE](https://img.shields.io/website?url=https%3A%2F%2Feditor.amll.dev%2F&logo=cloudflare&logoColor=white&label=Pages%2fSTABLE)](https://editor.amll.dev/)
 [![Cloudflare Pages: BETA](https://img.shields.io/website?url=https%3A%2F%2Fbeta-editor.amll.dev%2F&logo=cloudflare&logoColor=white&label=Pages%2fBETA)](https://beta-editor.amll.dev/)
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/Linho1219/AMLL-Editor)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/amll-dev/amll-editor)
 
 基于 Vue 的开源逐音节歌词编辑器。  
-目标成为 [AMLL TTML Tool](https://github.com/Steve-xmh/amll-ttml-tool) 的继任者，可与 [AMLL](https://github.com/Steve-xmh/applemusic-like-lyrics) 生态协作。
+目标成为 [AMLL TTML Tool](https://github.com/amll-dev/amll-ttml-tool) 的继任者，可与 [AMLL](https://github.com/amll-dev/applemusic-like-lyrics) 生态协作。
 
 暂处于早期开发阶段。
 

package.json

@@ -8,7 +8,7 @@
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
-  "repository": "https://github.com/Linho1219/AMLL-Editor",
+  "repository": "https://github.com/amll-dev/amll-editor",
   "scripts": {
     "dev": "vite",
     "build": "run-p type-check \"build-only {@}\" --",

src/core/convert/formats/ttmlParse.ts

@@ -7,7 +7,7 @@ import { str2ms as nullableStr2ms } from '@utils/formatTime'
 import type { Maybe } from '@utils/types'
 
 // Frontend TTML parser, following AMLL TTML Lyric Format
-// Derived from: https://github.com/Steve-xmh/amll-ttml-tool , Licensed under GPLv3
+// Derived from: https://github.com/amll-dev/amll-ttml-tool , Licensed under GPLv3
 // See also https://www.w3.org/TR/2018/REC-ttml1-20181108/
 
 interface RomanWord {
@@ -189,7 +189,11 @@ export function parseTTML(ttmlText: string): Persist {
     duet = false,
     parentItunesKey: string | null = null,
   ) {
-    if (background) duet = lineEl.getAttribute('ttm:agent') !== mainAgentId
+    if (!background) {
+      const agentAttr = lineEl.getAttribute('ttm:agent')
+      duet = agentAttr !== null && agentAttr !== mainAgentId
+      console.log(agentAttr, mainAgentId, duet)
+    }
 
     const startTime = str2ms(lineEl.getAttribute('begin'))
     const endTime = str2ms(lineEl.getAttribute('end'))

src/core/convert/formats/ttmlStringify.ts

@@ -3,7 +3,7 @@ import type { LyricLine, LyricSyllable, Persist } from '@core/types'
 import { ms2str } from '@utils/formatTime'
 
 // Frontend TTML stringifier, following AMLL TTML Lyric Format
-// Derived from: https://github.com/Steve-xmh/amll-ttml-tool , Licensed under GPLv3
+// Derived from: https://github.com/amll-dev/amll-ttml-tool , Licensed under GPLv3
 // See also https://www.w3.org/TR/2018/REC-ttml1-20181108/
 
 export function stringifyTTML(ttmlLyric: Persist): string {

src/core/file/project/dataVer/0_1.ts

@@ -5,10 +5,13 @@ import type { ProjDataTill_0_0 } from './0_0'
 /**
  * Data version 0.1
  *
- * CHANELOG (v0.0 -> v0.1):
+ * CHANGELOG (v0.0 -> v0.1):
  * - Rename "words" to "syllables"
  * - Rename "lyricLines" to "lines"
  * - Remove "currentplaceholdingBeat" from syllables
+ *
+ * CHANGELOG (v0.1 -> v0.1.1):
+ * - Add "connectNext" to lines
  */
 export interface ProjData_0_1 {
   dataVersion: 'ALDv0.1'
@@ -33,6 +36,7 @@ export interface ProjData_0_1 {
     }[]
     ignoreInTiming: boolean
     bookmarked: boolean
+    connectNext?: boolean
   }[]
 }
 

src/core/file/project/parse.ts

@@ -1,6 +1,6 @@
 import JSZip from 'jszip'
 
-import type { Persist } from '@core/types'
+import type { LyricLine, Persist } from '@core/types'
 
 import type { ProjPayload } from '.'
 import {
@@ -53,8 +53,9 @@ export async function parseProjectFile(file: Blob): Promise<ProjPayload> {
 function parseProjectData(data: SupportedProjData): Persist {
   const latestData = migrateToLatestProjData(data)
   const { metadata } = latestData
-  const persistLines = latestData.lines.map((line) => ({
+  const persistLines: LyricLine[] = latestData.lines.map((line) => ({
     ...line,
+    connectNext: line.connectNext ?? false,
     syllables: line.syllables.map((syllable) => ({
       ...syllable,
       currentplaceholdingBeat: 0,

src/core/hotkey/schema.ts

@@ -33,6 +33,7 @@ export const hotkeyCommandList = [
   'breakLine',
   'duet',
   'background',
+  'connectNextLine',
 
   'goPrevLine',
   'goPrevSyl',
@@ -87,6 +88,7 @@ export const getDefaultHotkeyMap = () =>
     replace: [k(Ctrl, 'h'), k(Ctrl, Shift, 'f')],
     delete: k('Delete'),
     bookmark: k(Ctrl, 'd'),
+    connectNextLine: k(Ctrl, 'g'),
     preferences: k(Ctrl, 'Comma'),
     chooseMedia: k(Ctrl, 'm'),
     metadata: k(Ctrl, 'i'),

src/core/pref/schema.ts

@@ -17,8 +17,8 @@ export interface PreferenceSchema {
   globalLatencyMs: number
   alwaysIgnoreBackground: boolean
   hideLineTiming: boolean
-  autoConnectLineTimes: boolean
-  autoConnectThresholdMs: number
+  // autoConnectLineTimes: boolean
+  // autoConnectThresholdMs: number
   // Roman
   sylRomanEnabled: boolean
   swapTranslateRoman: boolean
@@ -40,8 +40,8 @@ export const getDefaultPref = (): PreferenceSchema => ({
   globalLatencyMs: 0,
   alwaysIgnoreBackground: false,
   hideLineTiming: false,
-  autoConnectLineTimes: false,
-  autoConnectThresholdMs: 100,
+  // autoConnectLineTimes: false,
+  // autoConnectThresholdMs: 100,
   sylRomanEnabled: false,
   swapTranslateRoman: false,
   notifyCompatIssuesOnStartup: true,

src/core/types/core.ts

@@ -25,6 +25,8 @@ export interface LyricLine {
   ignoreInTiming: boolean
   /** 已添加书签 */
   bookmarked: boolean
+  /** 结束时间延长到下一行的开始时间 */
+  connectNext: boolean
 }
 
 /** 单词 */

src/i18n/en/index.ts

@@ -10,7 +10,7 @@ const consoleArt = `
 
 Welcome to AMLL Editor!
 
-Project URL: https://github.com/Linho1219/AMLL-Editor
+Project URL: https://github.com/amll-dev/amll-editor
              Licensed under AGPLv3 only
 
 Related projects: AMLL Homepage  https://amll.dev/
@@ -70,6 +70,9 @@ const en = {
       generateRomanFromSyl: 'Generate from syllable romanization',
       startTime: 'Line start time',
       endTime: 'Line end time',
+      endTimeClickToConnect: 'Click to toggle connect end time',
+      endTimeDbClickToEdit: 'Double-click to edit',
+      connectNext: 'Connect end time to next line',
       continueToNextLine: 'Extend end time to next line',
       addSyllable: 'Add syllable',
       fields: {
@@ -135,6 +138,7 @@ const en = {
       duet: 'Duet',
       background: 'Background',
       ignoreInTiming: 'Ignore in Timing',
+      connectNext: 'End time to next',
       startTime: 'Start',
       endTime: 'End',
       duration: 'Dur',
@@ -283,10 +287,10 @@ const en = {
         alwaysIgnoreBackgroundDesc: 'Always skip background lines in the timeline view',
         hideLineTiming: 'Hide line timestamps',
         hideLineTimingDesc: 'Automatically generate line timestamps from syllables',
-        autoConnectLineTimes: 'Auto connect line times',
-        autoConnectLineTimesDesc: 'Automatically connect timestamps of adjacent lines when close',
-        autoConnectThresholdMs: 'Auto connect threshold',
-        autoConnectThresholdMsDesc: 'Maximum allowed gap between lines to auto-connect (ms)',
+        // autoConnectLineTimes: 'Auto connect line times',
+        // autoConnectLineTimesDesc: 'Automatically connect timestamps of adjacent lines when close',
+        // autoConnectThresholdMs: 'Auto connect threshold',
+        // autoConnectThresholdMsDesc: 'Maximum allowed gap between lines to auto-connect (ms)',
         scrollWithPlayback: 'Auto-scroll with playback',
         scrollWithPlaybackDesc: 'Timeline view automatically scrolls following playback position',
         compatibilityReport: 'Compatibility report',
@@ -560,6 +564,7 @@ const en = {
       breakLine: 'Split Line',
       duet: 'Toggle Duet Line',
       background: 'Toggle Background Line',
+      connectNextLine: 'Toggle Sibling Line Connection',
 
       goPrevLine: 'Previous Line',
       goPrevSyl: 'Previous Syllable',