youku add m3u8 url

extractors/bilibili/bilibili.go

@@ -412,36 +412,36 @@ func bilibiliDownload(options bilibiliOptions, extractOption extractors.Options)
 	if dashData.Streams.Audio != nil {
 		// Get audio part
 		var audioID int
-		audios := map[int]string{}
+		audios := map[int]dashStream{}
 		bandwidth := 0
 		for _, stream := range dashData.Streams.Audio {
 			if stream.Bandwidth > bandwidth {
 				audioID = stream.ID
 				bandwidth = stream.Bandwidth
 			}
-			audios[stream.ID] = stream.BaseURL
-		}
-		s, err := request.Size(audios[audioID], referer)
-		if err != nil {
-			return extractors.EmptyData(options.url, err)
+			audios[stream.ID] = stream
 		}
+		//s, err := request.Size(audios[audioID], referer)
+		//if err != nil {
+		//	return extractors.EmptyData(options.url, err)
+		//}
 		audioPart = &extractors.Part{
-			URL:  audios[audioID],
-			Size: s,
+			URL:  audios[audioID].BaseURL,
+			Size: audios[audioID].Size,
 			Ext:  "m4a",
 		}
 	}
 
 	streams := make(map[string]*extractors.Stream, len(dashData.Quality))
 	for _, stream := range dashData.Streams.Video {
-		s, err := request.Size(stream.BaseURL, referer)
-		if err != nil {
-			return extractors.EmptyData(options.url, err)
-		}
+		//s, err := request.Size(stream.BaseURL, referer)
+		//if err != nil {
+		//	return extractors.EmptyData(options.url, err)
+		//}
 		parts := make([]*extractors.Part, 0, 2)
 		parts = append(parts, &extractors.Part{
 			URL:  stream.BaseURL,
-			Size: s,
+			Size: stream.Size,
 			Ext:  getExtFromMimeType(stream.MimeType),
 		})
 		if audioPart != nil {
@@ -518,6 +518,7 @@ func bilibiliDownload(options bilibiliOptions, extractOption extractors.Options)
 			"subtitle": getSubTitleCaptionPart(options.aid, options.cid),
 		},
 		URL: options.url,
+		Raw: jsonString,
 	}
 }
 

extractors/bilibili/types.go

@@ -57,24 +57,40 @@ type multiPage struct {
 	VideoData multiPageVideoData `json:"videoData"`
 }
 
+type segmentBase struct {
+	Initialization string `json:"Initialization"`
+	indexRange     string `json:"indexRange"`
+}
+
 type dashStream struct {
-	ID        int    `json:"id"`
-	BaseURL   string `json:"baseUrl"`
-	Bandwidth int    `json:"bandwidth"`
-	MimeType  string `json:"mimeType"`
-	Codecid   int    `json:"codecid"`
-	Codecs    string `json:"codecs"`
+	ID           int         `json:"id"`
+	BaseURL      string      `json:"baseUrl"`
+	Bandwidth    int         `json:"bandwidth"`
+	MimeType     string      `json:"mimeType"`
+	Codecid      int         `json:"codecid"`
+	Codecs       string      `json:"codecs"`
+	StartWithSAP int         `json:"startWithSAP"`
+	Sar          string      `json:"sar"`
+	FrameRate    string      `json:"frameRate"`
+	Width        int         `json:"width"`
+	Height       int         `json:"height"`
+	BackupUrl    []string    `json:"backupUrl"`
+	SegmentBase  segmentBase `json:"SegmentBase"`
+	Size         int64       `json:"size"`
 }
 
 type dashStreams struct {
-	Video []dashStream `json:"video"`
-	Audio []dashStream `json:"audio"`
+	Duration      int64        `json:"duration"`
+	MinBufferTime float32      `json:"minBufferTime"`
+	Video         []dashStream `json:"video"`
+	Audio         []dashStream `json:"audio"`
 }
 
 type dashInfo struct {
 	CurQuality  int         `json:"quality"`
 	Description []string    `json:"accept_description"`
 	Quality     []int       `json:"accept_quality"`
+	TimeLength  int         `json:"timelength"`
 	Streams     dashStreams `json:"dash"`
 	DURLFormat  string      `json:"format"`
 	DURLs       []dURL      `json:"durl"`

extractors/douyin/douyin.go

@@ -127,10 +127,15 @@ func (e *extractor) Extract(url string, option extractors.Options) ([]*extractor
 	} else {
 		douyinType = extractors.DataTypeVideo
 		realURL := douyin.AwemeDetail.Video.PlayAddr.URLList[0]
-		totalSize, err = request.Size(realURL, url)
-		if err != nil {
-			return nil, errors.WithStack(err)
+
+		totalSize = int64(douyin.AwemeDetail.Video.PlayAddr.DataSize)
+		if totalSize == 0 {
+			totalSize, err = request.Size(realURL, url)
+			if err != nil {
+				return nil, errors.WithStack(err)
+			}
 		}
+
 		urlData = append(urlData, &extractors.Part{
 			URL:  realURL,
 			Size: totalSize,

extractors/iqiyi/iqiyi.go

@@ -35,6 +35,7 @@ type iqiyi struct {
 						L string `json:"l"`
 						B int64  `json:"b"`
 					} `json:"fs"`
+					M3u8Url string `json:"m3u8Url"`
 				} `json:"vs"`
 			} `json:"tkl"`
 		} `json:"vp"`
@@ -230,6 +231,7 @@ func (e *extractor) Extract(url string, _ extractors.Options) ([]*extractors.Dat
 			Parts:   urls,
 			Size:    video.Vsize,
 			Quality: video.Scrsz,
+			M3u8Url: video.M3u8Url,
 		}
 	}
 

extractors/types.go

@@ -28,6 +28,8 @@ type Stream struct {
 	Ext string `json:"ext"`
 	// if the parts need mux
 	NeedMux bool
+	// 如果有m3u8地址
+	M3u8Url string `json:"m3u8_url"`
 }
 
 // DataType indicates the type of extracted data, eg: video or image.
@@ -55,6 +57,8 @@ type Data struct {
 	Captions map[string]*CaptionPart `json:"caption"`
 	// Err is used to record whether an error occurred when extracting the list data
 	Err error `json:"err"`
+
+	Raw string `json:"raw"`
 }
 
 // FillUpStreamsData fills up some data automatically.

extractors/youku/youku.go

@@ -41,6 +41,7 @@ type stream struct {
 	Segs      []segs `json:"segs"`
 	Type      string `json:"stream_type"`
 	AudioLang string `json:"audio_lang"`
+	M3u8Url   string `json:"m3u8_url"`
 }
 
 type youkuVideo struct {
@@ -203,6 +204,7 @@ func genData(youkuData data) map[string]*extractors.Stream {
 			Parts:   urls,
 			Size:    stream.Size,
 			Quality: quality,
+			M3u8Url: stream.M3u8Url,
 		}
 	}
 	return streams