Merge branch 'master' into memory-hog

RPCS3 · Aug 2, 2022 · 5b8f6d1 · 5b8f6d1
2 parents 2233769 + c75b76d
commit 5b8f6d1
Show file tree

Hide file tree

Showing 5 changed files with 437 additions and 43 deletions.
diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp
@@ -615,3 +615,13 @@ bool fmt::match(const std::string& source, const std::string& mask)
 
 	return true;
 }
+
+std::string get_file_extension(const std::string& file_path)
+{
+	if (usz dotpos = file_path.find_last_of('.'); dotpos != std::string::npos && dotpos + 1 < file_path.size())
+	{
+		return file_path.substr(dotpos + 1);
+	}
+
+	return {};
+}
diff --git a/Utilities/StrUtil.h b/Utilities/StrUtil.h
@@ -27,6 +27,9 @@ bool try_to_int64(s64* out, std::string_view value, s64 min, s64 max);
 // Convert string to unsigned integer
 bool try_to_uint64(u64* out, std::string_view value, u64 min, u64 max);
 
+// Get the file extension of a file path ("png", "jpg", etc.)
+std::string get_file_extension(const std::string& file_path);
+
 namespace fmt
 {
 	std::string replace_all(std::string_view src, std::string_view from, std::string_view to, usz count = -1);