added resolution dropdown for videos

ikagod · Dec 19, 2019 · 180c697 · 180c697
1 parent 0a4bd62
commit 180c697
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/handlers.go b/handlers.go
@@ -43,6 +43,7 @@ func HandleAddTarget(w http.ResponseWriter, r *http.Request) {
 	log.Info("received a request to add a target")
 	w.Header().Set("Content-Type", "application/json")
 	var targetData AddTargetPayload
+	log.Info(targetData)
 	err := json.NewDecoder(r.Body).Decode(&targetData)
 	if err != nil {
 		errRes = Response{Type: "Error", Key: "ERROR_PARSING_DATA", Message: "There was an error parsing json: " + err.Error()}

diff --git a/static/js/index.js b/static/js/index.js
@@ -36,6 +36,8 @@ function addChannel() {
   let downloadQuality = document.getElementById("download-quality").value;
   let downloadPath = document.getElementById("output-path-indicator").innerText;
 
+  console.log("DL PATH: ", downloadPath)
+
   let type = "Channel";
 
   let channelData = {

diff --git a/static/playlists.html b/static/playlists.html
@@ -50,13 +50,13 @@
       </select>
       <div class="form-group ml-2">
         <select class="form-control" id="file-extension" disabled>
-          <option value="m4a">m4a (recommended for now)</option>
+          <option value="m4a">any (whatever is available)</option>
           <option value="mp3">mp3</option>
         </select>
       </div>
       <div class="form-group ml-2">
         <select class="form-control" id="download-quality">
-         <option value="8k">highest available (recommended for now)</option>
+          <option value="8k">highest available (recommended for now)</option>
           <option value="8k">7680x4320 (8K)</option>
           <option value="4k">3840x2160 (4K)</option>
           <option value="1080">1920x1080 (1080p)</option>

diff --git a/static/videos.html b/static/videos.html
@@ -50,16 +50,22 @@
         <option value="Video And Audio">Video And Audio</option>
       </select>
       <div class="form-group ml-2">
-        <select class="form-control" id="file-extension">
+        <select class="form-control" id="file-extension" disabled>
           <option value="m4a">m4a (recommended for now)</option>
           <option value="mp3">mp3</option>
         </select>
       </div>
       <div class="form-group ml-2">
         <select class="form-control" id="download-quality">
-          <option value="best">best</option>
-          <option value="medium">medium</option>
-          <option value="worst">worst</option>
+          <option value="8k">highest available (recommended for now)</option>
+          <option value="8k">7680x4320 (8K)</option>
+          <option value="4k">3840x2160 (4K)</option>
+          <option value="1080">1920x1080 (1080p)</option>
+          <option value="720">1280x720 (720p)</option>
+          <option value="480">640x480 (480p)</option>
+          <option value="360">480x360 (360p)</option>
+          <option value="240">320x240 (240p)</option>
+          <option value="144">240x144 (144p)</option>
         </select>
       </div>
     </div>

diff --git a/videos_handlers.go b/videos_handlers.go
@@ -32,7 +32,7 @@ func HandleDownloadVideo(w http.ResponseWriter, r *http.Request) {
 	case "Audio Only":
 		ytdlCommand.FileType = "bestaudio[ext=" + videoData.FileExtension + "]"
 	case "Video And Audio":
-		ytdlCommand.FileType = "bestvideo[ext=" + videoData.FileExtension + "]"
+		ytdlCommand.FileType = "bestvideo[height<=" + videoData.DownloadQuality + "]" + "+ bestaudio/best[height<=" + videoData.DownloadQuality + "]"
 	}
 	err = DownloadVideo(ytdlCommand)
 	if err != nil {

diff --git a/youtube-dl.go b/youtube-dl.go
@@ -63,17 +63,13 @@ func (target DownloadTarget) Download(downloadQuality, fileExtension string, dow
 		Binary: "youtube-dl",
 		Target: target.URL,
 	}
-	switch target.DownloadPath {
-	default:
-		ytdlCommand.Output = filepath.Join(dlRoot, target.DownloadPath)
-	case "":
-		ytdlCommand.Output = filepath.Join(dlRoot, "/%(uploader)s/audio/%(title)s.%(ext)s")
-	}
 	switch target.DownloadMode {
 	case "Audio Only":
 		ytdlCommand.FileType = "bestaudio"
+		ytdlCommand.Output = filepath.Join(dlRoot, target.DownloadPath)
 	case "Video And Audio":
 		ytdlCommand.FileType = "bestvideo[height<=" + downloadQuality + "]" + "+ bestaudio/best[height<=" + downloadQuality + "]"
+		ytdlCommand.Output = filepath.Join(dlRoot, target.DownloadPath)
 	}
 	switch downloadEntire {
 	case true: