From 77f539355da7efd5d8cfcd8620f801b8277bc8ff Mon Sep 17 00:00:00 2001 From: Ryan Meredith Date: Sun, 31 May 2020 10:00:09 -0400 Subject: [PATCH] Android: Add recursive game paths to UI --- .../settings/ui/SettingsFragmentPresenter.java | 5 +++++ .../features/settings/utils/SettingsFile.java | 1 + .../dolphinemu/dolphinemu/model/GameFileCache.java | 12 ++++++++++-- Source/Android/app/src/main/res/values/strings.xml | 2 ++ Source/Android/jni/GameList/GameFileCache.cpp | 7 ++++--- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index d65a3f28f8..b6a1094f18 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -317,6 +317,7 @@ public final class SettingsFragmentPresenter private void addPathsSettings(ArrayList sl) { + Setting recursiveISOPaths = null; Setting defaultISO = null; Setting NANDRootPath = null; Setting dumpPath = null; @@ -326,6 +327,7 @@ public final class SettingsFragmentPresenter SettingSection coreSection = mSettings.getSection(Settings.SECTION_INI_CORE); SettingSection generalSection = mSettings.getSection(Settings.SECTION_INI_GENERAL); + recursiveISOPaths = generalSection.getSetting(SettingsFile.KEY_RECURSIVE_ISO_PATHS); defaultISO = coreSection.getSetting(SettingsFile.KEY_DEFAULT_ISO); NANDRootPath = generalSection.getSetting(SettingsFile.KEY_NAND_ROOT_PATH); dumpPath = generalSection.getSetting(SettingsFile.KEY_DUMP_PATH); @@ -333,6 +335,9 @@ public final class SettingsFragmentPresenter resourcePackPath = generalSection.getSetting(SettingsFile.KEY_RESOURCE_PACK_PATH); wiiSDCardPath = generalSection.getSetting(SettingsFile.KEY_WII_SD_CARD_PATH); + sl.add(new CheckBoxSetting(SettingsFile.KEY_RECURSIVE_ISO_PATHS, Settings.SECTION_INI_GENERAL, + R.string.search_subfolders, R.string.search_subfolders_description, false, + recursiveISOPaths)); sl.add(new FilePicker(SettingsFile.FILE_NAME_DOLPHIN, SettingsFile.KEY_DEFAULT_ISO, Settings.SECTION_INI_CORE, R.string.default_ISO, 0, "", MainPresenter.REQUEST_GAME_FILE, defaultISO)); diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java index bb47068d9a..e032e03d02 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java @@ -59,6 +59,7 @@ public final class SettingsFile public static final String KEY_SLOT_A_DEVICE = "SlotA"; public static final String KEY_SLOT_B_DEVICE = "SlotB"; public static final String KEY_ENABLE_SAVE_STATES = "EnableSaveStates"; + public static final String KEY_RECURSIVE_ISO_PATHS = "RecursiveISOPaths"; public static final String KEY_DEFAULT_ISO = "DefaultISO"; public static final String KEY_NAND_ROOT_PATH = "NANDRootPath"; public static final String KEY_DUMP_PATH = "DumpPath"; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java index 87837f5464..ec574ffaa4 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java @@ -4,6 +4,10 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; +import org.dolphinemu.dolphinemu.NativeLibrary; +import org.dolphinemu.dolphinemu.features.settings.model.Settings; +import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile; + import java.io.File; import java.util.HashSet; import java.util.Set; @@ -66,13 +70,17 @@ public class GameFileCache */ public boolean scanLibrary(Context context) { + boolean recursiveScan = NativeLibrary + .GetConfig(SettingsFile.FILE_NAME_DOLPHIN + ".ini", Settings.SECTION_INI_GENERAL, + SettingsFile.KEY_RECURSIVE_ISO_PATHS, "False").equals("True"); + removeNonExistentGameFolders(context); SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); Set folderPathsSet = preferences.getStringSet(GAME_FOLDER_PATHS_PREFERENCE, EMPTY_SET); String[] folderPaths = folderPathsSet.toArray(new String[folderPathsSet.size()]); - boolean cacheChanged = update(folderPaths); + boolean cacheChanged = update(folderPaths, recursiveScan); cacheChanged |= updateAdditionalMetadata(); if (cacheChanged) { @@ -85,7 +93,7 @@ public class GameFileCache public native GameFile addOrGet(String gamePath); - private native boolean update(String[] folderPaths); + private native boolean update(String[] folderPaths, boolean recursiveScan); private native boolean updateAdditionalMetadata(); diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 082f296a74..12dca985e3 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -164,6 +164,8 @@ Paths + Search Subfolders for Game Files + Refresh library after changing this setting. Default ISO Wii NAND Root Dump Path diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp index 4b3abf8c2f..1e5c6a28c1 100644 --- a/Source/Android/jni/GameList/GameFileCache.cpp +++ b/Source/Android/jni/GameList/GameFileCache.cpp @@ -37,7 +37,7 @@ JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_add jobject obj, jstring path); JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_update( - JNIEnv* env, jobject obj, jobjectArray folder_paths); + JNIEnv* env, jobject obj, jobjectArray folder_paths, jboolean recursive_scan); JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_updateAdditionalMetadata(JNIEnv* env, jobject obj); @@ -80,7 +80,7 @@ JNIEXPORT jobject JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_add } JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_update( - JNIEnv* env, jobject obj, jobjectArray folder_paths) + JNIEnv* env, jobject obj, jobjectArray folder_paths, jboolean recursive_scan) { jsize size = env->GetArrayLength(folder_paths); @@ -94,7 +94,8 @@ JNIEXPORT jboolean JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_up env->DeleteLocalRef(path); } - return GetPointer(env, obj)->Update(UICommon::FindAllGamePaths(folder_paths_vector, false)); + return GetPointer(env, obj)->Update( + UICommon::FindAllGamePaths(folder_paths_vector, recursive_scan)); } JNIEXPORT jboolean JNICALL