V2022.10.3-beta1

meson.build

@@ -1,4 +1,4 @@
-project('org.nickvision.tubeconverter', ['cpp', 'c'], version: '2022.10.2', meson_version: '>= 0.59.0', default_options: ['warning_level=3', 'werror=false', 'cpp_std=c++20'])
+project('org.nickvision.tubeconverter', ['cpp', 'c'], version: '2022.10.3', meson_version: '>= 0.59.0', default_options: ['warning_level=3', 'werror=false', 'cpp_std=c++20'])
 
 gnome = import('gnome')
 

org.nickvision.tubeconverter.json

@@ -34,7 +34,7 @@
                 {
                     "type": "git",
                     "url": "https://github.com/nlogozzo/NickvisionTubeConverter.git",
-                    "tag": "2022.10.2"
+                    "tag": "2022.10.3-beta1"
                 }
             ]
         }

org.nickvision.tubeconverter.metainfo.xml

@@ -36,12 +36,9 @@
     <binary>org.nickvision.tubeconverter</binary>
   </provides>
   <releases>
-    <release version="2022.10.2" date="2022-10-15">
+    <release version="2022.10.3-beta1" date="2022-10-16">
       <description>
-        <p>- New application icon (Thanks @martin-desktops!)</p>
-        <p>- Implemented proper stop function for download</p>
-        <p>- 'New Filename' is now allowed to be empty. If it is empty, the video title will be used</p>
-        <p>- Improved video url checking</p>
+        <p>- Added a preference to embed metadata in a download</p>
       </description>
     </release>
   </releases>

src/controllers/mainwindowcontroller.cpp

@@ -42,6 +42,11 @@ void MainWindowController::startup()
     }
 }
 
