Merge pull request #10 from WorldObservationLog/main

fix: adapt lrc two digits ms standard
pull/17/head
zhaarey 5 months ago committed by GitHub
commit 7cfde4b48d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 5
      main.go
  2. 5
      main_atmos.go
  3. 5
      main_select.go

@ -1233,7 +1233,7 @@ func conventTTMLToLRC(ttml string) (string, error) {
if err != nil { if err != nil {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d.%d", &m, &s, &ms) _, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d.%d", &m, &s, &ms)
h = 0 h = 0
} }
} else { } else {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d.%d", &s, &ms) _, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d.%d", &s, &ms)
h, m = 0, 0 h, m = 0, 0
@ -1256,7 +1256,8 @@ func conventTTMLToLRC(ttml string) (string, error) {
text = lyric.SelectAttr("text").Value text = lyric.SelectAttr("text").Value
} }
m += h * 60 m += h * 60
lrcLines = append(lrcLines, fmt.Sprintf("[%02d:%02d.%03d]%s", m, s, ms, text)) ms = ms / 10
lrcLines = append(lrcLines, fmt.Sprintf("[%02d:%02d.%02d]%s", m, s, ms, text))
} }
} }
return strings.Join(lrcLines, "\n"), nil return strings.Join(lrcLines, "\n"), nil

@ -1267,7 +1267,7 @@ func conventTTMLToLRC(ttml string) (string, error) {
if err != nil { if err != nil {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d.%d", &m, &s, &ms) _, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d.%d", &m, &s, &ms)
h = 0 h = 0
} }
} else { } else {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d.%d", &s, &ms) _, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d.%d", &s, &ms)
h, m = 0, 0 h, m = 0, 0
@ -1290,7 +1290,8 @@ func conventTTMLToLRC(ttml string) (string, error) {
text = lyric.SelectAttr("text").Value text = lyric.SelectAttr("text").Value
} }
m += h * 60 m += h * 60
lrcLines = append(lrcLines, fmt.Sprintf("[%02d:%02d.%03d]%s", m, s, ms, text)) ms = ms / 10
lrcLines = append(lrcLines, fmt.Sprintf("[%02d:%02d.%02d]%s", m, s, ms, text))
} }
} }
return strings.Join(lrcLines, "\n"), nil return strings.Join(lrcLines, "\n"), nil

@ -1267,7 +1267,7 @@ func conventTTMLToLRC(ttml string) (string, error) {
if err != nil { if err != nil {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d.%d", &m, &s, &ms) _, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d.%d", &m, &s, &ms)
h = 0 h = 0
} }
} else { } else {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d.%d", &s, &ms) _, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d.%d", &s, &ms)
h, m = 0, 0 h, m = 0, 0
@ -1290,7 +1290,8 @@ func conventTTMLToLRC(ttml string) (string, error) {
text = lyric.SelectAttr("text").Value text = lyric.SelectAttr("text").Value
} }
m += h * 60 m += h * 60
lrcLines = append(lrcLines, fmt.Sprintf("[%02d:%02d.%03d]%s", m, s, ms, text)) ms = ms / 10
lrcLines = append(lrcLines, fmt.Sprintf("[%02d:%02d.%02d]%s", m, s, ms, text))
} }
} }
return strings.Join(lrcLines, "\n"), nil return strings.Join(lrcLines, "\n"), nil

Loading…
Cancel
Save