From 11b5a222c43d06aa88bcb519092c1c4679b9b976 Mon Sep 17 00:00:00 2001
From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:40:00 +0200
Subject: [PATCH] Deduplicate code of getStringResultFromRegexArray methods in
 Utils

Also revert indentation in Utils.mixedNumberWordToLong.
---
 .../schabi/newpipe/extractor/utils/Utils.java | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
index 57c57098..96e53158 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
@@ -15,6 +15,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Pattern;
 
 public final class Utils {
@@ -73,9 +74,8 @@ public final class Utils {
             multiplier = Parser.matchGroup("[\\d]+([\\.,][\\d]+)?([KMBkmb])+", numberWord, 2);
         } catch (final ParsingException ignored) {
         }
-
-        final double count = Double.parseDouble(Parser.matchGroup1("([\\d]+([\\.,][\\d]+)?)",
-                numberWord).replace(",", "."));
+        final double count = Double.parseDouble(
+                Parser.matchGroup1("([\\d]+([\\.,][\\d]+)?)", numberWord).replace(",", "."));
         switch (multiplier.toUpperCase()) {
             case "K":
                 return (long) (count * 1e3);
@@ -391,19 +391,12 @@ public final class Utils {
                                                        @Nonnull final String[] regexes,
                                                        final int group)
             throws Parser.RegexException {
-        for (final String regex : regexes) {
-            try {
-                final String result = Parser.matchGroup(regex, input, group);
-                if (result != null) {
-                    return result;
-                }
-
-                // Continue if the result is null
-            } catch (final Parser.RegexException ignored) {
-            }
-        }
-
-        throw new Parser.RegexException("No regex matched the input on group " + group);
+        return getStringResultFromRegexArray(input,
+                Arrays.stream(regexes)
+                        .filter(Objects::nonNull)
+                        .map(Pattern::compile)
+                        .toArray(Pattern[]::new),
+                group);
     }
 
     /**