v2.16.0

Author: ErrorFlynn

ytdlp-interface/forms/form_formats.cpp

@@ -286,7 +286,7 @@ void GUI::fm_formats()
 			auto item {lbq.at(lbq.selected().front())};
 			auto it {std::find_if(vidinfo["formats"].begin(), vidinfo["formats"].end(), [&](const auto &el)
 			{
-				return el["format"].get<std::string>().rfind(nana::to_utf8(strfmt)) != -1;
+				return el["format_id"].get<std::string>() == nana::to_utf8(strfmt);
 			})};
 			std::string fsize {"---"}, fmt_note, ext, fmtid;
 			if(it != vidinfo["formats"].end())

ytdlp-interface/forms/form_input.cpp

@@ -0,0 +1,62 @@
+#include "../gui.hpp"
+
+
+std::pair<bool, std::string> GUI::input_box(nana::window owner, std::string caption, std::string prompt)
+{
+	using widgets::theme;
+	using namespace nana;
+	std::pair<bool, std::string> ret;
+
+	themed_form fm {nullptr, owner, {}, appear::decorate{}};
+	fm.center(400, 165);
+	fm.caption(caption);
+	fm.snap(conf.cbsnap);
+
+	fm.div(R"(vert margin=20
+		<l_prompt weight=30> <weight=15>
+		<weight=25 <tb>> <weight=20>
+		<<><btn_ok weight=90> <weight=20> <btn_cancel weight=90> <>>
+	)");
+
+	::widgets::Label l_prompt {fm, prompt};
+	l_prompt.text_align(align::center, align_v::center);
+
+	::widgets::Textbox tb {fm};
+	tb.multi_lines(false);
+	tb.padding(0, 5, 0, 5);
+	tb.events().key_press([&](const arg_keyboard &arg)
+	{
+		if(arg.key == keyboard::enter)
+		{
+			ret = {true, tb.caption()};
+			fm.close();
+		}
+	});
+
+	::widgets::Button btn_ok {fm, "OK"}, btn_cancel {fm, "Cancel"};
+	btn_ok.events().click([&] { ret = {true, tb.caption()}; fm.close(); });
+	btn_cancel.events().click([&] { ret = {false, ""}; fm.close(); });
+	
+	fm["l_prompt"] << l_prompt;
+	fm["tb"] << tb;
+	fm["btn_ok"] << btn_ok;
+	fm["btn_cancel"] << btn_cancel;
+
+	fm.theme_callback([&](bool dark)
+	{
+		fm.bgcolor(theme::fmbg.blend(dark ? colors::white : colors::grey, .04));
+		fm.refresh_widgets();
+		return false;
+	});
+
+	if(conf.cbtheme == 2)
+		fm.system_theme(true);
+	else fm.dark_theme(conf.cbtheme == 0);
+
+	tb.focus();
+	fm.collocate();
+	fm.activate();
+	fm.show();
+	fm.modality();
+	return ret;
+}

ytdlp-interface/forms/form_playlist.cpp

@@ -113,7 +113,13 @@ void GUI::fm_playlist()
 			durstr += ':' + ss.str();
 		}
 
-		string title {entry["title"]};
+		string title {"title not available"};
+		if(entry.contains("title"))
+			title = entry["title"].get<std::string>();
+		else if(entry.contains("id"))
+			title = entry["id"].get<std::string>();
+		else if(entry.contains("url"))
+			title = entry["url"].get<std::string>();
 		if(!is_utf8(title))
 		{
 			std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> u16conv;