Skip to content

Improve regex #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramp merged 3 commits into from
Jun 24, 2016
Merged

Improve regex #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f63e39e
Improve parseBitrate regex
stonio Jun 23, 2016
a92a9a0
MetadataSpecifier - Shorten regex
stonio Jun 23, 2016
1476b32
MetadataSpecifier - escape backslash
stonio Jun 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/bramp/ffmpeg/FFmpegUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static String millisecondsToString(long milliseconds) {
* @return
*/
public static long parseBitrate(String bitrate) {
Pattern p = Pattern.compile("(\\d+(\\.\\d+)?)kbits/s");
Pattern p = Pattern.compile("(\\d+(?:\\.\\d+)?)kbits/s");
Copy link
Copy Markdown
Owner

@bramp bramp Jun 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we now drop the last ?

Copy link
Copy Markdown
Contributor Author

@stonio stonio Jun 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have to keep both symbols ? because they have different roles:

Copy link
Copy Markdown
Owner

@bramp bramp Jun 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, now I understand what the ?: was doing.

Matcher m = p.matcher(bitrate);
if (!m.find()) {
throw new IllegalArgumentException("Invalid bitrate '" + bitrate + "'");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/bramp/ffmpeg/builder/MetadataSpecifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public String spec() {
public static String checkValidKey(String key) {
checkNotNull(key);
checkArgument(!key.isEmpty(), "key must not be empty");
checkArgument(key.matches("[a-zA-Z0-9_]+"), "key must only contain letters, numbers, and _");
checkArgument(key.matches("\\w+"), "key must only contain letters, numbers or _");
return key;
}

Expand Down