Merge pull request #18 from kepler471/redo-remove-youtubedl-functiona…

…lity

Redo remove youtubedl functionality

dash.go

@@ -11,6 +11,19 @@ type BaseUrl struct {
 	Data string `xml:",chardata"`
 }
 
+type DashVideo int
+
+const (
+	K_600 DashVideo = iota
+	M_1_2
+	M_2_4
+	M_4_8
+	R_240
+	R_360
+	R_480
+	R_720
+)
+
 // decode returns all variations of BaseUrl in a DASHPlaylist.mpd file.
 func decode(mpd io.Reader) []string {
 	dec := xml.NewDecoder(mpd)

dash_test.go

@@ -1,19 +1,15 @@
 package main
 
 import (
-	"encoding/json"
 	"fmt"
-	"io/ioutil"
-	"net/url"
 	"os"
-	"reflect"
 	"strings"
 	"testing"
 )
 
 func Test_decode(t *testing.T) {
 	dashDir := "./DashFiles/"
-	fs, _ := ioutil.ReadDir(dashDir)
+	fs, _ := os.ReadDir(dashDir)
 	for _, f := range fs {
 		if strings.HasSuffix(f.Name(), ".mpd") {
 			mpd, _ := os.Open(dashDir + f.Name())
@@ -23,50 +19,50 @@ func Test_decode(t *testing.T) {
 	}
 }
 
-func Test_scrapeReddit(t *testing.T) {
-	Url, _ := url.Parse("https://www.reddit.com/domain/v.redd.it/")
-	j, _ := fetchJson(Url)
-	var result interface{}
-	json.Unmarshal(j, &result)
-	m := result.(map[string]interface{})
+// func Test_scrapeReddit(t *testing.T) {
+// 	Url, _ := url.Parse("https://www.reddit.com/domain/v.redd.it/")
+// 	j, _ := fetchJson(Url)
+// 	var result interface{}
+// 	json.Unmarshal(j, &result)
+// 	m := result.(map[string]interface{})
 
-	var stack []string
-	var walk func(value reflect.Value)
-	walk = func(v reflect.Value) {
-		if v.String() == "dash_url" {
-			fmt.Printf("Visiting %v\n", v)
-		}
-		for v.Kind() == reflect.Ptr || v.Kind() == reflect.Interface {
-			v = v.Elem()
-		}
-		switch v.Kind() {
-		case reflect.Array, reflect.Slice:
-			for i := 0; i < v.Len(); i++ {
-				walk(v.Index(i))
-			}
-		case reflect.Map:
-			for _, k := range v.MapKeys() {
-				//if k.String() == "dash_url" {
-				if k.String() == "url_overridden_by_dest" {
-					stack = append(stack, fmt.Sprintf("%v", v.MapIndex(k)))
-					return
-				}
-				if k.String() != "secure_media" {
-					walk(v.MapIndex(k))
-				}
-			}
-		}
-	}
-	walk(reflect.ValueOf(m))
-	ch := make(chan struct{})
-	for _, u := range stack {
-		go func(mpd string) {
-			resp, _ := fetch(mpd)
-			fmt.Println(mpd, decode(resp.Body))
-			ch <- struct{}{}
-		}(u + "/DASHPlaylist.mpd")
-	}
-	for range stack {
-		<-ch
-	}
-}
+// 	var stack []string
+// 	var walk func(value reflect.Value)
+// 	walk = func(v reflect.Value) {
+// 		if v.String() == "dash_url" {
+// 			fmt.Printf("Visiting %v\n", v)
+// 		}
+// 		for v.Kind() == reflect.Ptr || v.Kind() == reflect.Interface {
+// 			v = v.Elem()
+// 		}
+// 		switch v.Kind() {
+// 		case reflect.Array, reflect.Slice:
+// 			for i := 0; i < v.Len(); i++ {
+// 				walk(v.Index(i))
+// 			}
+// 		case reflect.Map:
+// 			for _, k := range v.MapKeys() {
+// 				//if k.String() == "dash_url" {
+// 				if k.String() == "url_overridden_by_dest" {
+// 					stack = append(stack, fmt.Sprintf("%v", v.MapIndex(k)))
+// 					return
+// 				}
+// 				if k.String() != "secure_media" {
+// 					walk(v.MapIndex(k))
+// 				}
+// 			}
+// 		}
+// 	}
+// 	walk(reflect.ValueOf(m))
+// 	ch := make(chan struct{})
+// 	for _, u := range stack {
+// 		go func(mpd string) {
+// 			resp, _ := fetch(mpd)
+// 			fmt.Println(mpd, decode(resp.Body))
+// 			ch <- struct{}{}
+// 		}(u + "/DASHPlaylist.mpd")
+// 	}
+// 	for range stack {
+// 		<-ch
+// 	}
+// }