fix parse lyrics

pull/23/merge
zhaarey 2 months ago
parent 942b9dd5be
commit 56c16962c3
  1. 8
      .github/workflows/go.yml
  2. 2
      .gitignore
  3. 7
      main.go
  4. 2399
      main_atmos.go
  5. 2390
      main_select.go

@ -19,8 +19,6 @@ jobs:
- name: Build
run: |
go build -o main.exe -v ./main.go
go build -o main_atmos.exe -v ./main_atmos.go
go build -o main_select.exe -v ./main_select.go
- name: Create a new directory and copy files
run: |
mkdir -p alac
@ -28,8 +26,6 @@ jobs:
cp config.yaml alac/
cp README.md alac/
cp main.exe alac/
cp main_atmos.exe alac/
cp main_select.exe alac/
- name: Upload apple-music-alac-atmos-downloader
uses: actions/upload-artifact@v2
with:
@ -47,8 +43,6 @@ jobs:
- name: Build
run: |
go build -o main -v ./main.go
go build -o main_atmos -v ./main_atmos.go
go build -o main_select -v ./main_select.go
- name: Create a new directory and copy files
run: |
mkdir -p alac
@ -56,8 +50,6 @@ jobs:
cp config.yaml alac/
cp README.md alac/
cp main alac/
cp main_atmos alac/
cp main_select alac/
- name: Upload apple-music-alac-atmos-downloader
uses: actions/upload-artifact@v2
with:

2
.gitignore vendored

@ -4,6 +4,4 @@
!go.mod
!go.sum
!main.go
!main_atmos.go
!main_select.go
!README.md

@ -1376,7 +1376,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println("Unavailable.\n")
} else {
EnhancedHls_m3u8, err := checkM3u8(meta.Data[0].Relationships.Tracks.Data[0].ID, "album")
if strings.HasPrefix(EnhancedHls_m3u8, "http") {
if strings.HasSuffix(EnhancedHls_m3u8, ".m3u8") {
manifest1.Attributes.ExtendedAssetUrls.EnhancedHls = EnhancedHls_m3u8
}
Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
@ -1538,7 +1538,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
continue
}
EnhancedHls_m3u8, err := checkM3u8(track.ID, "song")
if strings.HasPrefix(EnhancedHls_m3u8, "http") {
if strings.HasSuffix(EnhancedHls_m3u8, ".m3u8") {
manifest.Attributes.ExtendedAssetUrls.EnhancedHls = EnhancedHls_m3u8
}
var Quality string
@ -1819,6 +1819,9 @@ func conventTTMLToLRC(ttml string) (string, error) {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d:%d.%d", &h, &m, &s, &ms)
if err != nil {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d.%d", &m, &s, &ms)
if err != nil {
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d", &m, &s)
}
h = 0
}
} else {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save