From 428f4e2edb22343f7a671fc0d3eb32f67c7791a0 Mon Sep 17 00:00:00 2001 From: SachinVin Date: Fri, 1 May 2020 16:37:01 +0530 Subject: [PATCH] android: GameDatabase: dont add misc extensions from sub folders. --- .../java/org/citra/citra_emu/model/GameDatabase.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java b/src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java index 75493276c..bc3f19885 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/model/GameDatabase.java @@ -141,6 +141,9 @@ public final class GameDatabase extends SQLiteOpenHelper { null, null); // Order of folders is irrelevant. + Set allowedExtensions = new HashSet(Arrays.asList( + ".3ds", ".3dsx", ".elf", ".axf", ".cci", ".cxi", ".app", ".rar", ".zip", ".7z", ".torrent", ".tar", ".gz")); + // Possibly overly defensive, but ensures that moveToNext() does not skip a row. folderCursor.moveToPosition(-1); @@ -170,10 +173,7 @@ public final class GameDatabase extends SQLiteOpenHelper { database.close(); } - private static void addGamesRecursive(SQLiteDatabase database, File parent, int depth) { - Set allowedExtensions = new HashSet(Arrays.asList( - ".3ds", ".3dsx", ".elf", ".axf", ".cci", ".cxi", ".app", ".rar", ".zip", ".7z", ".torrent", ".tar", ".gz")); - + private static void addGamesRecursive(SQLiteDatabase database, File parent, Set allowedExtensions, int depth) { if(depth <= 0) { return; } @@ -186,7 +186,9 @@ public final class GameDatabase extends SQLiteOpenHelper { } if (file.isDirectory()) { - addGamesRecursive(database, file, depth - 1); + Set newExtensions = new HashSet<>(Arrays.asList( + ".3ds", ".3dsx", ".elf", ".axf", ".cci", ".cxi", ".app")); + addGamesRecursive(database, file, newExtensions, depth - 1); } else { String filePath = file.getPath();