+bool MainWindowController::getEmbedMetadata() const
+{
+    return m_configuration.getEmbedMetadata();
+}
+
 bool MainWindowController::getIsDownloadsRunning() const
 {
     for(const std::shared_ptr<Download>& download : m_downloads)

src/controllers/mainwindowcontroller.hpp

@@ -58,6 +58,12 @@ namespace NickvisionTubeConverter::Controllers
 		 * Runs startup functions
 		 */
 		void startup();
+		/**
+		 * Gets whether or not to embed metadata in a download
+		 *
+		 * @returns True to embed, else false
+		 */
+		bool getEmbedMetadata() const;
 		/**
 		 * Gets whether or not downloads are running
 		 *

src/controllers/preferencesdialogcontroller.cpp

@@ -18,6 +18,16 @@ void PreferencesDialogController::setTheme(int theme)
     m_configuration.setTheme(static_cast<Theme>(theme));
 }
 
+bool PreferencesDialogController::getEmbedMetadata() const
+{
+    return m_configuration.getEmbedMetadata();
+}
+
+void PreferencesDialogController::setEmbedMetadata(bool embedMetadata)
+{
+    m_configuration.setEmbedMetadata(embedMetadata);
+}
+
 void PreferencesDialogController::saveConfiguration() const
 {
     m_configuration.save();

src/controllers/preferencesdialogcontroller.hpp

@@ -28,6 +28,18 @@ namespace NickvisionTubeConverter::Controllers
 		 * @param theme The new theme as an int
 		 */
 		void setTheme(int theme);
+		/**
+		 * Gets whether or not to embed metadata in a download
+		 *
+		 * @returns True to embed, else false
+		 */
+		bool getEmbedMetadata() const;
+		/**
+		 * Sets whether or not to embed metadata in a download
+		 *
+		 * @param embedMetadata True to embed, else false
+		 */
+		void setEmbedMetadata(bool embedMetadata);
 		/**
 		 * Saves the configuration file
 		 */

src/models/configuration.cpp

@@ -6,7 +6,7 @@
 
 using namespace NickvisionTubeConverter::Models;
 
-Configuration::Configuration() : m_configDir{ std::string(g_get_user_config_dir()) + "/Nickvision/NickvisionTubeConverter/" }, m_theme{ Theme::System }, m_previousSaveFolder { "" }, m_previousFileType{ MediaFileType::MP4 }
+Configuration::Configuration() : m_configDir{ std::string(g_get_user_config_dir()) + "/Nickvision/NickvisionTubeConverter/" }, m_theme{ Theme::System }, m_previousSaveFolder { "" }, m_previousFileType{ MediaFileType::MP4 }, m_embedMetadata{ true }
 {
     if(!std::filesystem::exists(m_configDir))
     {
@@ -20,6 +20,7 @@ Configuration::Configuration() : m_configDir{ std::string(g_get_user_config_dir(
         m_theme = static_cast<Theme>(json.get("Theme", 0).asInt());
         m_previousSaveFolder = json.get("PreviousSaveFolder", "").asString();
         m_previousFileType = static_cast<MediaFileType::Value>(json.get("PreviousFileType", 0).asInt());
+        m_embedMetadata = json.get("EmbedMetadata", true).asBool();
     }
 }
 
@@ -53,6 +54,16 @@ void Configuration::setPreviousFileType(const MediaFileType& previousFileType)
     m_previousFileType = previousFileType;
 }
 
+bool Configuration::getEmbedMetadata() const
+{
+    return m_embedMetadata;
+}
+
+void Configuration::setEmbedMetadata(bool embedMetadata)
+{
+    m_embedMetadata = embedMetadata;
+}
+
 void Configuration::save() const
 {
     std::ofstream configFile{ m_configDir + "config.json" };
@@ -62,6 +73,7 @@ void Configuration::save() const
         json["Theme"] = static_cast<int>(m_theme);
         json["PreviousSaveFolder"] = m_previousSaveFolder;
         json["PreviousFileType"] = static_cast<int>(m_previousFileType);
+        json["EmbedMetadata"] = m_embedMetadata;
         configFile << json;
     }
 }

src/models/configuration.hpp

@@ -61,6 +61,18 @@ namespace NickvisionTubeConverter::Models
 		 * @param previousFileType The new previous file type
 		 */
 		void setPreviousFileType(const MediaFileType& previousFileType);
+		/**
+		 * Gets whether or not to embed metadata in a download
+		 *
+		 * @returns True to embed, else false
+		 */
+		bool getEmbedMetadata() const;
+		/**
+		 * Sets whether or not to embed metadata in a download
+		 *
+		 * @param embedMetadata True to embed, else false
+		 */
+		void setEmbedMetadata(bool embedMetadata);
 		/**
 		 * Saves the configuration to disk
 		 */
@@ -71,5 +83,6 @@ namespace NickvisionTubeConverter::Models
 		Theme m_theme;
 		std::string m_previousSaveFolder;
 		MediaFileType m_previousFileType;
+		bool m_embedMetadata;
 	};
 }

src/models/download.cpp

@@ -142,7 +142,7 @@ bool Download::getIsDone()
     return m_isDone;
 }
 
