From 86d3df51b7ebbe93bd6df3c799ca22fe0215ee39 Mon Sep 17 00:00:00 2001
From: Ronnie Roller <rroller@snapchat.com>
Date: Sat, 8 Feb 2020 16:53:40 -0800
Subject: [PATCH] Don't download vp9

---
 README.md          | 2 ++
 src/media/fetch.go | 3 ++-
 src/media/serve.go | 6 +-----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6217003..bd66c31 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@ A mobile friendly tool for downloading videos from social media.
 The backend is is a Golang server that will take a URL (YouTube, Reddit, Twitter, etc),
 download the video file, and return a URL to download the video. The video will be transcoced as needed to produce a single mp4 file.
 
+Note: This is for home use only. There's no auth.
+
 ![GitHub Logo](static/images/screenshot1.png)
 
 ![GitHub Logo](static/images/screenshot2.png)
diff --git a/src/media/fetch.go b/src/media/fetch.go
index bf25b4b..d5e2147 100644
--- a/src/media/fetch.go
+++ b/src/media/fetch.go
@@ -118,10 +118,11 @@ func downloadMedia(url string) (string, error) {
 	log.Info().Msgf("Downloading %s to %s", url, id)
 
 	cmd := exec.Command("youtube-dl",
-		"--format", "bestvideo+bestaudio[ext=m4a]/bestvideo+bestaudio/best",
+		"--format", "bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best",
 		"--merge-output-format", "mp4",
 		"--restrict-filenames",
 		"--write-info-json",
+		"--verbose",
 		"--output", name,
 		url)
 
diff --git a/src/media/serve.go b/src/media/serve.go
index 8a60de8..7acffb0 100644
--- a/src/media/serve.go
+++ b/src/media/serve.go
@@ -78,9 +78,5 @@ func streamFileToClient(writer http.ResponseWriter, filename string) {
 	}
 
 	// Copy the file to the client
-	if _, err = io.Copy(writer, Openfile); err != nil {
-		log.Error().Msgf("Error copying file %s %v", filename, err)
-		http.Error(writer, "Couldn't copy file", 404)
-		return
-	}
+	_, _ = io.Copy(writer, Openfile)
 }