api: Debugging fixes.

api/apiconv.go

@@ -19,8 +19,7 @@ import (
 	"path/filepath"
 )
 
-//Converts Decoded Video file to mp3 by default with 123 bitrate or to
-//flv if otherwise specified and downloads to system
+//Downloads decoded audio stream
 func ApiConvertVideo(file, id, format string, bitrate uint, decVideo []string) error {
 	cmd := exec.Command("ffmpeg", "-i", "-", "-ab", fmt.Sprintf("%dk", bitrate), file)
 	if err := os.MkdirAll(filepath.Dir(file), 666); err != nil {
@@ -42,10 +41,8 @@ func ApiConvertVideo(file, id, format string, bitrate uint, decVideo []string) e
 	if err != nil {
 		return errors.New("ffmpeg not found on system")
 	}
-
 	cmd.Start()
-	//logrus.Infof("Downloading mp3 file to disk %s", file)
-	stdin.Write(buf.Bytes()) //download file.
+	stdin.Write(buf.Bytes())
 	out.Write(buf.Bytes())
 	return nil
 }
@@ -61,8 +58,8 @@ func ApiDownloadVideo(path, file, url string, video *RawVideoData) error {
 	video.Vlength = float64(resp.ContentLength)
 
 	if resp.StatusCode != 200 {
-		log.Printf("Reading Output: status code : '%v'", resp.StatusCode)
-		return errors.New("non 200 status code received")
+		log.Printf("Reading Output: status code: '%v'", resp.StatusCode)
+		return errors.New("Non 200 status code received")
 	}
 	err = os.MkdirAll(filepath.Dir(file), 666)
 	if err != nil {
@@ -72,6 +69,8 @@ func ApiDownloadVideo(path, file, url string, video *RawVideoData) error {
 	if err != nil {
 		return err
 	}
+
+	//saving downloaded file.
 	_, err = io.Copy(out, resp.Body)
 	if err != nil {
 		log.Println("Download Error: ", err)

api/apidata.go

@@ -36,20 +36,6 @@ type RawVideoData struct {
 	URLEncodedFmtStreamMap []stream `json:"url_encoded_fmt_stream_map"`
 	VideoId                string
 	VideoInfo              string
-	Vlength                float64
-	dpercent               chan int64
-}
-
-func (v *RawVideoData) Write(b []byte) (n int, err error) {
-	n = len(b)
-	totalbytes, dlevel := 0.0, 0.0
-	v.Vlength = totalbytes + float64(n)
-	curPercent := ((totalbytes / v.Vlength) * 100)
-	if (dlevel <= curPercent) && (dlevel < 100) {
-		dlevel++
-		v.dpercent <- int64(dlevel)
-	}
-	return
 }
 
 //gets the Video ID from youtube url
@@ -148,11 +134,12 @@ func APIGetVideoStream(format, id, path string, bitrate uint) (err error) {
 
 	video.URLEncodedFmtStreamMap = streams
 	//Download Video stream to file
-	if format == "" {
-		format = ".flv"
-	} else {
+	if format == "mp3" || format == ".mp3" {
 		format = ".mp3"
+	} else {
+		format = ".flv"
 	}
+
 	//create output file name and set path properly.
 	file := video.Title + format
 	file = SpaceMap(file)
@@ -165,7 +152,7 @@ func APIGetVideoStream(format, id, path string, bitrate uint) (err error) {
 			logrus.Errorf("Error downloading audio: %v", err)
 		}
 
-	} else { //defaults to flv format for video files.)
+	} else {
 		if err := ApiDownloadVideo(path, file, url, video); err != nil {
 			logrus.Errorf("Error downloading video: %v", err)
 		}