-bool Download::download()
+bool Download::download(bool embedMetadata)
 {
     std::string cmd{ "" };
 	if (getMediaFileType().isVideo())
@@ -154,6 +154,10 @@ bool Download::download()
 	{
 		cmd = "yt-dlp --extract-audio --audio-format " + getMediaFileType().toString() + " --audio-quality " + (getQuality() == Quality::Best ? "0" : getQuality() == Quality::Good ? "5" : "10") + " \"" + getVideoUrl() + "\" -o \"" + getSavePathWithoutExtension() + ".%(ext)s\"";
 	}
+	if(embedMetadata)
+	{
+	    cmd += " --add-metadata --embed-thumbnail";
+	}
 	setLog("URL: " + getVideoUrl() + "\nPath: " + getSavePath() + "\nQuality: " + std::to_string(static_cast<int>(getQuality())) + "\n\n");
 	std::array<char, 128> buffer;
 	FILE* fp{ popen2(cmd, "r", m_pid) };

src/models/download.hpp

@@ -89,9 +89,10 @@ namespace NickvisionTubeConverter::Models
 		/**
 		 * Downloads the video
 		 *
+		 * @param embedMetadata Whether or not to embed metadata into the download file
 		 * @returns True if successful, else false
 		 */
-		bool download();
+		bool download(bool embedMetadata);
 		/**
 		 * Stops the download
 		 */

src/ui/application.cpp

@@ -13,8 +13,8 @@ Application::Application(const std::string& id, GApplicationFlags flags) : m_adw
     m_appInfo.setName("Nickvision Tube Converter");
     m_appInfo.setShortName("Tube Converter");
     m_appInfo.setDescription("An easy-to-use YouTube video downloader.");
-    m_appInfo.setVersion("2022.10.2");
-    m_appInfo.setChangelog("<ul><li>New application icon (Thanks @martin-desktops!)</li><li>Implemented proper stop function for download</li><li>'New Filename' is now allowed to be empty. If it is empty, the video title will be used</li><li>Improved video url checking</li></ul>");
+    m_appInfo.setVersion("2022.10.3-beta1");
+    m_appInfo.setChangelog("<ul><li>Added a preference to embed metadata in a download</li></ul>");
     m_appInfo.setGitHubRepo("https://github.com/nlogozzo/NickvisionTubeConverter");
     m_appInfo.setIssueTracker("https://github.com/nlogozzo/NickvisionTubeConverter/issues/new");
     m_appInfo.setSupportUrl("https://github.com/nlogozzo/NickvisionTubeConverter/discussions");

src/ui/controls/downloadrow.cpp

@@ -58,9 +58,9 @@ GtkWidget* DownloadRow::gobj()
     return m_gobj;
 }
 
