This commit is contained in:
zhaarey 2025-02-14 11:30:05 +08:00
parent 42ca991329
commit ac937f8076
2 changed files with 85 additions and 77 deletions

36
main.go
View File

@ -22,16 +22,15 @@ import (
"time"
"main/utils/runv2"
"main/utils/structs"
"main/utils/runv3"
"main/utils/structs"
"github.com/spf13/pflag"
"github.com/zhaarey/go-mp4tag"
"gopkg.in/yaml.v2"
"github.com/beevik/etree"
"github.com/grafov/m3u8"
"github.com/olekukonko/tablewriter"
"github.com/spf13/pflag"
"github.com/zhaarey/go-mp4tag"
"gopkg.in/yaml.v2"
)
var (
@ -1369,6 +1368,9 @@ func mvDownloader(adamID string, saveDir string, token string, storefront string
}
mvm3u8url, _, _ := runv3.GetWebplayback(adamID, token, mediaUserToken, true)
if mvm3u8url == "" {
return errors.New("media-user-token may wrong or expired.")
}
os.MkdirAll(saveDir, os.ModePerm)
//video
@ -1428,17 +1430,6 @@ func mvDownloader(adamID string, saveDir string, token string, storefront string
//tags = append(tags, fmt.Sprintf("album_artist=%s", MVInfo.Data[0].Attributes.ArtistName))
tags = append(tags, fmt.Sprintf("performer=%s", MVInfo.Data[0].Attributes.ArtistName))
}
//mux and add tag
tagsString := strings.Join(tags, ":")
muxCmd := exec.Command("MP4Box", "-itags", tagsString, "-quiet", "-add", vidPath, "-add", audPath, "-keep-utc", "-new", mvOutPath)
fmt.Printf("MV Remuxing...")
if err := muxCmd.Run(); err != nil {
fmt.Printf("MV mux failed: %v\n", err)
return err
}
fmt.Printf("\rMV Remuxed. \n")
defer os.Remove(vidPath)
defer os.Remove(audPath)
// Extract and save thumbnail if enabled
if Config.SaveThumbnailImage {
@ -1455,9 +1446,22 @@ func mvDownloader(adamID string, saveDir string, token string, storefront string
fmt.Println("Failed to save MV thumbnail:", err)
} else {
fmt.Println("MV thumbnail saved successfully")
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", saveDir, baseThumbName, Config.CoverFormat))
}
}
//mux and add tag
tagsString := strings.Join(tags, ":")
muxCmd := exec.Command("MP4Box", "-itags", tagsString, "-quiet", "-add", vidPath, "-add", audPath, "-keep-utc", "-new", mvOutPath)
fmt.Printf("MV Remuxing...")
if err := muxCmd.Run(); err != nil {
fmt.Printf("MV mux failed: %v\n", err)
return err
}
fmt.Printf("\rMV Remuxed. \n")
defer os.Remove(vidPath)
defer os.Remove(audPath)
return nil
}

View File

@ -4,25 +4,29 @@ import (
"context"
"encoding/base64"
"fmt"
"github.com/gospider007/requests"
"google.golang.org/protobuf/proto"
//"log/slog"
"os"
cdm "main/utils/runv3/cdm"
key "main/utils/runv3/key"
"os"
"bytes"
"errors"
"io"
"github.com/Eyevinn/mp4ff/mp4"
"bytes"
"io"
"errors"
//"io/ioutil"
"net/http"
"encoding/json"
"github.com/grafov/m3u8"
"strings"
"github.com/schollz/progressbar/v3"
"net/http"
"os/exec"
"strings"
"github.com/grafov/m3u8"
"github.com/schollz/progressbar/v3"
)
type PlaybackLicense struct {
@ -145,10 +149,10 @@ func GetWebplayback(adamId string, authtoken string, mutoken string, mvmode bool
fmt.Println("json err:", err)
return "", "", err
}
if len(obj.List) > 0 {
if mvmode {
return obj.List[0].HlsPlaylistUrl, "", nil
}
if len(obj.List) > 0 {
// 遍历 Assets
for i, _ := range obj.List[0].Assets {
if obj.List[0].Assets[i].Flavor == "28:ctrp256" {
@ -163,6 +167,7 @@ func GetWebplayback(adamId string, authtoken string, mutoken string, mvmode bool
}
return "", "", nil
}
type Songlist struct {
List []struct {
Hlsurl string `json:"hls-key-cert-url"`
@ -227,7 +232,7 @@ func extractKidBase64(b string, mvmode bool) (string, string, error) {
}
return kidbase64, urlBuilder.String(), nil
}
func extsong(b string)(bytes.Buffer){
func extsong(b string) bytes.Buffer {
resp, err := http.Get(b)
if err != nil {
fmt.Printf("下载文件失败: %v\n", err)
@ -330,7 +335,7 @@ func Run(adamId string, trackpath string, authtoken string, mutoken string, mvmo
return "", nil
}
func ExtMvData (keyAndUrls string, savePath string)(error) {
func ExtMvData(keyAndUrls string, savePath string) error {
segments := strings.Split(keyAndUrls, ";")
key := segments[0]
//fmt.Println(key)
@ -384,7 +389,6 @@ func ExtMvData (keyAndUrls string, savePath string)(error) {
return nil
}
// DecryptMP4 decrypts a fragmented MP4 file with keys from widevice license. Supports CENC and CBCS schemes.
func DecryptMP4(r io.Reader, key []byte, w io.Writer) error {
// Initialization