fix parse lyrics
This commit is contained in:
parent
942b9dd5be
commit
56c16962c3
8
.github/workflows/go.yml
vendored
8
.github/workflows/go.yml
vendored
@ -19,8 +19,6 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
go build -o main.exe -v ./main.go
|
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
|
- name: Create a new directory and copy files
|
||||||
run: |
|
run: |
|
||||||
mkdir -p alac
|
mkdir -p alac
|
||||||
@ -28,8 +26,6 @@ jobs:
|
|||||||
cp config.yaml alac/
|
cp config.yaml alac/
|
||||||
cp README.md alac/
|
cp README.md alac/
|
||||||
cp main.exe alac/
|
cp main.exe alac/
|
||||||
cp main_atmos.exe alac/
|
|
||||||
cp main_select.exe alac/
|
|
||||||
- name: Upload apple-music-alac-atmos-downloader
|
- name: Upload apple-music-alac-atmos-downloader
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
@ -47,8 +43,6 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: |
|
run: |
|
||||||
go build -o main -v ./main.go
|
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
|
- name: Create a new directory and copy files
|
||||||
run: |
|
run: |
|
||||||
mkdir -p alac
|
mkdir -p alac
|
||||||
@ -56,8 +50,6 @@ jobs:
|
|||||||
cp config.yaml alac/
|
cp config.yaml alac/
|
||||||
cp README.md alac/
|
cp README.md alac/
|
||||||
cp main alac/
|
cp main alac/
|
||||||
cp main_atmos alac/
|
|
||||||
cp main_select alac/
|
|
||||||
- name: Upload apple-music-alac-atmos-downloader
|
- name: Upload apple-music-alac-atmos-downloader
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,6 +4,4 @@
|
|||||||
!go.mod
|
!go.mod
|
||||||
!go.sum
|
!go.sum
|
||||||
!main.go
|
!main.go
|
||||||
!main_atmos.go
|
|
||||||
!main_select.go
|
|
||||||
!README.md
|
!README.md
|
||||||
|
7
main.go
7
main.go
@ -1376,7 +1376,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
|
|||||||
fmt.Println("Unavailable.\n")
|
fmt.Println("Unavailable.\n")
|
||||||
} else {
|
} else {
|
||||||
EnhancedHls_m3u8, err := checkM3u8(meta.Data[0].Relationships.Tracks.Data[0].ID, "album")
|
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
|
manifest1.Attributes.ExtendedAssetUrls.EnhancedHls = EnhancedHls_m3u8
|
||||||
}
|
}
|
||||||
Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
|
Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
|
||||||
@ -1538,7 +1538,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
EnhancedHls_m3u8, err := checkM3u8(track.ID, "song")
|
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
|
manifest.Attributes.ExtendedAssetUrls.EnhancedHls = EnhancedHls_m3u8
|
||||||
}
|
}
|
||||||
var Quality string
|
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)
|
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d:%d.%d", &h, &m, &s, &ms)
|
||||||
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)
|
||||||
|
if err != nil {
|
||||||
|
_, err = fmt.Sscanf(lyric.SelectAttr("begin").Value, "%d:%d", &m, &s)
|
||||||
|
}
|
||||||
h = 0
|
h = 0
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
2399
main_atmos.go
2399
main_atmos.go
File diff suppressed because it is too large
Load Diff
2390
main_select.go
2390
main_select.go
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user