From 21058e5ac4a048cc20733fa75db519763878674e Mon Sep 17 00:00:00 2001
From: Nedko <nedko@internedko.net>
Date: Mon, 1 Jul 2024 15:07:12 +0300
Subject: [PATCH] Prepare for tagging

---
 main.cpp          | 24 ++++++++++++++++--------
 monstercat_dl.cpp | 13 +------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/main.cpp b/main.cpp
index c591eb6..7095b24 100644
--- a/main.cpp
+++ b/main.cpp
@@ -96,6 +96,16 @@ int main(int argc, char **argv)
 			continue;
 		}
 
+		// Download Cover
+		ok = mcat.download_cover(release.catalog_id, release_folder);
+		if (!ok)
+		{
+			cout << "Could not download cover for release " << release.catalog_id << endl;
+			continue;
+		}
+
+		// TODO: Resize cover
+
 		// Download tracks (1 -- N)
 		for (Track& track : release.tracks)
 		{
@@ -103,6 +113,7 @@ int main(int argc, char **argv)
 
 			// Download MP3
 			filepath = build_fname(mp3_folder, "", filename);
+			filepath += ".mp3";
 			ok = mcat.download_track(release.id, track.id, filepath, FORMAT_MP3);
 			if (!ok)
 			{
@@ -111,8 +122,11 @@ int main(int argc, char **argv)
 				continue;
 			}
 
+			// TODO: Tag MP3
+
 			// Download FLAC
 			filepath = build_fname(flac_folder, "", filename);
+			filepath += ".flac";
 			ok = mcat.download_track(release.id, track.id, filepath, FORMAT_FLAC);
 			if (!ok)
 			{
@@ -121,6 +135,8 @@ int main(int argc, char **argv)
 				continue;
 			}
 
+			// TODO: Tag FLAC
+
 			// Download Extended Mix
 			if (!track.extended_mix_file_id.empty())
 			{
@@ -143,14 +159,6 @@ int main(int argc, char **argv)
 				}
 			}
 		}
-
-		// Download Cover
-		ok = mcat.download_cover(release.catalog_id, release_folder);
-		if (!ok)
-		{
-			cout << "Could not download cover for release " << release.catalog_id << endl;
-			continue;
-		}
 	}
 
 	ok = mcat.logout();
diff --git a/monstercat_dl.cpp b/monstercat_dl.cpp
index 6386395..cba075e 100644
--- a/monstercat_dl.cpp
+++ b/monstercat_dl.cpp
@@ -502,12 +502,11 @@ bool Monstercat_DL::download_cover(const string& catalog_id, const string& path)
 }
 
 bool Monstercat_DL::download_track(const string& release_id,
-	const string& track_id, const string& path, bool is_mp3)
+	const string& track_id, const string& filepath, bool is_mp3)
 {
 	CURL_DL& curl = CURL_DL::get_handle();
 	bool ok;
 	string url;
-	string filepath;
 	stringstream out_data;
 	ofstream out_file;
 
@@ -537,16 +536,6 @@ bool Monstercat_DL::download_track(const string& release_id,
 		return false;
 	}
 
-	filepath = path;
-	if (is_mp3)
-	{
-		filepath += ".mp3";
-	}
-	else
-	{
-		filepath += ".flac";
-	}
-
 	out_file.open(filepath, std::ios::binary);
 	if (!out_file.is_open())
 	{