Cleaned up code and using new interface

src/content.hpp

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <functional>
+#include <string>
+class Content {
+ public:
+  virtual ~Content() = default;
+  virtual auto rip(const std::string& musicFolder, std::function<void(int)> status) -> bool = 0;
+  virtual auto info(std::string& artist, std::string& title) -> void = 0;
+};

src/main.cpp

@@ -1,15 +1,21 @@
+#include <cstdio>
 #include <filesystem>
 #include <iostream>
+#include <queue>
+#include <regex>
 #include <string>
 
 #include "config.hpp"
+#include "content.hpp"
+#include "playlist.hpp"
 #include "utils.hpp"
+#include "video.hpp"
 
 auto main(int argc, char* argv[]) -> int {
-  std::vector<std::string> urls;
+  std::queue<std::string> urls;
 
   printf(
-      "Welcome to YTMusicDL26! You can use playlists or video from youtube or youtube music (youtube music is "
+      "Welcome to YTMusicDL26! You can use playlists or videos from youtube or youtube music (youtube music is "
       "better).\n");
   printf("Type \"end\" when your finished.\n");
 
@@ -23,15 +29,50 @@ auto main(int argc, char* argv[]) -> int {
       break;
     }
 
-    urls.push_back(input);
+    urls.push(input);
     index++;
   }
 
-  printf("Starting rips...\n");
-
   std::string musicDir = musicFolder();
   std::filesystem::create_directories(TMP_DOWNLOAD_FOLDER);
-  for (const std::string& url : urls) {
-    autoDetermineRip(musicDir, url);
+
+  printf("\n");
+
+  while (!urls.empty()) {
+    const std::string& currentUrl = urls.front();
+
+    Content* content = nullptr;
+    if (std::regex_search(currentUrl, std::regex("youtube.com/playlist"))) {
+      content = new Playlist(currentUrl);
+    } else if (std::regex_search(currentUrl, std::regex("youtube.com/watch"))) {
+      content = new Video(currentUrl);
+    }
+
+    if (content == nullptr) {
+      printf("ERROR: Failed to create content object\n");
+      urls.pop();
+      delete content;
+      continue;
+    }
+
+    if (!content->rip(musicDir, [&content, &urls](int percent) {
+          if (percent == 0) {
+            printf("\rGathering info... (this may take awhile)");
+            fflush(stdout);
+          } else {
+            std::string artist;
+            std::string album;
+            content->info(artist, album);
+            printf("\r%s by %s at %d%%", album.c_str(), artist.c_str(), percent);
+            fflush(stdout);
+          }
+        })) {
+      printf("Failed to rip content\n");
+    }
+
+    printf("\n");
+
+    urls.pop();
+    delete content;
   }
 }

src/playlist.cpp

@@ -21,33 +21,48 @@ Playlist::Playlist(const std::string& playlistUrl) {
   this->playlistUrl = std::regex_replace(playlistUrl, std::regex("music.youtube"), "www.youtube");
 }
 
