jprdonnelly/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-02-13 16:00:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Common/FileSearch: Refactor DoFileSearch

Browse Source
This commit is contained in:
Sintendo
2025-12-24 10:14:02 +01:00
parent 3221e982d3
commit f2e1c71803
19 changed files with 87 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Android/jni/AndroidCommon/AndroidCommon.cpp
View File

@@ -5,6 +5,7 @@
#include <algorithm>
#include <ios>
#include <span>
#include <string>
#include <string_view>
#include <vector>
@@ -49,9 +50,13 @@ std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array)
return result;
}
jobjectArray VectorToJStringArray(JNIEnv* env, const std::vector<std::string>& vector)
jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string_view> span)
{
return VectorToJObjectArray(env, vector, IDCache::GetStringClass(), ToJString);
return SpanToJObjectArray(env, span, IDCache::GetStringClass(), ToJString);
}
jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string> span)
{
return SpanToJObjectArray(env, span, IDCache::GetStringClass(), ToJString);
}
bool IsPathAndroidContent(std::string_view uri)
@@ -193,13 +198,13 @@ std::vector<std::string> GetAndroidContentChildNames(std::string_view uri)
}
std::vector<std::string> DoFileSearchAndroidContent(std::string_view directory,
const std::vector<std::string>& extensions,
std::span<const std::string_view> extensions,
bool recursive)
{
JNIEnv* env = IDCache::GetEnvForThread();
jstring j_directory = ToJString(env, directory);
jobjectArray j_extensions = VectorToJStringArray(env, extensions);
jobjectArray j_extensions = SpanToJStringArray(env, extensions);
jobjectArray j_result = reinterpret_cast<jobjectArray>(env->CallStaticObjectMethod(
IDCache::GetContentHandlerClass(), IDCache::GetContentHandlerDoFileSearch(), j_directory,