dilap54/goutubedl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use youtube-dl headers for own requests too

Browse Source 
Might be some issues downloading images and subtiles if cookies are required etc
This commit is contained in:
Mattias Wadman
2019-11-01 00:02:07 +01:00
parent 5b6ef4f1f2
commit 042aba554c
1 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
goutubedl.go
View File

@ -133,24 +133,25 @@ type Thumbnail struct {
// Format youtube-dl downloadable format // Format youtube-dl downloadable format
type Format struct { type Format struct {
Ext string `json:"ext"` // Video filename extension Ext string `json:"ext"` // Video filename extension
Format string `json:"format"` // A human-readable description of the format Format string `json:"format"` // A human-readable description of the format
FormatID string `json:"format_id"` // Format code specified by `--format` FormatID string `json:"format_id"` // Format code specified by `--format`
FormatNote string `json:"format_note"` // Additional info about the format FormatNote string `json:"format_note"` // Additional info about the format
Width float64 `json:"width"` // Width of the video Width float64 `json:"width"` // Width of the video
Height float64 `json:"height"` // Height of the video Height float64 `json:"height"` // Height of the video
Resolution string `json:"resolution"` // Textual description of width and height Resolution string `json:"resolution"` // Textual description of width and height
TBR float64 `json:"tbr"` // Average bitrate of audio and video in KBit/s TBR float64 `json:"tbr"` // Average bitrate of audio and video in KBit/s
ABR float64 `json:"abr"` // Average audio bitrate in KBit/s ABR float64 `json:"abr"` // Average audio bitrate in KBit/s
ACodec string `json:"acodec"` // Name of the audio codec in use ACodec string `json:"acodec"` // Name of the audio codec in use
ASR float64 `json:"asr"` // Audio sampling rate in Hertz ASR float64 `json:"asr"` // Audio sampling rate in Hertz
VBR float64 `json:"vbr"` // Average video bitrate in KBit/s VBR float64 `json:"vbr"` // Average video bitrate in KBit/s
FPS float64 `json:"fps"` // Frame rate FPS float64 `json:"fps"` // Frame rate
VCodec string `json:"vcodec"` // Name of the video codec in use VCodec string `json:"vcodec"` // Name of the video codec in use
Container string `json:"container"` // Name of the container format Container string `json:"container"` // Name of the container format
Filesize float64 `json:"filesize"` // The number of bytes, if known in advance Filesize float64 `json:"filesize"` // The number of bytes, if known in advance
FilesizeApprox float64 `json:"filesize_approx"` // An estimate for the number of bytes FilesizeApprox float64 `json:"filesize_approx"` // An estimate for the number of bytes
Protocol string `json:"protocol"` // The protocol that will be used for the actual download Protocol string `json:"protocol"` // The protocol that will be used for the actual download
HTTPHeaders map[string]string `json:"http_headers"`
} }
// Subtitle youtube-dl subtitle // Subtitle youtube-dl subtitle
@ -220,9 +221,6 @@ func New(ctx context.Context, rawURL string, options Options) (result Result, er
if options.DebugLog == nil { if options.DebugLog == nil {
options.DebugLog = nopPrinter{} options.DebugLog = nopPrinter{}
} }
if options.HTTPClient == nil {
options.HTTPClient = http.DefaultClient
}
info, rawJSON, err := infoFromURL(ctx, rawURL, options) info, rawJSON, err := infoFromURL(ctx, rawURL, options)
if err != nil { if err != nil {
@ -327,11 +325,26 @@ func infoFromURL(ctx context.Context, rawURL string, options Options) (info Info
default: default:
// any type // any type
} }
get := func(url string) (*http.Response, error) {
c := http.DefaultClient
if options.HTTPClient != nil {
c = options.HTTPClient
}
r, err := http.NewRequest(http.MethodGet, url, nil)
if err != nil {
return nil, err
}
for k, v := range info.HTTPHeaders {
r.Header.Set(k, v)
}
return c.Do(r)
} }
// TODO: use headers from youtube-dl info for thumbnail and subtitle download? // TODO: use headers from youtube-dl info for thumbnail and subtitle download?
if options.DownloadThumbnail && info.Thumbnail != "" { if options.DownloadThumbnail && info.Thumbnail != "" {
resp, respErr := options.HTTPClient.Get(info.Thumbnail) resp, respErr := get(info.Thumbnail)
if respErr == nil { if respErr == nil {
buf, _ := ioutil.ReadAll(resp.Body) buf, _ := ioutil.ReadAll(resp.Body)
resp.Body.Close() resp.Body.Close()
@ -348,7 +361,7 @@ func infoFromURL(ctx context.Context, rawURL string, options Options) (info Info
if options.DownloadSubtitles { if options.DownloadSubtitles {
for _, subtitles := range info.Subtitles { for _, subtitles := range info.Subtitles {
for i, subtitle := range subtitles { for i, subtitle := range subtitles {
resp, respErr := options.HTTPClient.Get(subtitle.URL) resp, respErr := get(subtitle.URL)
if respErr == nil { if respErr == nil {
buf, _ := ioutil.ReadAll(resp.Body) buf, _ := ioutil.ReadAll(resp.Body)
resp.Body.Close() resp.Body.Close()