Skip to content
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

Catchup v1.13.0 #19

Merged
merged 6 commits into from
Oct 31, 2021
+22 −9
Merged

Catchup v1.13.0 #19

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84e6b45
use cargo fmt with nightly
hhatto Oct 31, 2021
fc62b5f
refactoring: regex const value prefix
hhatto Oct 31, 2021
f6cde36
strict rustfmt
hhatto Oct 31, 2021
f47da72
unnecessary todo comment
hhatto Oct 31, 2021
5f80860
update testsets
hhatto Oct 31, 2021
2b7d72c
firefox android with os version
hhatto Oct 31, 2021
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
Prev Previous commit
Next Next commit
refactoring: regex const value prefix
@hhatto
hhatto committed Oct 31, 2021
commit fc62b5f006aa7efa7c5e7bbcf783df695c815a85
12 changes: 6 additions & 6 deletions src/parser.rs
View file
Original file line number Diff line number Diff line change
@@ -47,9 +47,9 @@ lazy_static! {
static ref RX_PS4_OS_VERSION: Regex = Regex::new(r"PlayStation 4 ([.0-9]+)\)").unwrap();
static ref RX_BLACKBERRY10_OS_VERSION: Regex = Regex::new(r"BB10(?:.+)Version/([.0-9]+) ").unwrap();
static ref RX_BLACKBERRY_OS_VERSION: Regex = Regex::new(r"BlackBerry(?:\d+)/([.0-9]+) ").unwrap();
static ref RE_OSX_IPHONE_OS_VERSION: Regex =
static ref RX_OSX_IPHONE_OS_VERSION: Regex =
Regex::new(r"; CPU(?: iPhone)? OS (\d+_\d+(?:_\d+)?) like Mac OS X").unwrap();
static ref RE_OSX_OS_VERSION: Regex = Regex::new(r"Mac OS X (10[._]\d+(?:[._]\d+)?)(?:\)|;)").unwrap();
static ref RX_OSX_OS_VERSION: Regex = Regex::new(r"Mac OS X (10[._]\d+(?:[._]\d+)?)(?:\)|;)").unwrap();
static ref RX_HTTP_CLIENT: Regex =
Regex::new(r"^(?:Apache-HttpClient/|Jakarta Commons-HttpClient/|Java/)").unwrap();
static ref RX_HTTP_CLIENT_OTHER: Regex = Regex::new(r"[- ]HttpClient(/|$)").unwrap();
@@ -58,7 +58,7 @@ lazy_static! {
static ref RX_MAYBE_CRAWLER_OTHER: Regex =
Regex::new(r"(?:Rome Client |UnwindFetchor/|ia_archiver |Summify |PostRank/)").unwrap();
static ref RX_SAMSUNG_BROWSER: Regex = Regex::new(r"SamsungBrowser/([.0-9]+)").unwrap();
static ref RE_SLEIPNIR_VERSION: Regex = Regex::new(r"Sleipnir/([.0-9]+)").unwrap();
static ref RX_SLEIPNIR_VERSION: Regex = Regex::new(r"Sleipnir/([.0-9]+)").unwrap();
static ref RX_YABROWSER_VERSION: Regex = Regex::new(r"YaBrowser/(\d+\.\d+\.\d+\.\d+)").unwrap();
}

@@ -1025,13 +1025,13 @@ impl Parser {
}
data = d.unwrap();

let caps = RE_OSX_IPHONE_OS_VERSION.captures(agent);
let caps = RX_OSX_IPHONE_OS_VERSION.captures(agent);
if let Some(c) = caps {
let v = c.get(1).unwrap().as_str();
version = v.replace("_", ".").into();
}
} else {
let caps = RE_OSX_OS_VERSION.captures(agent);
let caps = RX_OSX_OS_VERSION.captures(agent);
if let Some(c) = caps {
let v = c.get(1).unwrap().as_str();
version = v.replace("_", ".").into();
@@ -1255,7 +1255,7 @@ impl Parser {
return false;
}

let version = match RE_SLEIPNIR_VERSION.captures(agent) {
let version = match RX_SLEIPNIR_VERSION.captures(agent) {
Some(caps) => caps.get(1).unwrap().as_str(),
None => VALUE_UNKNOWN,
};