CypherpunkSamurai/NewPipeExtractor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve code of getStringResultFromRegexArray methods in Utils

Browse source
This commit is contained in:
TiA4f8R 2022-03-26 20:03:27 +01:00
parent 2e3da445e6
commit 6d27996ac4
No known key found for this signature in database
GPG key ID: E6D3E7F5949450DD
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java
View file

@ -391,23 +391,20 @@ public final class Utils {
@Nonnull final String[] regexes, @Nonnull final String[] regexes,
final int group) final int group)
throws Parser.RegexException { throws Parser.RegexException {
String result = null;
for (final String regex : regexes) { for (final String regex : regexes) {
try { try {
result = Parser.matchGroup(regex, input, group); final String result = Parser.matchGroup(regex, input, group);
if (result != null) { if (result != null) {
// Continue if the result is null return result;
break;
} }
// Continue if the result is null
} catch (final Parser.RegexException ignored) { } catch (final Parser.RegexException ignored) {
} }
} }
if (result == null) {
throw new Parser.RegexException("No regex matched the input on group " + group); throw new Parser.RegexException("No regex matched the input on group " + group);
} }
return result;
}
/** /**
* Find the result of an array of {@link Pattern}s inside an input on a specific * Find the result of an array of {@link Pattern}s inside an input on a specific
@ -425,21 +422,18 @@ public final class Utils {
@Nonnull final Pattern[] regexes, @Nonnull final Pattern[] regexes,
final int group) final int group)
throws Parser.RegexException { throws Parser.RegexException {
String result = null;
for (final Pattern regex : regexes) { for (final Pattern regex : regexes) {
try { try {
result = Parser.matchGroup(regex, input, group); final String result = Parser.matchGroup(regex, input, group);
if (result != null) { if (result != null) {
// Continue if the result is null return result;
break;
} }
// Continue if the result is null
} catch (final Parser.RegexException ignored) { } catch (final Parser.RegexException ignored) {
} }
} }
if (result == null) {
throw new Parser.RegexException("No regex matched the input on group " + group); throw new Parser.RegexException("No regex matched the input on group " + group);
} }
return result;
}
} }