-void DownloadRow::start()
+void DownloadRow::start(bool embedMetadata)
 {
-    std::future<bool> result{ std::async(std::launch::async, [&]() -> bool { return m_download->download(); }) };
+    std::future<bool> result{ std::async(std::launch::async, [&, embedMetadata]() -> bool { return m_download->download(embedMetadata); }) };
     std::future_status status{ std::future_status::timeout };
     gtk_style_context_add_class(gtk_widget_get_style_context(m_imgStatus), "accent");
     while(status != std::future_status::ready)

src/ui/controls/downloadrow.hpp

@@ -27,8 +27,10 @@ namespace NickvisionTubeConverter::UI::Controls
 		GtkWidget* gobj();
 		/**
 		 * Starts the Download managed by the row
+		 *
+		 * @param embedMetadata Whether or not to embed metadata in a download
 		 */
-		void start();
+		void start(bool embedMetadata);
 
 	private:
 		std::shared_ptr<NickvisionTubeConverter::Models::Download> m_download;

src/ui/views/mainwindow.cpp

@@ -16,7 +16,7 @@ using namespace NickvisionTubeConverter::UI::Views;
 MainWindow::MainWindow(GtkApplication* application, const MainWindowController& controller) : m_controller{ controller }, m_gobj{ adw_application_window_new(application) }
 {
     //Window Settings
-    gtk_window_set_default_size(GTK_WINDOW(m_gobj), 800, 600);
+    gtk_window_set_default_size(GTK_WINDOW(m_gobj), 900, 700);
     if(m_controller.getIsDevVersion())
     {
         gtk_style_context_add_class(gtk_widget_get_style_context(m_gobj), "devel");
@@ -136,7 +136,7 @@ void MainWindow::onAddDownload()
         std::unique_ptr<DownloadRow> row{ std::make_unique<DownloadRow>(GTK_WINDOW(m_gobj), download) };
         m_controller.addDownload(download);
         adw_preferences_group_add(ADW_PREFERENCES_GROUP(m_grpDownloads), row->gobj());
-        row->start();
+        row->start(m_controller.getEmbedMetadata());
         m_downloadRows.push_back(std::move(row));
     }
 }

src/ui/views/preferencesdialog.cpp

@@ -24,16 +24,31 @@ PreferencesDialog::PreferencesDialog(GtkWindow* parent, const PreferencesDialogC
     adw_action_row_set_subtitle(ADW_ACTION_ROW(m_rowTheme), "A theme change will be applied once the dialog is closed.");
     adw_combo_row_set_model(ADW_COMBO_ROW(m_rowTheme), G_LIST_MODEL(gtk_string_list_new(new const char*[4]{ "System", "Light", "Dark", nullptr })));
     adw_preferences_group_add(ADW_PREFERENCES_GROUP(m_grpUserInterface), m_rowTheme);
+    //Converter Group
+    m_grpConverter = adw_preferences_group_new();
+    adw_preferences_group_set_title(ADW_PREFERENCES_GROUP(m_grpConverter), "Converter");
+    adw_preferences_group_set_description(ADW_PREFERENCES_GROUP(m_grpConverter), "Customize converter settings.");
+    //Embed Metadata Row
+    m_rowEmbedMetadata = adw_action_row_new();
+    m_switchEmbedMetadata = gtk_switch_new();
+    gtk_widget_set_valign(m_switchEmbedMetadata, GTK_ALIGN_CENTER);
+    adw_preferences_row_set_title(ADW_PREFERENCES_ROW(m_rowEmbedMetadata), "Embed Metadata");
+    adw_action_row_set_subtitle(ADW_ACTION_ROW(m_rowEmbedMetadata), "If checked, video metadata will be included in the downloaded file.");
+    adw_action_row_add_suffix(ADW_ACTION_ROW(m_rowEmbedMetadata), m_switchEmbedMetadata);
+    adw_action_row_set_activatable_widget(ADW_ACTION_ROW(m_rowEmbedMetadata), m_switchEmbedMetadata);
+    adw_preferences_group_add(ADW_PREFERENCES_GROUP(m_grpConverter), m_rowEmbedMetadata);
     //Page
     m_page = adw_preferences_page_new();
     adw_preferences_page_add(ADW_PREFERENCES_PAGE(m_page), ADW_PREFERENCES_GROUP(m_grpUserInterface));
+    adw_preferences_page_add(ADW_PREFERENCES_PAGE(m_page), ADW_PREFERENCES_GROUP(m_grpConverter));
     //Main Box
     m_mainBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_box_append(GTK_BOX(m_mainBox), m_headerBar);
     gtk_box_append(GTK_BOX(m_mainBox), m_page);
     adw_window_set_content(ADW_WINDOW(m_gobj), m_mainBox);
     //Load Configuration
     adw_combo_row_set_selected(ADW_COMBO_ROW(m_rowTheme), m_controller.getThemeAsInt());
+    gtk_switch_set_active(GTK_SWITCH(m_switchEmbedMetadata), m_controller.getEmbedMetadata());
 }
 
 GtkWidget* PreferencesDialog::gobj()
@@ -49,6 +64,7 @@ void PreferencesDialog::run()
         g_main_context_iteration(g_main_context_default(), false);
     }
     m_controller.setTheme(adw_combo_row_get_selected(ADW_COMBO_ROW(m_rowTheme)));
+    m_controller.setEmbedMetadata(gtk_switch_get_active(GTK_SWITCH(m_switchEmbedMetadata)));
     m_controller.saveConfiguration();
     if(m_controller.getThemeAsInt() == 0)
     {

src/ui/views/preferencesdialog.hpp

@@ -37,5 +37,8 @@ namespace NickvisionTubeConverter::UI::Views
 		GtkWidget* m_page{ nullptr };
 		GtkWidget* m_grpUserInterface{ nullptr };
 		GtkWidget* m_rowTheme{ nullptr };
+		GtkWidget* m_grpConverter{ nullptr };
+		GtkWidget* m_rowEmbedMetadata{ nullptr };
+		GtkWidget* m_switchEmbedMetadata{ nullptr };
 	};
 }