api: Fixed directory path issue

Fixes #16

Dockerfile

@@ -10,7 +10,7 @@ COPY Makefile	Makefile
 COPY ytd.go		.
 
 RUN gofmt -l -d $(find . -type f -name '*.go' -not -path "./vendor/*") \
-  && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o ytd .
+  && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o youtube-dl .
 
 
 FROM alpine:latest
@@ -29,4 +29,4 @@ COPY --from=0 /go/src/github.com/Ch3ck/youtube-dl .
 RUN echo "Image build complete."
 
 
-ENTRYPOINT [ "youtube-dl" ]
+CMD [ "./youtube-dl" ]

api/api_test.go

@@ -26,7 +26,7 @@ var vid []string
 
 func TestApi(t *testing.T) {
 
-	path := "$HOME/Downloads/"
+	path := "test"
 	for i, table := range tables {
 		ID, _ := GetVideoId(table.url)
 		if ID != table.id {

api/apiconv.go

@@ -16,16 +16,28 @@ import (
 	"net/http"
 	"os"
 	"os/exec"
+	"os/user"
 	"path/filepath"
 )
 
 //Downloads decoded audio stream
-func ApiConvertVideo(file, id, format string, bitrate uint, decStream []stream) error {
+func ApiConvertVideo(file, id, path string, bitrate uint, decStream []stream) error {
 	cmd := exec.Command("ffmpeg", "-i", "-", "-ab", fmt.Sprintf("%dk", bitrate), file)
-	if err := os.MkdirAll(filepath.Dir(file), 666); err != nil {
+
+	curDir, er := user.Current()
+	if er != nil {
+		return er
+	}
+
+	homeDir := curDir.HomeDir
+	dir := homeDir + "/Downloads/youtube-dl/" + path
+	fp := filepath.Join(dir, file)
+	if err := os.MkdirAll(filepath.Dir(fp), 0775); err != nil {
 		return err
 	}
-	out, err := os.Create(file)
+
+	os.Remove(fp)//delete if file exists.
+	out, err := os.Create(fp)
 	if err != nil {
 		return err
 	}
@@ -60,11 +72,20 @@ func ApiDownloadVideo(path, file, url string) error {
 		log.Printf("Reading Output: status code: '%v'", resp.StatusCode)
 		return errors.New("Non 200 status code received")
 	}
-	err = os.MkdirAll(filepath.Dir(file), 666)
+
+	curDir, er := user.Current()
+	if er != nil {
+		return er
+	}
+	homeDir := curDir.HomeDir
+	dir := homeDir + "/Downloads/youtube-dl/" + path
+	fp := filepath.Join(dir, file)
+	err = os.MkdirAll(filepath.Dir(fp), 0775)
 	if err != nil {
 		return err
 	}
-	out, err := os.Create(file)
+	os.Remove(fp)//delete if file exists
+	out, err := os.Create(fp)
 	if err != nil {
 		return err
 	}

api/apidata.go

@@ -146,7 +146,7 @@ func APIGetVideoStream(format, id, path string, bitrate uint) (err error) {
 	url := vstream["url"] + "&signature" + vstream["sig"]
 	logrus.Infof("Downloading file to %s", file)
 	if format == ".mp3" {
-		err = ApiConvertVideo(file, id, format, bitrate, streams)
+		err = ApiConvertVideo(file, id, path, bitrate, streams)
 		if err != nil {
 			logrus.Errorf("Error downloading audio: %v", err)
 		}