DataURI: fix platform specific quirks.

Update filefinder.cpp

Author: jetrotal

CMakeLists.txt

@@ -69,7 +69,7 @@ add_library(${PROJECT_NAME} OBJECT
 	src/autobattle.h
 	src/background.cpp
 	src/background.h
-	src/base64.hpp
+	src/base64.h
 	src/baseui.cpp
 	src/baseui.h
 	src/battle_animation.cpp

Makefile.am

@@ -38,7 +38,7 @@ libeasyrpg_player_a_SOURCES = \
 	src/autobattle.h \
 	src/background.cpp \
 	src/background.h \
-	src/base64.hpp \
+	src/base64.h \
 	src/baseui.cpp \
 	src/baseui.h \
 	src/battle_animation.cpp \

src/base64.hpp src/base64.hsrc/base64.hpp renamed to src/base64.h

@@ -11,6 +11,8 @@
 #include <string_view>
 #include <type_traits>
 
+#include "output.h"
+
 #if defined(__cpp_lib_bit_cast)
 #include <bit>  // For std::bit_cast.
 #endif
@@ -546,7 +548,7 @@ inline OutputBuffer encode_into(InputIterator begin, InputIterator end) {
       break;
     }
     default: {
-      throw std::runtime_error{"Invalid base64 encoded data"};
+		Output::Warning("Invalid base64 encoded data");
     }
   }
 
@@ -574,15 +576,13 @@ inline OutputBuffer decode_into(std::string_view base64Text) {
   }
 
   if ((base64Text.size() & 3) != 0) {
-    throw std::runtime_error{
-        "Invalid base64 encoded data - Size not divisible by 4"};
+	  Output::Warning("Invalid base64 encoded data - Size not divisible by 4");
   }
 
   const size_t numPadding =
       std::count(base64Text.rbegin(), base64Text.rbegin() + 4, '=');
   if (numPadding > 2) {
-    throw std::runtime_error{
-        "Invalid base64 encoded data - Found more than 2 padding signs"};
+	  Output::Warning("Invalid base64 encoded data - Found more than 2 padding signs");
   }
 
   const size_t decodedsize = (base64Text.size() * 3 >> 2) - numPadding;
@@ -605,8 +605,7 @@ inline OutputBuffer decode_into(std::string_view base64Text) {
     const uint32_t temp = d1 | d2 | d3 | d4;
 
     if (temp >= detail::bad_char) {
-      throw std::runtime_error{
-          "Invalid base64 encoded data - Invalid character"};
+		Output::Warning("Invalid base64 encoded data - Invalid character");
     }
 
     // Use bit_cast instead of union and type punning to avoid
@@ -636,8 +635,7 @@ inline OutputBuffer decode_into(std::string_view base64Text) {
       const uint32_t temp = d1 | d2 | d3;
 
       if (temp >= detail::bad_char) {
-        throw std::runtime_error{
-            "Invalid base64 encoded data - Invalid character"};
+		  Output::Warning("Invalid base64 encoded data - Invalid character");
       }
 
       // Use bit_cast instead of union and type punning to avoid
@@ -659,8 +657,7 @@ inline OutputBuffer decode_into(std::string_view base64Text) {
       const uint32_t temp = d1 | d2;
 
       if (temp >= detail::bad_char) {
-        throw std::runtime_error{
-            "Invalid base64 encoded data - Invalid character"};
+		  Output::Warning("Invalid base64 encoded data - Invalid character");
       }
 
       const std::array<char, 4> tempBytes =
@@ -669,8 +666,7 @@ inline OutputBuffer decode_into(std::string_view base64Text) {
       break;
     }
     default: {
-      throw std::runtime_error{
-          "Invalid base64 encoded data - Invalid padding number"};
+		Output::Warning("Invalid base64 encoded data - Invalid padding number");
     }
   }
 

src/filefinder.cpp

@@ -54,9 +54,9 @@
 #endif
 
 #include "filesystem_stream.h"
-#include "base64.hpp"
+#include "base64.h"
 
-namespace { // Anonymous namespace
+namespace {
 
 	struct DataUriResult {
 		std::string_view mime_type;
@@ -68,7 +68,7 @@ namespace { // Anonymous namespace
 		if (!StartsWith(uri, "data:")) {
 			return std::nullopt;
 		}
-		// ... (rest of the function is the same)
+
 		auto header_end = uri.find(',');
 		if (header_end == std::string_view::npos) return std::nullopt;
 		auto header = uri.substr(5, header_end - 5);
@@ -82,13 +82,7 @@ namespace { // Anonymous namespace
 			result.mime_type = header;
 		}
 		if (result.is_base64) {
-			try {
-				result.data = base64::decode_into<std::vector<unsigned char>>(data_payload.begin(), data_payload.end());
-			}
-			catch (const std::exception& e) {
-				Output::Warning("Base64 decoding failed: {}", e.what());
-				return std::nullopt;
-			}
+				result.data = base64::decode_into<std::vector<unsigned char>>(data_payload.begin(), data_payload.end());			
 		}
 		else {
 			result.data.assign(data_payload.begin(), data_payload.end());
@@ -466,11 +460,11 @@ int FileFinder::GetSavegames() {
 }
 
 std::string find_generic(const DirectoryTree::Args& args) {
-	// *** NEW CENTRALIZED LOGIC ***
+	// *** DATA URI LOGIC ***
 	if (StartsWith(args.path, "data:")) {
 		return std::string(args.path); // The URI is its own "path"
 	}
-	// *** END OF NEW LOGIC ***
+	// *** END OF DATA URI LOGIC ***
 
 	if (!Tr::GetCurrentTranslationId().empty()) {
 		auto tr_fs = Tr::GetCurrentTranslationFilesystem();
@@ -522,7 +516,7 @@ std::string FileFinder::FindFont(std::string_view name) {
 }
 
 Filesystem_Stream::InputStream open_generic(std::string_view dir, std::string_view name, DirectoryTree::Args& args) {
-	// *** NEW CENTRALIZED LOGIC ***
+	// *** DATA URI LOGIC ***
   // Check the 'name' part first, as it's the most likely place for a data URI.
 	if (StartsWith(name, "data:")) {
 		auto parsed_result = parse_data_uri(name);
@@ -547,7 +541,7 @@ Filesystem_Stream::InputStream open_generic(std::string_view dir, std::string_vi
 			return Filesystem_Stream::InputStream(nullptr, ""); // Return an invalid stream
 		}
 	}
-	// *** END OF NEW LOGIC ***
+	// *** END OF DATA URI LOGIC ***
 
 	if (!Tr::GetCurrentTranslationId().empty()) {
 		auto tr_fs = Tr::GetCurrentTranslationFilesystem();