From de01bbce168cd76c09e3415e4fe0be2f2cbc9621 Mon Sep 17 00:00:00 2001 From: Jakob Vogel Date: Wed, 8 Mar 2023 21:32:35 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Refactors=20method=20to=20abort=20early=20?= =?UTF-8?q?=F0=9F=92=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #225 SIRI-721 --- src/main/java/ninja/Bucket.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/ninja/Bucket.java b/src/main/java/ninja/Bucket.java index e546e3b..4e3d560 100644 --- a/src/main/java/ninja/Bucket.java +++ b/src/main/java/ninja/Bucket.java @@ -363,9 +363,11 @@ public int countObjects(@Nullable String query) { } private boolean isMatchingObject(@Nullable String query, File currentFile) { - return (Strings.isEmpty(query) || currentFile.getName().contains(query)) - && currentFile.isFile() - && !currentFile.getName().startsWith("$"); + if (!currentFile.isFile() || currentFile.getName().startsWith("$")) { + return false; + } + + return Strings.isEmpty(query) || currentFile.getName().contains(query); } protected int getVersion() { From 53e60fa9d49f7434c8e90c7ba00254e925666791 Mon Sep 17 00:00:00 2001 From: Jakob Vogel Date: Wed, 8 Mar 2023 21:33:13 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Decodes=20key=20before=20checking=20match?= =?UTF-8?q?=20with=20query=20=E2=9A=99=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #225 SIRI-721 --- src/main/java/ninja/Bucket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ninja/Bucket.java b/src/main/java/ninja/Bucket.java index 4e3d560..f08804e 100644 --- a/src/main/java/ninja/Bucket.java +++ b/src/main/java/ninja/Bucket.java @@ -367,7 +367,7 @@ private boolean isMatchingObject(@Nullable String query, File currentFile) { return false; } - return Strings.isEmpty(query) || currentFile.getName().contains(query); + return Strings.isEmpty(query) || StoredObject.decodeKey(currentFile.getName()).contains(query); } protected int getVersion() {