-auto Playlist::rip(const std::string& musicFolder) -> bool {
-  printf("Writting to data.json\n");
-  json data = writeAndReturnDataJson(playlistUrl);
+auto Playlist::rip(const std::string& musicFolder, std::function<void(int)> status) -> bool {
+  status(0);
 
-  if (!download()) {
+  data = writeAndReturnDataJson(playlistUrl);
+
+  // Get the name of the artist and album from data.json
+  artist = data["entries"][0]["uploader"];
+  artist = std::regex_replace(artist, std::regex(" - Topic"), "");
+  album = data["title"];
+  album = std::regex_replace(album, std::regex("Album - "), "");
+
+  status(30);
+
+  // Download the content as mp3
+  if (!download(status)) {
     printf("ERROR: Failed to download playlsit\n");
     return false;
   }
 
-  if (!writeMetadata(data)) {
-    printf("ERROR: Failed to write metatdata for playlsit\n");
-    return false;
-  }
+  status(80);
 
-  std::string artist;
-  std::string album;
-  aristAndAlbumName(data, artist, album);
+  std::string coverUrl = data["thumbnails"][1]["url"];
+  writeMetadataToTmpFolder(artist, album, coverUrl);
 
+  status(95);
+
+  // Move the files into the users Music folder
   if (!moveAndSortTmpFilesToFolder(musicFolder, artist, album)) {
     printf("ERROR: Failed to move files to music folder\n");
     return false;
   }
 
+  status(100);
   return true;
 }
 
-auto Playlist::download() -> bool {
+auto Playlist::info(std::string& artist, std::string& title) -> void {
+  artist = this->artist != "" ? this->artist : "Finding...";
+  title = this->album != "" ? this->album : "Finding...";
+}
+
+auto Playlist::download(std::function<void(int)> status) -> bool {
   std::vector<std::string> videoUrls = urlsFromPlaylist(playlistUrl);
 
   if (videoUrls.empty()) {
@@ -60,66 +75,39 @@ auto Playlist::download() -> bool {
     return false;
   }
 
-  playlistUrl = std::regex_replace(playlistUrl, std::regex("music.youtube"), "www.youtube");
+  if (!forEachConcurrent(videoUrls, status, [this](const std::string& url) { return downloadVideo(url); })) {
+    printf("ERROR: Failed to download playlist currently\n");
+    return false;
+  }
 
-  int count = 0;
+  return true;
+}
 
-  for (size_t i = 0; i < videoUrls.size(); i += MAX_THREADS) {
-    std::vector<std::future<void>> futures;
+auto Playlist::forEachConcurrent(const std::vector<std::string>& urls, std::function<void(int)> status,
+                                 std::function<bool(const std::string&)> onStart) -> bool {
+  int percent = 30;
 
-    size_t end = std::min(i + MAX_THREADS, videoUrls.size());
+  for (size_t i = 0; i < urls.size(); i += MAX_THREADS) {
+    std::vector<std::future<bool>> futures;
+
+    size_t end = std::min(i + MAX_THREADS, urls.size());
 
     for (size_t j = i; j < end; ++j) {
-      futures.push_back(std::async(std::launch::async, [&videoUrls, j]() { downloadVideo(videoUrls[j]); }));
+      std::string url = urls[j];
+      futures.push_back(std::async(std::launch::async, [&onStart, url]() { return onStart(url); }));
     }
 
-    for (auto& future : futures) {
-      future.get();
-      count++;
-      printf("Finished [%d/%d] in playlist %s\n", count, (int)videoUrls.size(), playlistUrl.c_str());
-    }
+    for (std::future<bool>& future : futures) {
+      if (!future.get()) {
+        printf("ERROR: Failed to download video from playlist concurrently\n");
+        return false;
       }
 
-  printf("Finished downloading playlist.\n");
-
-  return true;
+      percent += 50 / urls.size();
+      status(percent);
     }
-
-auto Playlist::writeMetadata(const json& data) -> bool {
-  std::string artist;
-  std::string album;
-  aristAndAlbumName(data, artist, album);
-
-  printf("Starting to write metadata for %s by %s.\n", album.c_str(), artist.c_str());
-
-  printf("Finding album cover.\n");
-  std::string coverUrl = data["thumbnails"][1]["url"];
-  downloadImageToTmpFolder(coverUrl);
-
-  printf("Writting data to files.\n");
-
-  size_t index = 1;
-  for (const auto& entry : std::filesystem::directory_iterator(TMP_DOWNLOAD_FOLDER)) {
-    if (std::filesystem::path(entry.path().string()).filename().string() == "cover.jpg") continue;
-
-    metadata(entry.path().string(), artist, album, index);
-    printf("Finished writting metadata for %s.\n", entry.path().string().c_str());
-    std::filesystem::remove(entry.path().string());
-    index++;
   }
 
-  printf("Finished writting metadata for %s by %s.\n", album.c_str(), artist.c_str());
-
-  return true;
-}
-
-auto Playlist::aristAndAlbumName(const nlohmann::json& data, std::string& artist, std::string& album) -> bool {
-  artist = data["entries"][0]["uploader"];
-  artist = std::regex_replace(artist, std::regex(" - Topic"), "");
-
-  album = data["title"];
-  album = std::regex_replace(album, std::regex("Album - "), "");
-
   return true;
 }
 

src/playlist.hpp

@@ -1,19 +1,27 @@
 #pragma once
 
-#include <nlohmann/json_fwd.hpp>
+#include <functional>
+#include <nlohmann/json.hpp>
 #include <string>
 #include <vector>
 
-class Playlist {
+#include "content.hpp"
+
+class Playlist : public Content {
   std::string playlistUrl;
 
+  std::string artist = "";
+  std::string album = "";
+  nlohmann::json data;
+
  public:
   Playlist(const std::string& playlistUrl);
-  auto rip(const std::string& musicFolder) -> bool;
+  auto rip(const std::string& musicFolder, std::function<void(int)> status) -> bool;
+  auto info(std::string& artist, std::string& title) -> void;
 
  private:
-  auto download() -> bool;
-  auto writeMetadata(const nlohmann::json& data) -> bool;
-  auto aristAndAlbumName(const nlohmann::json& data, std::string& artist, std::string& album) -> bool;
+  auto download(std::function<void(int)> status) -> bool;
+  auto forEachConcurrent(const std::vector<std::string>& urls, std::function<void(int)> status,
+                         std::function<bool(const std::string&)> onStart) -> bool;
   auto urlsFromPlaylist(const std::string& url) -> std::vector<std::string>;
 };

src/utils.cpp

@@ -12,8 +12,6 @@
 #include <string>
 
 #include "config.hpp"
-#include "playlist.hpp"
-#include "video.hpp"
 
 using json = nlohmann::json;
 
@@ -26,6 +24,7 @@ auto ytdlp(const std::string& args) -> bool {
 auto metadata(const std::string& file, const std::string& artist, const std::string& album, size_t index) -> void {
   std::string name = std::filesystem::path(file).filename().string();
   name = std::regex_replace(name, std::regex(".mp3"), "");
+  name.erase(0, 1);  // Remove leading underscore
 
   system(std::format("{} "
                      "-hide_banner -loglevel error "
@@ -39,9 +38,8 @@ auto metadata(const std::string& file, const std::string& artist, const std::str
                      "-metadata artist=\"{}\" "
                      "-metadata album=\"{}\" "
                      "-metadata track=\"{}\" "
-                     "\"{}/{}_{}.mp3\"",
-                     BIN_FFMPEG, file, TMP_DOWNLOAD_FOLDER, name, artist, album, index, TMP_DOWNLOAD_FOLDER, index,
-                     name)
+                     "\"{}/{}.mp3\"",
+                     BIN_FFMPEG, file, TMP_DOWNLOAD_FOLDER, name, artist, album, index, TMP_DOWNLOAD_FOLDER, name)
              .c_str());
 }
 
@@ -60,7 +58,8 @@ auto downloadImageToTmpFolder(std::string url) -> bool {
     return false;
   }
 
-  url = std::regex_replace(url, std::regex("https"), "http");
+  // TODO Breaks album covers but this is needed for windows
+  // url = std::regex_replace(url, std::regex("https"), "http");
   auto outputPath = std::filesystem::path(TMP_DOWNLOAD_FOLDER) / "cover.jpg";
   FILE* file = std::fopen(outputPath.string().c_str(), "wb");
   if (!file) {
@@ -98,11 +97,10 @@ auto downloadVideo(const std::string& url) -> bool {
                   "--quiet "
                   "-f \"bestaudio/best\" "
                   "-x --audio-format mp3 "
-                  "-o \"{}/%(title)s.%(ext)s\" "
+                  "-o \"{}/_%(title)s.%(ext)s\" "
                   "{}",
                   BIN_DENO, TMP_DOWNLOAD_FOLDER, url));
 
-  printf("Finished downloading video %s.\n", url.c_str());
   return true;
 }
 
@@ -141,18 +139,6 @@ auto moveAndSortTmpFilesToFolder(const std::string& folder, const std::string& a
   return true;
 }
 
-auto autoDetermineRip(const std::string& musicFolder, const std::string& url) -> bool {
-  if (std::regex_search(url, std::regex("youtube.com/playlist"))) {
-    return Playlist(url).rip(musicFolder);
-  }
-
-  if (std::regex_search(url, std::regex("youtube.com/watch"))) {
-    return Video(url).rip(musicFolder);
-  }
-
-  return false;
-}
-
 auto musicFolder() -> std::string {
 #ifdef _WIN32
   const char* userProfile = std::getenv("USERPROFILE");
@@ -164,3 +150,17 @@ auto musicFolder() -> std::string {
 
   return "";
 }
+
+auto writeMetadataToTmpFolder(const std::string& artist, const std::string& album, const std::string& coverUrl)
+    -> void {
+  downloadImageToTmpFolder(coverUrl);
+
+  size_t index = 1;
+  for (const auto& entry : std::filesystem::directory_iterator(TMP_DOWNLOAD_FOLDER)) {
+    if (std::filesystem::path(entry.path().string()).filename().string() == "cover.jpg") continue;
+
+    metadata(entry.path().string(), artist, album, index);
+    std::filesystem::remove(entry.path().string());
+    index++;
+  }
+}

src/utils.hpp

@@ -17,6 +17,6 @@ auto writeAndReturnDataJson(const std::string& url) -> nlohmann::json;
 auto moveAndSortTmpFilesToFolder(const std::string& folder, const std::string& artist, const std::string& album)
     -> bool;
 
-auto autoDetermineRip(const std::string& musicFolder, const std::string& url) -> bool;
-
 auto musicFolder() -> std::string;
+
+auto writeMetadataToTmpFolder(const std::string& artist, const std::string& album, const std::string& coverUrl) -> void;

src/video.cpp

@@ -1,18 +1,9 @@
 #include "video.hpp"
 
-#include <cstddef>
-#include <cstdio>
-#include <cstdlib>
-#include <filesystem>
-#include <format>
-#include <fstream>
-#include <future>
 #include <nlohmann/json.hpp>
 #include <regex>
 #include <string>
-#include <vector>
 
-#include "config.hpp"
 #include "utils.hpp"
 
 using json = nlohmann::json;
@@ -21,32 +12,44 @@ Video::Video(const std::string& videoUrl) {
   this->videoUrl = std::regex_replace(videoUrl, std::regex("music.youtube"), "www.youtube");
 }
 
-auto Video::rip(const std::string& musicFolder) -> bool {
-  printf("Writting to data.json\n");
-  json data = writeAndReturnDataJson(videoUrl);
+auto Video::rip(const std::string& musicFolder, std::function<void(int)> status) -> bool {
+  status(0);
+
+  data = writeAndReturnDataJson(videoUrl);
+
+  artist = data["uploader"];
+  artist = std::regex_replace(artist, std::regex(" - Topic"), "");
+  album = data["title"];
+  album = std::regex_replace(album, std::regex("Album - "), "");
+
+  status(50);
 
   if (!download()) {
     printf("ERROR: Failed to download playlsit\n");
     return false;
   }
 
-  if (!writeMetadata(data)) {
-    printf("ERROR: Failed to write metatdata for playlsit\n");
-    return false;
-  }
+  status(80);
 
-  std::string artist;
-  std::string album;
-  aristAndAlbumName(data, artist, album);
+  std::string coverUrl = data["thumbnails"][1]["url"];
+  writeMetadataToTmpFolder(artist, album, coverUrl);
+
+  status(95);
 
   if (!moveAndSortTmpFilesToFolder(musicFolder, artist, album)) {
     printf("ERROR: Failed to move files to music folder\n");
     return false;
   }
 
+  status(100);
   return true;
 }
 
+auto Video::info(std::string& artist, std::string& title) -> void {
+  artist = this->artist != "" ? this->artist : "Finding...";
+  title = this->album != "" ? this->album : "Finding...";
+}
+
 auto Video::download() -> bool {
   if (videoUrl == "") {
     printf("ERROR: Tried to download empty video, %s\n", videoUrl.c_str());
@@ -63,44 +66,5 @@ auto Video::download() -> bool {
     return false;
   }
 
-  printf("Finished downloading video %s\n", videoUrl.c_str());
-  return true;
-}
-
-auto Video::writeMetadata(const nlohmann::json& data) -> bool {
-  std::string artist;
-  std::string album;
-  aristAndAlbumName(data, artist, album);
-
-  printf("Starting to write metadata for %s by %s.\n", album.c_str(), artist.c_str());
-
-  printf("Finding album cover.\n");
-  std::string coverUrl = data["thumbnails"][1]["url"];
-  downloadImageToTmpFolder(coverUrl);
-
-  printf("Writting data to files.\n");
-
-  size_t index = 1;
-  for (const auto& entry : std::filesystem::directory_iterator(TMP_DOWNLOAD_FOLDER)) {
-    if (std::filesystem::path(entry.path().string()).filename().string() == "cover.jpg") continue;
-
-    metadata(entry.path().string(), artist, album, index);
-    printf("Finished writting metadata for %s.\n", entry.path().string().c_str());
-    std::filesystem::remove(entry.path().string());
-    index++;
-  }
-
-  printf("Finished writting metadata for %s by %s.\n", album.c_str(), artist.c_str());
-
-  return true;
-}
-
-auto Video::aristAndAlbumName(const nlohmann::json& data, std::string& artist, std::string& album) -> bool {
-  artist = data["uploader"];
-  artist = std::regex_replace(artist, std::regex(" - Topic"), "");
-
-  album = data["title"];
-  album = std::regex_replace(album, std::regex("Album - "), "");
-
   return true;
 }

src/video.hpp

@@ -1,17 +1,22 @@
 #pragma once
 
-#include <nlohmann/json_fwd.hpp>
+#include <nlohmann/json.hpp>
 #include <string>
 
-class Video {
+#include "content.hpp"
+
+class Video : public Content {
   std::string videoUrl;
 
+  std::string artist = "";
+  std::string album = "";
+  nlohmann::json data;
+
  public:
   Video(const std::string& videoUrl);
-  auto rip(const std::string& musicFolder) -> bool;
+  auto rip(const std::string& musicFolder, std::function<void(int)> status) -> bool;
+  auto info(std::string& artist, std::string& title) -> void;
 
  private:
   auto download() -> bool;
-  auto writeMetadata(const nlohmann::json& data) -> bool;
-  auto aristAndAlbumName(const nlohmann::json& data, std::string& artist, std::string& album) -> bool;
 };