Update import/export deck functions

Rename "Base64" to "Ydke", made the export deck functions actually return a string rather than a char pointer, made ImportDeckYdke take a string view

Author: edo9300

gframe/deck_con.cpp

@@ -137,16 +137,16 @@ void DeckBuilder::ImportDeck() {
 	if(deck_string) {
 		epro::wstringview text{ deck_string };
 		if(starts_with(text, L"ydke://"))
-			DeckManager::ImportDeckBase64(current_deck, text.data());
+			DeckManager::ImportDeckYdke(current_deck, text.data());
 		else
 			(void)DeckManager::ImportDeckBase64Omega(current_deck, text);
 		RefreshLimitationStatus();
 	}
 }
 void DeckBuilder::ExportDeckToClipboard(bool plain_text) {
-	auto deck_string = plain_text ? DeckManager::ExportDeckCardNames(current_deck) : DeckManager::ExportDeckBase64(current_deck);
-	if(deck_string) {
-		Utils::OSOperator->copyToClipboard(deck_string);
+	auto deck_string = plain_text ? DeckManager::ExportDeckCardNames(current_deck) : DeckManager::ExportDeckYdke(current_deck);
+	if(!deck_string.empty()) {
+		Utils::OSOperator->copyToClipboard(deck_string.data());
 		mainGame->stACMessage->setText(gDataManager->GetSysString(1368).data());
 	} else {
 		mainGame->stACMessage->setText(gDataManager->GetSysString(1369).data());
@@ -833,10 +833,10 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					break;
 				epro::wstringview text{ event.DropEvent.Text };
 				if(starts_with(text, L"ydke://")) {
-					gdeckManager->ImportDeckBase64(current_deck, event.DropEvent.Text);
+					gdeckManager->ImportDeckYdke(current_deck, text);
 					return true;
 				}
-				if(gdeckManager->ImportDeckBase64Omega(current_deck, event.DropEvent.Text))
+				if(gdeckManager->ImportDeckBase64Omega(current_deck, text))
 					return true;
 				std::wstringstream ss(Utils::ToUpperNoAccents(text));
 				std::wstring to;

gframe/deck_manager.cpp

@@ -471,8 +471,7 @@ std::string DeckManager::MakeYdkEntryString(uint32_t code) {
 		return epro::format("# {}\n{}\n", BufferIO::EncodeUTF8(gDataManager->GetName(code)), code);
 	return epro::to_string(code) + "\n";
 }
-const wchar_t* DeckManager::ExportDeckBase64(const Deck& deck) {
-	static std::wstring res;
+std::wstring DeckManager::ExportDeckYdke(const Deck& deck) {
 	auto decktobuf = [](const auto& src) {
 		static cardlist_type cards;
 		cards.resize(src.size());
@@ -481,16 +480,14 @@ const wchar_t* DeckManager::ExportDeckBase64(const Deck& deck) {
 		}
 		return base64_encode((uint8_t*)cards.data(), cards.size() * sizeof(cardlist_type::value_type));
 	};
-	res = epro::format(L"ydke://{}!{}!{}!", decktobuf(deck.main), decktobuf(deck.extra), decktobuf(deck.side));
-	return res.data();
+	return epro::format(L"ydke://{}!{}!{}!", decktobuf(deck.main), decktobuf(deck.extra), decktobuf(deck.side));
 }
-const wchar_t* DeckManager::ExportDeckCardNames(Deck deck) {
-	static std::wstring res;
-	res.clear();
+std::wstring DeckManager::ExportDeckCardNames(Deck deck) {
+	std::wstring res;
 	std::sort(deck.main.begin(), deck.main.end(), DataManager::deck_sort_lv);
 	std::sort(deck.extra.begin(), deck.extra.end(), DataManager::deck_sort_lv);
 	std::sort(deck.side.begin(), deck.side.end(), DataManager::deck_sort_lv);
-	auto serialize = [](const auto& list) {
+	auto serialize = [&](const auto& list) {
 		uint32_t prev = 0;
 		uint32_t count = 0;
 		for(const auto& card : list) {
@@ -531,14 +528,14 @@ const wchar_t* DeckManager::ExportDeckCardNames(Deck deck) {
 		res.append(L"Side Deck:\n");
 		serialize(deck.side);
 	}
-	return res.data();
+	return res;
 }
 static cardlist_type BufferToCardlist(const std::vector<uint8_t>& input) {
 	cardlist_type vect(input.size() / sizeof(uint32_t));
 	memcpy(vect.data(), input.data(), vect.size() * sizeof(uint32_t));
 	return vect;
 }
-void DeckManager::ImportDeckBase64(Deck& deck, const wchar_t* buffer) {
+void DeckManager::ImportDeckYdke(Deck& deck, epro::wstringview buffer) {
 	buffer += L"ydke://"sv.size();
 	size_t delimiters[3];
 	int delim = 0;
@@ -549,9 +546,9 @@ void DeckManager::ImportDeckBase64(Deck& deck, const wchar_t* buffer) {
 	}
 	if(delim != 3)
 		return;
-	const auto mainlist = BufferToCardlist(base64_decode(buffer, delimiters[0]));
-	const auto extralist = BufferToCardlist(base64_decode(buffer + delimiters[0] + 1, delimiters[1] - delimiters[0]));
-	const auto sidelist = BufferToCardlist(base64_decode(buffer + delimiters[1] + 1, delimiters[2] - delimiters[1]));
+	const auto mainlist = BufferToCardlist(base64_decode(buffer.substr(0, delimiters[0])));
+	const auto extralist = BufferToCardlist(base64_decode(buffer.substr(delimiters[0] + 1, delimiters[1] - delimiters[0])));
+	const auto sidelist = BufferToCardlist(base64_decode(buffer.substr(delimiters[1] + 1, delimiters[2] - delimiters[1])));
 	LoadDeck(deck, mainlist, sidelist, &extralist);
 }
 template<size_t N>

gframe/deck_manager.h

@@ -70,9 +70,9 @@ class DeckManager {
 	static bool SaveDeck(epro::path_stringview name, const Deck& deck);
 	static bool SaveDeck(epro::path_stringview name, const cardlist_type& mainlist, const cardlist_type& extralist, const cardlist_type& sidelist);
 	static std::string MakeYdkEntryString(uint32_t code);
-	static const wchar_t* ExportDeckBase64(const Deck& deck);
-	static const wchar_t* ExportDeckCardNames(Deck deck);
-	static void ImportDeckBase64(Deck& deck, const wchar_t* buffer);
+	static std::wstring ExportDeckYdke(const Deck& deck);
+	static std::wstring ExportDeckCardNames(Deck deck);
+	static void ImportDeckYdke(Deck& deck, epro::wstringview buffer);
 	static bool ImportDeckBase64Omega(Deck& deck, epro::wstringview buffer);
 	static bool DeleteDeck(Deck& deck, epro::path_stringview name);
 	static bool RenameDeck(epro::path_stringview oldname, epro::path_stringview newname);