diff options
19 files changed, 1062 insertions, 1037 deletions
diff --git a/src/main/java/com/mesalab/ua/CachingParser.java b/src/main/java/com/mesalab/ua/CachingParser.java index eb33105..ed5e530 100644 --- a/src/main/java/com/mesalab/ua/CachingParser.java +++ b/src/main/java/com/mesalab/ua/CachingParser.java @@ -4,6 +4,10 @@ import java.io.IOException; import java.io.InputStream; import java.util.Map; +import com.mesalab.ua.dto.Client; +import com.mesalab.ua.dto.Device; +import com.mesalab.ua.dto.OS; +import com.mesalab.ua.dto.UserAgent; import org.apache.commons.collections4.map.LRUMap; /** @@ -12,110 +16,109 @@ import org.apache.commons.collections4.map.LRUMap; * general the same browser will do multiple requests in sequence. This has the * effect that the same useragent will appear in the logfiles and we will see * the need to parse the same useragent over and over again. - * + * <p> * This class introduces a very simple LRU cache to reduce the number of times * the parsing is actually done. * * @author Niels Basjes - * */ public class CachingParser extends Parser { - // TODO: Make configurable - private static final int CACHE_SIZE = 1000; - - private Map<String, UserAgent> cacheClient = null; - private Map<String, Client> cacheUserAgent = null; - private Map<String, Device> cacheDevice = null; - private Map<String, OS> cacheOS = null; - - // ------------------------------------------ + // TODO: Make configurable + private static final int CACHE_SIZE = 1000; - public CachingParser() throws IOException { - super(); - } + private Map<String, UserAgent> cacheUserAgent = null; + private Map<String, Client> cacheClient = null; + private Map<String, Device> cacheDevice = null; + private Map<String, OS> cacheOS = null; - public CachingParser(InputStream regexYaml) { - super(regexYaml); - } + // ------------------------------------------ - // ------------------------------------------ - - @Override - public UserAgent parse(String agentString) { - if (agentString == null) { - return null; - } - if (cacheClient == null) { - cacheClient = new LRUMap<>(CACHE_SIZE); + public CachingParser() throws IOException { + super(); } - UserAgent client = cacheClient.get(agentString); - if (client != null) { - return client; - } - client = super.parse(agentString); - cacheClient.put(agentString, client); - return client; - } - - // ------------------------------------------ - @Override - public Client parseUserAgent(String agentString) { - if (agentString == null) { - return null; + public CachingParser(InputStream regexYaml) { + super(regexYaml); } - if (cacheUserAgent == null) { - cacheUserAgent = new LRUMap<>(CACHE_SIZE); - } - Client client = cacheUserAgent.get(agentString); - if (client != null) { - return client; - } - client = super.parseUserAgent(agentString); - cacheUserAgent.put(agentString, client); - return client; - } - // ------------------------------------------ - - @Override - public Device parseDevice(String agentString) { - if (agentString == null) { - return null; - } - if (cacheDevice == null) { - cacheDevice = new LRUMap<>(CACHE_SIZE); + // ------------------------------------------ + + @Override + public UserAgent parse(String agentString) { + if (agentString == null) { + return null; + } + if (cacheUserAgent == null) { + cacheUserAgent = new LRUMap<>(CACHE_SIZE); + } + UserAgent userAgent = cacheUserAgent.get(agentString); + if (userAgent != null) { + return userAgent; + } + userAgent = super.parse(agentString); + cacheUserAgent.put(agentString, userAgent); + return userAgent; } - Device device = cacheDevice.get(agentString); - if (device != null) { - return device; - } - device = super.parseDevice(agentString); - cacheDevice.put(agentString, device); - return device; - } - - // ------------------------------------------ - @Override - public OS parseOS(String agentString) { - if (agentString == null) { - return null; + // ------------------------------------------ + + @Override + public Client parseClient(String agentString) { + if (agentString == null) { + return null; + } + if (cacheClient == null) { + cacheClient = new LRUMap<>(CACHE_SIZE); + } + Client client = cacheClient.get(agentString); + if (client != null) { + return client; + } + client = super.parseClient(agentString); + cacheClient.put(agentString, client); + return client; } - if (cacheOS == null) { - cacheOS = new LRUMap<>(CACHE_SIZE); + // ------------------------------------------ + + @Override + public Device parseDevice(String agentString) { + if (agentString == null) { + return null; + } + if (cacheDevice == null) { + cacheDevice = new LRUMap<>(CACHE_SIZE); + } + Device device = cacheDevice.get(agentString); + if (device != null) { + return device; + } + device = super.parseDevice(agentString); + cacheDevice.put(agentString, device); + return device; } - OS os = cacheOS.get(agentString); - if (os != null) { - return os; + + // ------------------------------------------ + + @Override + public OS parseOS(String agentString) { + if (agentString == null) { + return null; + } + + if (cacheOS == null) { + cacheOS = new LRUMap<>(CACHE_SIZE); + } + OS os = cacheOS.get(agentString); + if (os != null) { + return os; + } + os = super.parseOS(agentString); + cacheOS.put(agentString, os); + return os; } - os = super.parseOS(agentString); - cacheOS.put(agentString, os); - return os; - } - // ------------------------------------------ + // ------------------------------------------ } diff --git a/src/main/java/com/mesalab/ua/Client.java b/src/main/java/com/mesalab/ua/Client.java deleted file mode 100644 index 413fc63..0000000 --- a/src/main/java/com/mesalab/ua/Client.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Copyright 2012 Twitter, Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.mesalab.ua; - -import java.util.Map; - -/** - * User Agent parsed data class - * - * @author Steve Jiang (@sjiang) <gh at iamsteve com> - */ -public class Client { - public final String family, major, minor, patch; - - public Client(String family, String major, String minor, String patch) { - this.family = family; - this.major = major; - this.minor = minor; - this.patch = patch; - } - - public static Client fromMap(Map<String, String> m) { - return new Client(m.get("family"), m.get("major"), m.get("minor"), m.get("patch")); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof Client)) return false; - - Client o = (Client) other; - return ((this.family != null && this.family.equals(o.family)) || this.family == o.family) && - ((this.major != null && this.major.equals(o.major)) || this.major == o.major) && - ((this.minor != null && this.minor.equals(o.minor)) || this.minor == o.minor) && - ((this.patch != null && this.patch.equals(o.patch)) || this.patch == o.patch); - } - - @Override - public int hashCode() { - int h = family == null ? 0 : family.hashCode(); - h += major == null ? 0 : major.hashCode(); - h += minor == null ? 0 : minor.hashCode(); - h += patch == null ? 0 : patch.hashCode(); - return h; - } - - @Override - public String toString() { - return String.format("{\"family\": %s, \"major\": %s, \"minor\": %s, \"patch\": %s}", - family == null ? Constants.EMPTY_STRING : '"' + family + '"', - major == null ? Constants.EMPTY_STRING : '"' + major + '"', - minor == null ? Constants.EMPTY_STRING : '"' + minor + '"', - patch == null ? Constants.EMPTY_STRING : '"' + patch + '"'); - } - -}
\ No newline at end of file diff --git a/src/main/java/com/mesalab/ua/ClientParser.java b/src/main/java/com/mesalab/ua/ClientParser.java index 4522ada..bf88d42 100644 --- a/src/main/java/com/mesalab/ua/ClientParser.java +++ b/src/main/java/com/mesalab/ua/ClientParser.java @@ -1,12 +1,12 @@ /** * Copyright 2012 Twitter, Inc - * + * <p> * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,6 +16,8 @@ package com.mesalab.ua; +import com.mesalab.ua.dto.Client; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -30,110 +32,114 @@ import java.util.regex.Pattern; */ public class ClientParser { - private final List<UAPattern> patterns; - - public ClientParser(List<UAPattern> patterns) { - this.patterns = patterns; - } + private final List<UAPattern> patterns; - /** - * Constructs a thread-safe UserAgentParser - */ - public static ClientParser fromList(List<Map<String,String>> configList) { - List<UAPattern> configPatterns = new ArrayList<UAPattern>(); - - for (Map<String, String> configMap : configList) { - configPatterns.add(ClientParser.patternFromMap(configMap)); + public ClientParser(List<UAPattern> patterns) { + this.patterns = patterns; } - return new ClientParser(new CopyOnWriteArrayList<>(configPatterns)); - } - public Client parse(String agentString) { - if (agentString == null) { - return null; - } + /** + * Constructs a thread-safe UserAgentParser + */ + public static ClientParser fromList(List<Map<String, String>> configList) { + List<UAPattern> configPatterns = new ArrayList<UAPattern>(); - Client agent; - for (UAPattern p : patterns) { - //用p的正则去匹配ua - if ((agent = p.match(agentString)) != null) { - return agent; - } + for (Map<String, String> configMap : configList) { + configPatterns.add(ClientParser.patternFromMap(configMap)); + } + return new ClientParser(new CopyOnWriteArrayList<>(configPatterns)); } - return new Client("Other", null, null, null); - } - protected static UAPattern patternFromMap(Map<String, String> configMap) { - String regex = configMap.get("regex"); - if (regex == null) { - throw new IllegalArgumentException("User agent is missing regex"); - } + public Client parse(String agentString) { + if (agentString == null) { + return null; + } - return(new UAPattern(Pattern.compile(regex), - configMap.get("family_replacement"), - configMap.get("v1_replacement"), - configMap.get("v2_replacement"))); - } - - protected static class UAPattern { - private final Pattern pattern; - private final String familyReplacement, v1Replacement, v2Replacement; - - public UAPattern(Pattern pattern, String familyReplacement, String v1Replacement, String v2Replacement) { - this.pattern = pattern; - this.familyReplacement = familyReplacement; - this.v1Replacement = v1Replacement; - this.v2Replacement = v2Replacement; + Client agent; + for (UAPattern p : patterns) { + //用p的正则去匹配ua + if ((agent = p.match(agentString)) != null) { + return agent; + } + } + return new Client("Other", null, null, null, null); } - public Client match(String agentString) { - String family = null, v1 = null, v2 = null, v3 = null; - Matcher matcher = pattern.matcher(agentString); - - if (!matcher.find()) { - return null; - } + protected static UAPattern patternFromMap(Map<String, String> configMap) { + String regex = configMap.get("regex"); + if (regex == null) { + throw new IllegalArgumentException("User agent is missing regex"); + } - int groupCount = matcher.groupCount(); + return (new UAPattern(Pattern.compile(regex), + configMap.get("name_replacement"), + configMap.get("version_replacement"), + configMap.get("type_replacement"), + configMap.get("engine_replacement"), + configMap.get("engine_version_replacement"))); + } - if (familyReplacement != null) { - if (familyReplacement.contains("$1") && groupCount >= 1 && matcher.group(1) != null) { - family = familyReplacement.replaceFirst("\\$1", Matcher.quoteReplacement(matcher.group(1))); - } else { - family = familyReplacement; + protected static class UAPattern { + private final Pattern pattern; + private final String nameReplacement, versionReplacement, typeReplacement, engineReplacement, engineVersionReplacement; + + public UAPattern(Pattern pattern, String nameReplacement, String versionReplacement, String typeReplacement, String engineReplacement, String engineVersionReplacement) { + this.pattern = pattern; + this.nameReplacement = nameReplacement; + this.versionReplacement = versionReplacement; + this.typeReplacement = typeReplacement; + this.engineReplacement = engineReplacement; + this.engineVersionReplacement = engineVersionReplacement; } - } else if (groupCount >= 1) { - family = matcher.group(1); - } - - if (v1Replacement != null) { - v1 = v1Replacement; - } else if (groupCount >= 2) { - String group2 = matcher.group(2); - if (!isBlank(group2)) { - v1 = group2; - } - } - - if (v2Replacement != null) { - v2 = v2Replacement; - } else if (groupCount >= 3) { - String group3 = matcher.group(3); - if (!isBlank(group3)) { - v2 = group3; + + public Client match(String agentString) { + String name = null, version = null, type = null, engine = null, engineVersion = null; + Matcher matcher = pattern.matcher(agentString); + + if (!matcher.find()) { + return null; + } + + int groupCount = matcher.groupCount(); + + if (nameReplacement != null) { + if (nameReplacement.contains("$1") && groupCount >= 1 && matcher.group(1) != null) { + name = nameReplacement.replaceFirst("\\$1", Matcher.quoteReplacement(matcher.group(1))); + } else { + name = nameReplacement; + } + } else if (groupCount >= 1) { + name = matcher.group(1); + } + + if (versionReplacement != null) { + version = versionReplacement; + } else if (groupCount >= 2) { + String group2 = matcher.group(2); + if (!isBlank(group2)) { + version = group2; + } + } + + if (typeReplacement != null) { + type = typeReplacement; + } else if (groupCount >= 3) { + String group3 = matcher.group(3); + if (!isBlank(group3)) { + type = group3; + } + if (groupCount >= 4) { + String group4 = matcher.group(4); + if (!isBlank(group4)) { + type = group4; + } + } + } + return name == null ? null : new Client(name, version, type, engine, engineVersion); } - if (groupCount >= 4) { - String group4 = matcher.group(4); - if (!isBlank(group4)) { - v3 = group4; - } + + private boolean isBlank(String value) { + return value == null || value.isEmpty(); } - } - return family == null ? null : new Client(family, v1, v2, v3); - } - - private boolean isBlank(String value) { - return value == null || value.isEmpty(); } - } } diff --git a/src/main/java/com/mesalab/ua/Device.java b/src/main/java/com/mesalab/ua/Device.java deleted file mode 100644 index 013ef46..0000000 --- a/src/main/java/com/mesalab/ua/Device.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright 2012 Twitter, Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.mesalab.ua; - -import java.util.Map; - -/** - * Device parsed data class - * - * @author Steve Jiang (@sjiang) <gh at iamsteve com> - */ -public class Device { - public final String family; - - public Device(String family) { - this.family = family; - } - - public static Device fromMap(Map<String, String> m) { - return new Device((String) m.get("family")); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof Device)) return false; - - Device o = (Device) other; - return (this.family != null && this.family.equals(o.family)) || this.family == o.family; - } - - @Override - public int hashCode() { - return family == null ? 0 : family.hashCode(); - } - - @Override - public String toString() { - return String.format("{\"family\": %s}", - family == null ? Constants.EMPTY_STRING : '"' + family + '"'); - } -}
\ No newline at end of file diff --git a/src/main/java/com/mesalab/ua/DeviceParser.java b/src/main/java/com/mesalab/ua/DeviceParser.java index be7adad..ec46d2a 100644 --- a/src/main/java/com/mesalab/ua/DeviceParser.java +++ b/src/main/java/com/mesalab/ua/DeviceParser.java @@ -16,6 +16,8 @@ package com.mesalab.ua; +import com.mesalab.ua.dto.Device; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -41,15 +43,15 @@ public class DeviceParser { return null; } - String device = null; + String type = null,mdoel=null,brand=null; for (DevicePattern p : patterns) { - if ((device = p.match(agentString)) != null) { + if ((type = p.match(agentString)) != null) { break; } } - if (device == null) device = "Other"; + if (type == null) {type = "Other";} - return new Device(device); + return new Device(type,mdoel,brand); } /** @@ -96,7 +98,7 @@ public class DeviceParser { int i = Integer.valueOf(substitution.substring(1)); String replacement = matcher.groupCount() >= i && matcher.group(i) != null ? Matcher.quoteReplacement(matcher.group(i)) : ""; - device = device.replaceFirst("\\" + substitution, replacement); + device = device.replaceFirst("\\" + substitution, replacement); } device = device.trim(); } else { diff --git a/src/main/java/com/mesalab/ua/OS.java b/src/main/java/com/mesalab/ua/OS.java deleted file mode 100644 index 86b62a8..0000000 --- a/src/main/java/com/mesalab/ua/OS.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Copyright 2012 Twitter, Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.mesalab.ua; - -import java.util.Map; - -/** - * Operating System parsed data class - * - * @author Steve Jiang (@sjiang) <gh at iamsteve com> - */ -public class OS { - public final String family, major, minor, patch, patchMinor; - - public OS(String family, String major, String minor, String patch, String patchMinor) { - this.family = family; - this.major = major; - this.minor = minor; - this.patch = patch; - this.patchMinor = patchMinor; - } - - public static OS fromMap(Map<String, String> m) { - return new OS(m.get("family"), m.get("major"), m.get("minor"), m.get("patch"), m.get("patch_minor")); - } - - @Override - public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof OS)) return false; - - OS o = (OS) other; - return ((this.family != null && this.family.equals(o.family)) || this.family == o.family) && - ((this.major != null && this.major.equals(o.major)) || this.major == o.major) && - ((this.minor != null && this.minor.equals(o.minor)) || this.minor == o.minor) && - ((this.patch != null && this.patch.equals(o.patch)) || this.patch == o.patch) && - ((this.patchMinor != null && this.patchMinor.equals(o.patchMinor)) || this.patchMinor == o.patchMinor); - } - - @Override - public int hashCode() { - int h = family == null ? 0 : family.hashCode(); - h += major == null ? 0 : major.hashCode(); - h += minor == null ? 0 : minor.hashCode(); - h += patch == null ? 0 : patch.hashCode(); - h += patchMinor == null ? 0 : patchMinor.hashCode(); - return h; - } - - @Override - public String toString() { - return String.format("{\"family\": %s, \"major\": %s, \"minor\": %s, \"patch\": %s, \"patch_minor\": %s}", - family == null ? Constants.EMPTY_STRING : '"' + family + '"', - major == null ? Constants.EMPTY_STRING : '"' + major + '"', - minor == null ? Constants.EMPTY_STRING : '"' + minor + '"', - patch == null ? Constants.EMPTY_STRING : '"' + patch + '"', - patchMinor == null ? Constants.EMPTY_STRING : '"' + patchMinor + '"'); - } -}
\ No newline at end of file diff --git a/src/main/java/com/mesalab/ua/OSParser.java b/src/main/java/com/mesalab/ua/OSParser.java index 2e4ca32..3de9c47 100644 --- a/src/main/java/com/mesalab/ua/OSParser.java +++ b/src/main/java/com/mesalab/ua/OSParser.java @@ -16,6 +16,8 @@ package com.mesalab.ua; +import com.mesalab.ua.dto.OS; + import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.regex.Matcher; @@ -57,7 +59,7 @@ public class OSParser { return os; } } - return new OS("Other", null, null, null, null); + return new OS("Other", null, null); } protected static OSPattern patternFromMap(Map<String, String> configMap) { @@ -67,26 +69,24 @@ public class OSParser { } return(new OSPattern(Pattern.compile(regex), - configMap.get("os_replacement"), - configMap.get("os_v1_replacement"), - configMap.get("os_v2_replacement"), - configMap.get("os_v3_replacement"))); + configMap.get("name_replacement"), + configMap.get("version_replacement"), + configMap.get("platform_replacement"))); } protected static class OSPattern { private final Pattern pattern; - private final String osReplacement, v1Replacement, v2Replacement, v3Replacement; + private final String nameReplacement, versionReplacement, platformReplacement; - public OSPattern(Pattern pattern, String osReplacement, String v1Replacement, String v2Replacement, String v3Replacement) { + public OSPattern(Pattern pattern, String nameReplacement, String versionReplacement, String platformReplacement) { this.pattern = pattern; - this.osReplacement = osReplacement; - this.v1Replacement = v1Replacement; - this.v2Replacement = v2Replacement; - this.v3Replacement = v3Replacement; + this.nameReplacement = nameReplacement; + this.versionReplacement = versionReplacement; + this.platformReplacement = platformReplacement; } public OS match(String agentString) { - String family = null, v1 = null, v2 = null, v3 = null, v4 = null; + String name = null, version = null, platform = null; Matcher matcher = pattern.matcher(agentString); if (!matcher.find()) { @@ -95,38 +95,30 @@ public class OSParser { int groupCount = matcher.groupCount(); - if (osReplacement != null) { + if (nameReplacement != null) { if (groupCount >= 1) { - family = Pattern.compile("(" + Pattern.quote("$1") + ")") - .matcher(osReplacement) + name = Pattern.compile("(" + Pattern.quote("$1") + ")") + .matcher(nameReplacement) .replaceAll(matcher.group(1)); } else { - family = osReplacement; + name = nameReplacement; } } else if (groupCount >= 1) { - family = matcher.group(1); + name = matcher.group(1); } - if (v1Replacement != null) { - v1 = getReplacement(matcher, v1Replacement); + if (versionReplacement != null) { + version = getReplacement(matcher, versionReplacement); } else if (groupCount >= 2) { - v1 = matcher.group(2); + version = matcher.group(2); } - if (v2Replacement != null) { - v2 = getReplacement(matcher, v2Replacement); + if (platformReplacement != null) { + platform = getReplacement(matcher, platformReplacement); } else if (groupCount >= 3) { - v2 = matcher.group(3); - } - if (v3Replacement != null) { - v3 = getReplacement(matcher, v3Replacement); - } else if (groupCount >= 4) { - v3 = matcher.group(4); - } - if (groupCount >= 5) { - v4 = matcher.group(5); + platform = matcher.group(3); } - return family == null ? null : new OS(family, v1, v2, v3, v4); + return name == null ? null : new OS(name, version, platform); } private String getReplacement(Matcher matcher, String replacement) { diff --git a/src/main/java/com/mesalab/ua/Parser.java b/src/main/java/com/mesalab/ua/Parser.java index 1326d74..3478d61 100644 --- a/src/main/java/com/mesalab/ua/Parser.java +++ b/src/main/java/com/mesalab/ua/Parser.java @@ -21,6 +21,10 @@ import java.io.InputStream; import java.util.List; import java.util.Map; +import com.mesalab.ua.dto.Client; +import com.mesalab.ua.dto.Device; +import com.mesalab.ua.dto.OS; +import com.mesalab.ua.dto.UserAgent; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; @@ -56,13 +60,13 @@ public class Parser { } public UserAgent parse(String agentString) { - Client ua = parseUserAgent(agentString); + Client client = parseClient(agentString); OS os = parseOS(agentString); Device device = deviceParser.parse(agentString); - return new UserAgent(ua, os, device); + return new UserAgent(client, os, device); } - public Client parseUserAgent(String agentString) { + public Client parseClient(String agentString) { return uaParser.parse(agentString); } @@ -76,7 +80,7 @@ public class Parser { private void initialize(InputStream regexYaml) { Yaml yaml = new Yaml(new SafeConstructor()); - + @SuppressWarnings("unchecked") Map<String,List<Map<String,String>>> regexConfig = (Map<String,List<Map<String,String>>>) yaml.load(regexYaml); diff --git a/src/main/java/com/mesalab/ua/dto/Client.java b/src/main/java/com/mesalab/ua/dto/Client.java new file mode 100644 index 0000000..03fb88c --- /dev/null +++ b/src/main/java/com/mesalab/ua/dto/Client.java @@ -0,0 +1,76 @@ +/** + * Copyright 2012 Twitter, Inc + * <p> + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mesalab.ua.dto; + +import com.mesalab.ua.Constants; + +import java.util.Map; + +/** + * User Agent parsed data class + * + * @author Steve Jiang (@sjiang) <gh at iamsteve com> + */ +public class Client { + public final String name, version, type, engine, engineVersion; + + public Client(String name, String version, String type, String engine, String engineVersion) { + this.name = name; + this.version = version; + this.type = type; + this.engine = engine; + this.engineVersion = engineVersion; + } + + public static Client fromMap(Map<String, String> m) { + return new Client(m.get("name"), m.get("version"), m.get("type"), m.get("engine"), m.get("engineVersion")); + } + + @Override + public boolean equals(Object other) { + if (other == this) {return true;} + if (!(other instanceof Client)) {return false;} + + Client o = (Client) other; + return ((this.name != null && this.name.equals(o.name)) || this.name == o.name) && + ((this.version != null && this.version.equals(o.version)) || this.version == o.version) && + ((this.type != null && this.type.equals(o.type)) || this.type == o.type) && + ((this.engine != null && this.engine.equals(o.engine)) || this.engine == o.engine) && + ((this.engineVersion != null && this.engineVersion.equals(o.engineVersion)) || this.engineVersion == o.engineVersion); + } + + @Override + public int hashCode() { + int h = name == null ? 0 : name.hashCode(); + h += version == null ? 0 : version.hashCode(); + h += type == null ? 0 : type.hashCode(); + h += engine == null ? 0 : engine.hashCode(); + h += engineVersion == null ? 0 : engineVersion.hashCode(); + return h; + } + + @Override + public String toString() { + return String.format("{\"name\": %s, \"version\": %s, \"type\": %s, \"engine\": %s}, \"engineVersion\": %s}", + name == null ? Constants.EMPTY_STRING : '"' + name + '"', + version == null ? Constants.EMPTY_STRING : '"' + version + '"', + type == null ? Constants.EMPTY_STRING : '"' + type + '"', + engine == null ? Constants.EMPTY_STRING : '"' + engine + '"', + engineVersion == null ? Constants.EMPTY_STRING : '"' + engineVersion + '"'); + } + +}
\ No newline at end of file diff --git a/src/main/java/com/mesalab/ua/dto/Device.java b/src/main/java/com/mesalab/ua/dto/Device.java new file mode 100644 index 0000000..be5191f --- /dev/null +++ b/src/main/java/com/mesalab/ua/dto/Device.java @@ -0,0 +1,71 @@ +/** + * Copyright 2012 Twitter, Inc + * <p> + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mesalab.ua.dto; + +import com.mesalab.ua.Constants; + +import java.util.Map; + +/** + * Device parsed data class + * + * @author Steve Jiang (@sjiang) <gh at iamsteve com> + */ +public class Device { + public final String type, model, brand; + + public Device(String type, String model, String brand) { + this.type = type; + this.model = model; + this.brand = brand; + } + + public static Device fromMap(Map<String, String> m) { + return new Device(m.get("type"), m.get("model"), m.get("brand")); + } + + @Override + public boolean equals(Object other) { + if (other == this) { + return true; + } + if (!(other instanceof Device)) { + return false; + } + + Device o = (Device) other; + return ((this.type != null && this.type.equals(o.type)) || this.type == o.type) && + ((this.model != null && this.model.equals(o.model)) || this.model == o.model) && + ((this.brand != null && this.brand.equals(o.brand)) || this.brand == o.brand); + } + + @Override + public int hashCode() { + int h = type == null ? 0 : type.hashCode(); + h += model == null ? 0 : model.hashCode(); + h += brand == null ? 0 : brand.hashCode(); + return h; + } + + @Override + public String toString() { + return String.format("{\"type\": %s,\"model\": %s,\"brand\": %s}", + type == null ? Constants.EMPTY_STRING : '"' + type + '"', + model == null ? Constants.EMPTY_STRING : '"' + model + '"', + brand == null ? Constants.EMPTY_STRING : '"' + brand + '"'); + } +}
\ No newline at end of file diff --git a/src/main/java/com/mesalab/ua/dto/OS.java b/src/main/java/com/mesalab/ua/dto/OS.java new file mode 100644 index 0000000..7710a2a --- /dev/null +++ b/src/main/java/com/mesalab/ua/dto/OS.java @@ -0,0 +1,67 @@ +/** + * Copyright 2012 Twitter, Inc + * <p> + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.mesalab.ua.dto; + +import com.mesalab.ua.Constants; + +import java.util.Map; + +/** + * Operating System parsed data class + * + * @author Steve Jiang (@sjiang) <gh at iamsteve com> + */ +public class OS { + public final String name, version, platform; + + public OS(String name, String version, String platform) { + this.name = name; + this.version = version; + this.platform = platform; + } + + public static OS fromMap(Map<String, String> m) { + return new OS(m.get("name"), m.get("version"), m.get("platform")); + } + + @Override + public boolean equals(Object other) { + if (other == this) {return true;} + if (!(other instanceof OS)) {return false;} + + OS o = (OS) other; + return ((this.name != null && this.name.equals(o.name)) || this.name == o.name) && + ((this.version != null && this.version.equals(o.version)) || this.version == o.version) && + ((this.platform != null && this.platform.equals(o.platform)) || this.platform == o.platform); + } + + @Override + public int hashCode() { + int h = name == null ? 0 : name.hashCode(); + h += version == null ? 0 : version.hashCode(); + h += platform == null ? 0 : platform.hashCode(); + return h; + } + + @Override + public String toString() { + return String.format("{\"name\": %s, \"version\": %s, \"platform\": %s}", + name == null ? Constants.EMPTY_STRING : '"' + name + '"', + version == null ? Constants.EMPTY_STRING : '"' + version + '"', + platform == null ? Constants.EMPTY_STRING : '"' + platform + '"'); + } +}
\ No newline at end of file diff --git a/src/main/java/com/mesalab/ua/UserAgent.java b/src/main/java/com/mesalab/ua/dto/UserAgent.java index 956c1af..116e77a 100644 --- a/src/main/java/com/mesalab/ua/UserAgent.java +++ b/src/main/java/com/mesalab/ua/dto/UserAgent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mesalab.ua; +package com.mesalab.ua.dto; /** * Collection of parsed data for a given user agent string consisting of UserAgent, OS, Device @@ -34,8 +34,8 @@ public class UserAgent { @Override public boolean equals(Object other) { - if (other == this) return true; - if (!(other instanceof UserAgent)) return false; + if (other == this) {return true;} + if (!(other instanceof UserAgent)) {return false;} UserAgent o = (UserAgent) other; return ((this.client != null && this.client.equals(o.client)) || this.client == o.client) && @@ -53,7 +53,7 @@ public class UserAgent { @Override public String toString() { - return String.format("{\"user_agent\": %s, \"os\": %s, \"device\": %s}", + return String.format("{\"client\": %s, \"os\": %s, \"device\": %s}", client, os, device); } }
\ No newline at end of file diff --git a/src/main/resources/device.yaml b/src/main/resources/device.yaml index 1229318..8edd169 100644 --- a/src/main/resources/device.yaml +++ b/src/main/resources/device.yaml @@ -7,32 +7,32 @@ device_parsers: ######### - regex: '(?:(?:iPhone|Windows CE|Windows Phone|Android).*(?:(?:Bot|Yeti)-Mobile|YRSpider|BingPreview|bots?/\d|(?:bot|spider)\.html)|AdsBot-Google-Mobile.*iPhone)' regex_flag: 'i' - device_replacement: 'Spider' + type_replacement: 'Spider' brand_replacement: 'Spider' model_replacement: 'Smartphone' - regex: '(?:DoCoMo|\bMOT\b|\bLG\b|Nokia|Samsung|SonyEricsson).*(?:(?:Bot|Yeti)-Mobile|bots?/\d|(?:bot|crawler)\.html|(?:jump|google|Wukong)bot|ichiro/mobile|/spider|YahooSeeker)' regex_flag: 'i' - device_replacement: 'Spider' + type_replacement: 'Spider' brand_replacement: 'Spider' model_replacement: 'Feature Phone' # PTST / WebPageTest.org crawlers - regex: ' PTST/\d+(?:\.)?\d+$' - device_replacement: 'Spider' + type_replacement: 'Spider' brand_replacement: 'Spider' # Datanyze.com spider - regex: 'X11; Datanyze; Linux' - device_replacement: 'Spider' + type_replacement: 'Spider' brand_replacement: 'Spider' # aspiegel.com spider (owned by Huawei) - regex: 'Mozilla.*Mobile.*AspiegelBot' - device_replacement: 'Spider' + type_replacement: 'Spider' brand_replacement: 'Spider' model_replacement: 'Smartphone' - regex: 'Mozilla.*AspiegelBot' - device_replacement: 'Spider' + type_replacement: 'Spider' brand_replacement: 'Spider' model_replacement: 'Desktop' @@ -41,7 +41,7 @@ device_parsers: # @ref: https://play.google.com/store/apps/details?id=se.vaggan.webbrowser&hl=en ######### - regex: '\bSmartWatch {0,2}\( {0,2}([^;]+) {0,2}; {0,2}([^;]+) {0,2};' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -53,16 +53,16 @@ device_parsers: # Android Application - regex: 'Android Application[^\-]+ - (Sony) ?(Ericsson|) (.+) \w+ - ' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1$2' model_replacement: '$3' - regex: 'Android Application[^\-]+ - (?:HTC|HUAWEI|LGE|LENOVO|MEDION|TCT) (HTC|HUAWEI|LG|LENOVO|MEDION|ALCATEL)[ _\-](.+) \w+ - ' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' - regex: 'Android Application[^\-]+ - ([^ ]+) (.+) \w+ - ' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -71,11 +71,11 @@ device_parsers: # @ref: http://www.3q-int.com/ ######### - regex: '; *([BLRQ]C\d{4}[A-Z]+?)(?: Build|\) AppleWebKit)' - device_replacement: '3Q $1' + type_replacement: '3Q $1' brand_replacement: '3Q' model_replacement: '$1' - regex: '; *(?:3Q_)([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '3Q $1' + type_replacement: '3Q $1' brand_replacement: '3Q' model_replacement: '$1' @@ -84,19 +84,19 @@ device_parsers: # @ref: http://us.acer.com/ac/en/US/content/group/tablets ######### - regex: 'Android [34].*; *(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700(?: Lite| 3G|)|A701|B1-A71|A1-\d{3}|B1-\d{3}|V360|V370|W500|W500P|W501|W501P|W510|W511|W700|Slider SL101|DA22[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Acer' model_replacement: '$1' - regex: '; *Acer Iconia Tab ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Acer' model_replacement: '$1' - regex: '; *(Z1[1235]0|E320[^/]*|S500|S510|Liquid[^;/]*|Iconia A\d+)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Acer' model_replacement: '$1' - regex: '; *(Acer |ACER )([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Acer' model_replacement: '$2' @@ -107,7 +107,7 @@ device_parsers: # custom ROM builds for Vega ######### - regex: '; *(Advent |)(Vega(?:Bean|Comb|)).*?(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Advent' model_replacement: '$2' @@ -116,7 +116,7 @@ device_parsers: # @ref: http://www.ainol.com/plugin.php?identifier=ainol&module=product ######### - regex: '; *(Ainol |)((?:NOVO|[Nn]ovo)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Ainol' model_replacement: '$2' @@ -126,12 +126,12 @@ device_parsers: ######### - regex: '; *AIRIS[ _\-]?([^/;\)]+) *(?:;|\)|Build)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Airis' model_replacement: '$1' - regex: '; *(OnePAD[^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Airis' model_replacement: '$1' @@ -140,7 +140,7 @@ device_parsers: # @ref: ?? ######### - regex: '; *Airpad[ \-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Airpad $1' + type_replacement: 'Airpad $1' brand_replacement: 'Airpad' model_replacement: '$1' @@ -149,29 +149,29 @@ device_parsers: # @ref: http://www.alcatelonetouch.com/global-en/products/smartphones.html ######### - regex: '; *(one ?touch) (EVO7|T10|T20)(?: Build|\) AppleWebKit)' - device_replacement: 'Alcatel One Touch $2' + type_replacement: 'Alcatel One Touch $2' brand_replacement: 'Alcatel' model_replacement: 'One Touch $2' - regex: '; *(?:alcatel[ _]|)(?:(?:one[ _]?touch[ _])|ot[ \-])([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Alcatel One Touch $1' + type_replacement: 'Alcatel One Touch $1' brand_replacement: 'Alcatel' model_replacement: 'One Touch $1' - regex: '; *(TCL)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' # operator specific models - regex: '; *(Vodafone Smart II|Optimus_Madrid)(?: Build|\) AppleWebKit)' - device_replacement: 'Alcatel $1' + type_replacement: 'Alcatel $1' brand_replacement: 'Alcatel' model_replacement: '$1' - regex: '; *BASE_Lutea_3(?: Build|\) AppleWebKit)' - device_replacement: 'Alcatel One Touch 998' + type_replacement: 'Alcatel One Touch 998' brand_replacement: 'Alcatel' model_replacement: 'One Touch 998' - regex: '; *BASE_Varia(?: Build|\) AppleWebKit)' - device_replacement: 'Alcatel One Touch 918D' + type_replacement: 'Alcatel One Touch 918D' brand_replacement: 'Alcatel' model_replacement: 'One Touch 918D' @@ -180,7 +180,7 @@ device_parsers: # @ref: http://www.myallfine.com/Products.asp ######### - regex: '; *((?:FINE|Fine)\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Allfine' model_replacement: '$1' @@ -189,15 +189,15 @@ device_parsers: # @ref: http://www.allview.ro/produse/droseries/lista-tablete-pc/ ######### - regex: '; *(ALLVIEW[ _]?|Allview[ _]?)((?:Speed|SPEED).*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Allview' model_replacement: '$2' - regex: '; *(ALLVIEW[ _]?|Allview[ _]?|)(AX1_Shine|AX2_Frenzy)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Allview' model_replacement: '$2' - regex: '; *(ALLVIEW[ _]?|Allview[ _]?)([^;/]*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Allview' model_replacement: '$2' @@ -207,11 +207,11 @@ device_parsers: # @models: A31 (13.3"),A20,A10, ######### - regex: '; *(A13-MID)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Allwinner' model_replacement: '$1' - regex: '; *(Allwinner)[ _\-]?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Allwinner' model_replacement: '$1' @@ -220,7 +220,7 @@ device_parsers: # @ref: http://www.amaway.cn/ ######### - regex: '; *(A651|A701B?|A702|A703|A705|A706|A707|A711|A712|A713|A717|A722|A785|A801|A802|A803|A901|A902|A1002|A1003|A1006|A1007|A9701|A9703|Q710|Q80)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Amaway' model_replacement: '$1' @@ -229,11 +229,11 @@ device_parsers: # @ref: http://www.amoi.com/en/prd/prd_index.jspx ######### - regex: '; *(?:AMOI|Amoi)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Amoi $1' + type_replacement: 'Amoi $1' brand_replacement: 'Amoi' model_replacement: '$1' - regex: '^(?:AMOI|Amoi)[ _]([^;/]+?) Linux' - device_replacement: 'Amoi $1' + type_replacement: 'Amoi $1' brand_replacement: 'Amoi' model_replacement: '$1' @@ -242,7 +242,7 @@ device_parsers: # @ref: http://latin.aoc.com/media_tablet ######### - regex: '; *(MW(?:0[789]|10)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Aoc' model_replacement: '$1' @@ -253,12 +253,12 @@ device_parsers: # @note: brand owned by luckystar ######### - regex: '; *(G7|M1013|M1015G|M11[CG]?|M-?12[B]?|M15|M19[G]?|M30[ACQ]?|M31[GQ]|M32|M33[GQ]|M36|M37|M38|M701T|M710|M712B|M713|M715G|M716G|M71(?:G|GS|T|)|M72[T]?|M73[T]?|M75[GT]?|M77G|M79T|M7L|M7LN|M81|M810|M81T|M82|M92|M92KS|M92S|M717G|M721|M722G|M723|M725G|M739|M785|M791|M92SK|M93D)(?: Build|\) AppleWebKit)' - device_replacement: 'Aoson $1' + type_replacement: 'Aoson $1' brand_replacement: 'Aoson' model_replacement: '$1' - regex: '; *Aoson ([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Aoson $1' + type_replacement: 'Aoson $1' brand_replacement: 'Aoson' model_replacement: '$1' @@ -267,7 +267,7 @@ device_parsers: # @ref: http://www.apanda.com.cn/ ######### - regex: '; *[Aa]panda[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Apanda $1' + type_replacement: 'Apanda $1' brand_replacement: 'Apanda' model_replacement: '$1' @@ -277,23 +277,23 @@ device_parsers: # @ref: http://www.archos.com/de/products/smartphones/index.html ######### - regex: '; *(?:ARCHOS|Archos) ?(GAMEPAD.*?)(?: Build|\) AppleWebKit)' - device_replacement: 'Archos $1' + type_replacement: 'Archos $1' brand_replacement: 'Archos' model_replacement: '$1' - regex: 'ARCHOS; GOGI; ([^;]+);' - device_replacement: 'Archos $1' + type_replacement: 'Archos $1' brand_replacement: 'Archos' model_replacement: '$1' - regex: '(?:ARCHOS|Archos)[ _]?(.*?)(?: Build|[;/\(\)\-]|$)' - device_replacement: 'Archos $1' + type_replacement: 'Archos $1' brand_replacement: 'Archos' model_replacement: '$1' - regex: '; *(AN(?:7|8|9|10|13)[A-Z0-9]{1,4})(?: Build|\) AppleWebKit)' - device_replacement: 'Archos $1' + type_replacement: 'Archos $1' brand_replacement: 'Archos' model_replacement: '$1' - regex: '; *(A28|A32|A43|A70(?:BHT|CHT|HB|S|X)|A101(?:B|C|IT)|A7EB|A7EB-WK|101G9|80G9)(?: Build|\) AppleWebKit)' - device_replacement: 'Archos $1' + type_replacement: 'Archos $1' brand_replacement: 'Archos' model_replacement: '$1' @@ -302,11 +302,11 @@ device_parsers: # @ref: http://www.a-rival.de/de/ ######### - regex: '; *(PAD-FMD[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Arival' model_replacement: '$1' - regex: '; *(BioniQ) ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Arival' model_replacement: '$1 $2' @@ -315,11 +315,11 @@ device_parsers: # @ref: http://arnovatech.com/ ######### - regex: '; *(AN\d[^;/]+|ARCHM\d+)(?: Build|\) AppleWebKit)' - device_replacement: 'Arnova $1' + type_replacement: 'Arnova $1' brand_replacement: 'Arnova' model_replacement: '$1' - regex: '; *(?:ARNOVA|Arnova) ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Arnova $1' + type_replacement: 'Arnova $1' brand_replacement: 'Arnova' model_replacement: '$1' @@ -328,7 +328,7 @@ device_parsers: # @ref: http://www.assistant.ua ######### - regex: '; *(?:ASSISTANT |)(AP)-?([1789]\d{2}[A-Z]{0,2}|80104)(?: Build|\) AppleWebKit)' - device_replacement: 'Assistant $1-$2' + type_replacement: 'Assistant $1-$2' brand_replacement: 'Assistant' model_replacement: '$1-$2' @@ -337,11 +337,11 @@ device_parsers: # @ref: http://www.asus.com/uk/Tablets_Mobile/ ######### - regex: '; *(ME17\d[^;/]*|ME3\d{2}[^;/]+|K00[A-Z]|Nexus 10|Nexus 7(?: 2013|)|PadFone[^;/]*|Transformer[^;/]*|TF\d{3}[^;/]*|eeepc)(?: Build|\) AppleWebKit)' - device_replacement: 'Asus $1' + type_replacement: 'Asus $1' brand_replacement: 'Asus' model_replacement: '$1' - regex: '; *ASUS[ _]*([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Asus $1' + type_replacement: 'Asus $1' brand_replacement: 'Asus' model_replacement: '$1' @@ -349,11 +349,11 @@ device_parsers: # Garmin-Asus ######### - regex: '; *Garmin-Asus ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Garmin-Asus $1' + type_replacement: 'Garmin-Asus $1' brand_replacement: 'Garmin-Asus' model_replacement: '$1' - regex: '; *(Garminfone)(?: Build|\) AppleWebKit)' - device_replacement: 'Garmin $1' + type_replacement: 'Garmin $1' brand_replacement: 'Garmin-Asus' model_replacement: '$1' @@ -362,7 +362,7 @@ device_parsers: # @ref: http://www.theattab.com/ ######### - regex: '; (@TAB-[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Attab' model_replacement: '$1' @@ -372,7 +372,7 @@ device_parsers: # @note: Take care with Docomo T-01 Toshiba ######### - regex: '; *(T-(?:07|[^0]\d)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Audiosonic' model_replacement: '$1' @@ -382,7 +382,7 @@ device_parsers: ######### - regex: '; *(?:Axioo[ _\-]([^;/]+?)|(picopad)[ _\-]([^;/]+?))(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Axioo $1$2 $3' + type_replacement: 'Axioo $1$2 $3' brand_replacement: 'Axioo' model_replacement: '$1$2 $3' @@ -391,7 +391,7 @@ device_parsers: # @ref: http://azendcorp.com/index.php/products/portable-electronics ######### - regex: '; *(V(?:100|700|800)[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Azend' model_replacement: '$1' @@ -401,7 +401,7 @@ device_parsers: ######### - regex: '; *(IBAK\-[^;/]*)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Bak' model_replacement: '$1' @@ -411,7 +411,7 @@ device_parsers: # @models: HY6501|HY5001|X12|X21|I5 ######### - regex: '; *(HY5001|HY6501|X12|X21|I5)(?: Build|\) AppleWebKit)' - device_replacement: 'Bedove $1' + type_replacement: 'Bedove $1' brand_replacement: 'Bedove' model_replacement: '$1' @@ -420,7 +420,7 @@ device_parsers: # @ref: http://www.benss.net/ ######### - regex: '; *(JC-[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Benss $1' + type_replacement: 'Benss $1' brand_replacement: 'Benss' model_replacement: '$1' @@ -430,7 +430,7 @@ device_parsers: # @note: Android Apps seams to be used here ######### - regex: '; *(BB) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Blackberry' model_replacement: '$2' @@ -439,11 +439,11 @@ device_parsers: # @ref: http://iblackbird.co.kr ######### - regex: '; *(BlackBird)[ _](I8.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' - regex: '; *(BlackBird)[ _](.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -453,7 +453,7 @@ device_parsers: ######### # Endeavour - regex: '; *([0-9]+BP[EM][^;/]*|Endeavour[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Blaupunkt $1' + type_replacement: 'Blaupunkt $1' brand_replacement: 'Blaupunkt' model_replacement: '$1' @@ -462,12 +462,12 @@ device_parsers: # @ref: http://bluproducts.com ######### - regex: '; *((?:BLU|Blu)[ _\-])([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Blu' model_replacement: '$2' # BMOBILE = operator branded device - regex: '; *(?:BMOBILE )?(Blu|BLU|DASH [^;/]+|VIVO 4\.3|TANK 4\.5)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Blu' model_replacement: '$1' @@ -477,7 +477,7 @@ device_parsers: ######### # tablet - regex: '; *(TOUCH\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Blusens' model_replacement: '$1' @@ -488,7 +488,7 @@ device_parsers: ######### # smartphone - regex: '; *(AX5\d+)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Bmobile' model_replacement: '$1' @@ -497,11 +497,11 @@ device_parsers: # @ref: http://bqreaders.com ######### - regex: '; *([Bb]q) ([^;/]+?);?(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'bq' model_replacement: '$2' - regex: '; *(Maxwell [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'bq' model_replacement: '$1' @@ -510,7 +510,7 @@ device_parsers: # @ref: http://www.braun-phototechnik.de/en/products/list/~pcat.250/Tablet-PC.html ######### - regex: '; *((?:B-Tab|B-TAB) ?\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Braun' model_replacement: '$1' @@ -519,7 +519,7 @@ device_parsers: # @ref: http://www.broncho.cn/ ######### - regex: '; *(Broncho) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -528,7 +528,7 @@ device_parsers: # @ref: http://www.captiva-power.de ######### - regex: '; *CAPTIVA ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Captiva $1' + type_replacement: 'Captiva $1' brand_replacement: 'Captiva' model_replacement: '$1' @@ -537,7 +537,7 @@ device_parsers: # @ref: http://www.casiogzone.com/ ######### - regex: '; *(C771|CAL21|IS11CA)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Casio' model_replacement: '$1' @@ -546,15 +546,15 @@ device_parsers: # @ref: http://www.cat-sound.com ######### - regex: '; *(?:Cat|CAT) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Cat $1' + type_replacement: 'Cat $1' brand_replacement: 'Cat' model_replacement: '$1' - regex: '; *(?:Cat)(Nova.*?)(?: Build|\) AppleWebKit)' - device_replacement: 'Cat $1' + type_replacement: 'Cat $1' brand_replacement: 'Cat' model_replacement: '$1' - regex: '; *(INM8002KP|ADM8000KP_[AB])(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Cat' model_replacement: 'Tablet PHOENIX 8.1J0' @@ -564,20 +564,20 @@ device_parsers: # @models: A10, A19Q, A101, A105, A107, A107\+, A112, A118, A119, A119Q, A15, A19, A20, A200, A220, A225, A22 Race, A27, A58, A59, A60, A62, A63, A64, A66, A67, A69, A75, A77, A79, A8\+, A83, A85, A86, A87, A89 Ultima, A9\+, A90, A900, A95, A97i, A98, AR 40, AR 45, AR 50, ML5 ######### - regex: '; *(?:[Cc]elkon[ _\*]|CELKON[ _\*])([^;/\)]+) ?(?:Build|;|\))' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Celkon' model_replacement: '$1' - regex: 'Build/(?:[Cc]elkon)+_?([^;/_\)]+)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Celkon' model_replacement: '$1' - regex: '; *(CT)-?(\d+)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Celkon' model_replacement: '$1$2' # smartphones - regex: '; *(A19|A19Q|A105|A107[^;/\)]*) ?(?:Build|;|\))' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Celkon' model_replacement: '$1' @@ -588,7 +588,7 @@ device_parsers: # (eg. http://www.zeepad.net/index.html) ######### - regex: '; *(TPC[0-9]{4,5})(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'ChangJia' model_replacement: '$1' @@ -597,15 +597,15 @@ device_parsers: # @ref: http://www.cloudfonemobile.com/ ######### - regex: '; *(Cloudfone)[ _](Excite)([^ ][^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2 $3' + type_replacement: '$1 $2 $3' brand_replacement: 'Cloudfone' model_replacement: '$1 $2 $3' - regex: '; *(Excite|ICE)[ _](\d+[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Cloudfone $1 $2' + type_replacement: 'Cloudfone $1 $2' brand_replacement: 'Cloudfone' model_replacement: 'Cloudfone $1 $2' - regex: '; *(Cloudfone|CloudPad)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Cloudfone' model_replacement: '$1 $2' @@ -615,7 +615,7 @@ device_parsers: ######### - regex: '; *((?:Aquila|Clanga|Rapax)[^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Cmx' model_replacement: '$1' @@ -625,7 +625,7 @@ device_parsers: # @note: Be careful with MID\d{3} from MpMan or Manta ######### - regex: '; *(?:CFW-|Kyros )?(MID[0-9]{4}(?:[ABC]|SR|TV)?)(\(3G\)-4G| GB 8K| 3G| 8K| GB)? *(?:Build|[;\)])' - device_replacement: 'CobyKyros $1$2' + type_replacement: 'CobyKyros $1$2' brand_replacement: 'CobyKyros' model_replacement: '$1$2' @@ -634,7 +634,7 @@ device_parsers: # @ref: ?? ######### - regex: '; *([^;/]*)Coolpad[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Coolpad' model_replacement: '$1$2' @@ -644,7 +644,7 @@ device_parsers: ######### - regex: '; *(CUBE[ _])?([KU][0-9]+ ?GT.*?|A5300)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Cube' model_replacement: '$2' @@ -654,12 +654,12 @@ device_parsers: ######### - regex: '; *CUBOT ([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Cubot' model_replacement: '$1' - regex: '; *(BOBBY)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Cubot' model_replacement: '$1' @@ -668,7 +668,7 @@ device_parsers: # @ref: http://www.danew.com/produits-tablette.php ######### - regex: '; *(Dslide [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Danew' model_replacement: '$1' @@ -682,39 +682,39 @@ device_parsers: # @ref: http://www.dell.com/in/p/mobile-xcd35/pd ######### - regex: '; *(XCD)[ _]?(28|35)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1$2' + type_replacement: 'Dell $1$2' brand_replacement: 'Dell' model_replacement: '$1$2' - regex: '; *(001DL)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: 'Streak' - regex: '; *(?:Dell|DELL) (Streak)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: 'Streak' - regex: '; *(101DL|GS01|Streak Pro[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: 'Streak Pro' - regex: '; *([Ss]treak ?7)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: 'Streak 7' - regex: '; *(Mini-3iX)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: '$1' - regex: '; *(?:Dell|DELL)[ _](Aero|Venue|Thunder|Mini.*?|Streak[ _]Pro)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: '$1' - regex: '; *Dell[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: '$1' - regex: '; *Dell ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: '$1' @@ -723,7 +723,7 @@ device_parsers: # @ref: http://www.denver-electronics.com/tablets1/ ######### - regex: '; *(TA[CD]-\d+[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Denver' model_replacement: '$1' @@ -732,7 +732,7 @@ device_parsers: # @ref: http://dex.ua/ ######### - regex: '; *(iP[789]\d{2}(?:-3G)?|IP10\d{2}(?:-8GB)?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Dex' model_replacement: '$1' @@ -741,7 +741,7 @@ device_parsers: # @ref: http://www.dns-shop.ru/ ######### - regex: '; *(AirTab)[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'DNS' model_replacement: '$1 $2' @@ -750,43 +750,43 @@ device_parsers: # @ref: http://www.ipentec.com/document/document.aspx?page=android-useragent ######### - regex: '; *(F\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Fujitsu' model_replacement: '$1' - regex: '; *(HT-03A)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: 'Magic' - regex: '; *(HT\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: '$1' - regex: '; *(L\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'LG' model_replacement: '$1' - regex: '; *(N\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Nec' model_replacement: '$1' - regex: '; *(P\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Panasonic' model_replacement: '$1' - regex: '; *(SC\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Samsung' model_replacement: '$1' - regex: '; *(SH\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sharp' model_replacement: '$1' - regex: '; *(SO\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'SonyEricsson' model_replacement: '$1' - regex: '; *(T\-0[12][^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Toshiba' model_replacement: '$1' @@ -795,7 +795,7 @@ device_parsers: # @ref: http://www.doov.com.cn/ ######### - regex: '; *(DOOV)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'DOOV' model_replacement: '$2' @@ -804,7 +804,7 @@ device_parsers: # @ref: http://www.enot.ua/ ######### - regex: '; *(Enot|ENOT)[ -]?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Enot' model_replacement: '$2' @@ -813,11 +813,11 @@ device_parsers: # @ref: http://evercoss.com/android/ ######### - regex: '; *[^;/]+ Build/(?:CROSS|Cross)+[ _\-]([^\)]+)' - device_replacement: 'CROSS $1' + type_replacement: 'CROSS $1' brand_replacement: 'Evercoss' model_replacement: 'Cross $1' - regex: '; *(CROSS|Cross)[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Evercoss' model_replacement: 'Cross $2' @@ -826,7 +826,7 @@ device_parsers: # @ref: http://explay.ru/ ######### - regex: '; *Explay[_ ](.+?)(?:[\)]| Build)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Explay' model_replacement: '$1' @@ -835,11 +835,11 @@ device_parsers: # @ref: http://www.fly-phone.com/ ######### - regex: '; *(IQ.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Fly' model_replacement: '$1' - regex: '; *(Fly|FLY)[ _](IQ[^;]+?|F[34]\d+[^;]*?);?(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Fly' model_replacement: '$2' @@ -848,7 +848,7 @@ device_parsers: # @ref: http://www.fujitsu.com/global/ ######### - regex: '; *(M532|Q572|FJL21)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Fujitsu' model_replacement: '$1' @@ -857,7 +857,7 @@ device_parsers: # @ref: http://www.galapad.net/product.html ######### - regex: '; *(G1)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Galapad' model_replacement: '$1' @@ -866,7 +866,7 @@ device_parsers: # @ref: http://www.geeksphone.com/ ######### - regex: '; *(Geeksphone) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -876,7 +876,7 @@ device_parsers: ######### #- regex: '; *(G\'?FIVE) ([^;/]+) Build' # there is a problem with python yaml parser here - regex: '; *(G[^F]?FIVE) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Gfive' model_replacement: '$2' @@ -886,20 +886,20 @@ device_parsers: ######### - regex: '; *(Gionee)[ _\-]([^;/]+?)(?:/[^;/]+|)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Gionee' model_replacement: '$2' - regex: '; *(GN\d+[A-Z]?|INFINITY_PASSION|Ctrl_V1)(?: Build|\) AppleWebKit)' - device_replacement: 'Gionee $1' + type_replacement: 'Gionee $1' brand_replacement: 'Gionee' model_replacement: '$1' - regex: '; *(E3) Build/JOP40D' - device_replacement: 'Gionee $1' + type_replacement: 'Gionee $1' brand_replacement: 'Gionee' model_replacement: '$1' - regex: '\sGIONEE[-\s_](\w*)' regex_flag: 'i' - device_replacement: 'Gionee $1' + type_replacement: 'Gionee $1' brand_replacement: 'Gionee' model_replacement: '$1' @@ -908,11 +908,11 @@ device_parsers: # @ref: http://www.goclever.com ######### - regex: '; *((?:FONE|QUANTUM|INSIGNIA) \d+[^;/]*|PLAYTAB)(?: Build|\) AppleWebKit)' - device_replacement: 'GoClever $1' + type_replacement: 'GoClever $1' brand_replacement: 'GoClever' model_replacement: '$1' - regex: '; *GOCLEVER ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'GoClever $1' + type_replacement: 'GoClever $1' brand_replacement: 'GoClever' model_replacement: '$1' @@ -921,11 +921,11 @@ device_parsers: # @ref: http://www.google.de/glass/start/ ######### - regex: '; *(Glass \d+)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Google' model_replacement: '$1' - regex: '; *(Pixel.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Google' model_replacement: '$1' @@ -934,7 +934,7 @@ device_parsers: # @ref: http://gsmart.gigabytecm.com/en/ ######### - regex: '; *(GSmart)[ -]([^/]+)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Gigabyte' model_replacement: '$1 $2' @@ -943,7 +943,7 @@ device_parsers: # @ref: http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX53QSB ######### - regex: '; *(imx5[13]_[^/]+)(?: Build|\) AppleWebKit)' - device_replacement: 'Freescale $1' + type_replacement: 'Freescale $1' brand_replacement: 'Freescale' model_replacement: '$1' @@ -953,11 +953,11 @@ device_parsers: # @ref: http://www.haier.com/de/produkte/tablet/ ######### - regex: '; *Haier[ _\-]([^/]+)(?: Build|\) AppleWebKit)' - device_replacement: 'Haier $1' + type_replacement: 'Haier $1' brand_replacement: 'Haier' model_replacement: '$1' - regex: '; *(PAD1016)(?: Build|\) AppleWebKit)' - device_replacement: 'Haipad $1' + type_replacement: 'Haipad $1' brand_replacement: 'Haipad' model_replacement: '$1' @@ -967,7 +967,7 @@ device_parsers: # @models: V7P|M7SM7S|M9XM9X|M7XM7X|M9|M8|M7-M|M1002|M7|M701 ######### - regex: '; *(M701|M7|M8|M9)(?: Build|\) AppleWebKit)' - device_replacement: 'Haipad $1' + type_replacement: 'Haipad $1' brand_replacement: 'Haipad' model_replacement: '$1' @@ -977,7 +977,7 @@ device_parsers: # @models: SN10T1|SN10T2|SN70T31B|SN70T32W ######### - regex: '; *(SN\d+T[^;\)/]*)(?: Build|[;\)])' - device_replacement: 'Hannspree $1' + type_replacement: 'Hannspree $1' brand_replacement: 'Hannspree' model_replacement: '$1' @@ -986,11 +986,11 @@ device_parsers: # @ref: http://www.hclmetablet.com/india/ ######### - regex: 'Build/HCL ME Tablet ([^;\)]+)[\);]' - device_replacement: 'HCLme $1' + type_replacement: 'HCLme $1' brand_replacement: 'HCLme' model_replacement: '$1' - regex: '; *([^;\/]+) Build/HCL' - device_replacement: 'HCLme $1' + type_replacement: 'HCLme $1' brand_replacement: 'HCLme' model_replacement: '$1' @@ -999,7 +999,7 @@ device_parsers: # @ref: http://www.henadigital.com/en/product/index.asp?id=6 ######### - regex: '; *(MID-?\d{4}C[EM])(?: Build|\) AppleWebKit)' - device_replacement: 'Hena $1' + type_replacement: 'Hena $1' brand_replacement: 'Hena' model_replacement: '$1' @@ -1008,12 +1008,12 @@ device_parsers: # @ref: http://www.hisense.com/ ######### - regex: '; *(EG\d{2,}|HS-[^;/]+|MIRA[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Hisense $1' + type_replacement: 'Hisense $1' brand_replacement: 'Hisense' model_replacement: '$1' - regex: '; *(andromax[^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Hisense $1' + type_replacement: 'Hisense $1' brand_replacement: 'Hisense' model_replacement: '$1' @@ -1022,7 +1022,7 @@ device_parsers: # @ref: http://www.hitech-mobiles.com/ ######### - regex: '; *(?:AMAZE[ _](S\d+)|(S\d+)[ _]AMAZE)(?: Build|\) AppleWebKit)' - device_replacement: 'AMAZE $1$2' + type_replacement: 'AMAZE $1$2' brand_replacement: 'hitech' model_replacement: 'AMAZE $1$2' @@ -1031,15 +1031,15 @@ device_parsers: # @ref: http://www.hp.com/ ######### - regex: '; *(PlayBook)(?: Build|\) AppleWebKit)' - device_replacement: 'HP $1' + type_replacement: 'HP $1' brand_replacement: 'HP' model_replacement: '$1' - regex: '; *HP ([^/]+)(?: Build|\) AppleWebKit)' - device_replacement: 'HP $1' + type_replacement: 'HP $1' brand_replacement: 'HP' model_replacement: '$1' - regex: '; *([^/]+_tenderloin)(?: Build|\) AppleWebKit)' - device_replacement: 'HP TouchPad' + type_replacement: 'HP TouchPad' brand_replacement: 'HP' model_replacement: 'TouchPad' @@ -1049,59 +1049,59 @@ device_parsers: # @note: Needs to be before HTC due to Desire HD Build on U8815 ######### - regex: '; *(HUAWEI |Huawei-|)([UY][^;/]+) Build/(?:Huawei|HUAWEI)([UY][^\);]+)\)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Huawei' model_replacement: '$2' - regex: '; *([^;/]+) Build[/ ]Huawei(MT1-U06|[A-Z]+\d+[^\);]+)\)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Huawei' model_replacement: '$2' - regex: '; *(S7|M860) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Huawei' model_replacement: '$1' - regex: '; *((?:HUAWEI|Huawei)[ \-]?)(MediaPad) Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Huawei' model_replacement: '$2' - regex: '; *((?:HUAWEI[ _]?|Huawei[ _]|)Ascend[ _])([^;/]+) Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Huawei' model_replacement: '$2' - regex: '; *((?:HUAWEI|Huawei)[ _\-]?)((?:G700-|MT-)[^;/]+) Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Huawei' model_replacement: '$2' - regex: '; *((?:HUAWEI|Huawei)[ _\-]?)([^;/]+) Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Huawei' model_replacement: '$2' - regex: '; *(MediaPad[^;]+|SpringBoard) Build/Huawei' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Huawei' model_replacement: '$1' - regex: '; *([^;]+) Build/(?:Huawei|HUAWEI)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Huawei' model_replacement: '$1' - regex: '; *([Uu])([89]\d{3}) Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Huawei' model_replacement: 'U$2' - regex: '; *(?:Ideos |IDEOS )(S7) Build' - device_replacement: 'Huawei Ideos$1' + type_replacement: 'Huawei Ideos$1' brand_replacement: 'Huawei' model_replacement: 'Ideos$1' - regex: '; *(?:Ideos |IDEOS )([^;/]+\s*|\s*)Build' - device_replacement: 'Huawei Ideos$1' + type_replacement: 'Huawei Ideos$1' brand_replacement: 'Huawei' model_replacement: 'Ideos$1' - regex: '; *(Orange Daytona|Pulse|Pulse Mini|Vodafone 858|C8500|C8600|C8650|C8660|Nexus 6P|ATH-.+?) Build[/ ]' - device_replacement: 'Huawei $1' + type_replacement: 'Huawei $1' brand_replacement: 'Huawei' model_replacement: '$1' - regex: '; *((?:[A-Z]{3})\-L[A-Za0-9]{2})[\)]' - device_replacement: 'Huawei $1' + type_replacement: 'Huawei $1' brand_replacement: 'Huawei' model_replacement: '$1' @@ -1112,7 +1112,7 @@ device_parsers: ######### - regex: '; *HTC[ _]([^;]+); Windows Phone' - device_replacement: 'HTC $1' + type_replacement: 'HTC $1' brand_replacement: 'HTC' model_replacement: '$1' @@ -1120,60 +1120,60 @@ device_parsers: # ; HTC_0P3Z11/1.12.161.3 Build # ;HTC_A3335 V2.38.841.1 Build - regex: '; *(?:HTC[ _/])+([^ _/]+)(?:[/\\]1\.0 | V|/| +)\d+\.\d[\d\.]*(?: *Build|\))' - device_replacement: 'HTC $1' + type_replacement: 'HTC $1' brand_replacement: 'HTC' model_replacement: '$1' - regex: '; *(?:HTC[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)|)(?:[/\\]1\.0 | V|/| +)\d+\.\d[\d\.]*(?: *Build|\))' - device_replacement: 'HTC $1 $2' + type_replacement: 'HTC $1 $2' brand_replacement: 'HTC' model_replacement: '$1 $2' - regex: '; *(?:HTC[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/]+)|)|)(?:[/\\]1\.0 | V|/| +)\d+\.\d[\d\.]*(?: *Build|\))' - device_replacement: 'HTC $1 $2 $3' + type_replacement: 'HTC $1 $2 $3' brand_replacement: 'HTC' model_replacement: '$1 $2 $3' - regex: '; *(?:HTC[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/]+)|)|)|)(?:[/\\]1\.0 | V|/| +)\d+\.\d[\d\.]*(?: *Build|\))' - device_replacement: 'HTC $1 $2 $3 $4' + type_replacement: 'HTC $1 $2 $3 $4' brand_replacement: 'HTC' model_replacement: '$1 $2 $3 $4' # Android HTC without Version Number matcher - regex: '; *(?:(?:HTC|htc)(?:_blocked|)[ _/])+([^ _/;]+)(?: *Build|[;\)]| - )' - device_replacement: 'HTC $1' + type_replacement: 'HTC $1' brand_replacement: 'HTC' model_replacement: '$1' - regex: '; *(?:(?:HTC|htc)(?:_blocked|)[ _/])+([^ _/]+)(?:[ _/]([^ _/;\)]+)|)(?: *Build|[;\)]| - )' - device_replacement: 'HTC $1 $2' + type_replacement: 'HTC $1 $2' brand_replacement: 'HTC' model_replacement: '$1 $2' - regex: '; *(?:(?:HTC|htc)(?:_blocked|)[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/;\)]+)|)|)(?: *Build|[;\)]| - )' - device_replacement: 'HTC $1 $2 $3' + type_replacement: 'HTC $1 $2 $3' brand_replacement: 'HTC' model_replacement: '$1 $2 $3' - regex: '; *(?:(?:HTC|htc)(?:_blocked|)[ _/])+([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ _/]+)(?:[ _/]([^ /;]+)|)|)|)(?: *Build|[;\)]| - )' - device_replacement: 'HTC $1 $2 $3 $4' + type_replacement: 'HTC $1 $2 $3 $4' brand_replacement: 'HTC' model_replacement: '$1 $2 $3 $4' # HTC Streaming Player - regex: 'HTC Streaming Player [^\/]*/[^\/]*/ htc_([^/]+) /' - device_replacement: 'HTC $1' + type_replacement: 'HTC $1' brand_replacement: 'HTC' model_replacement: '$1' # general matcher for anything else - regex: '(?:[;,] *|^)(?:htccn_chs-|)HTC[ _-]?([^;]+?)(?: *Build|clay|Android|-?Mozilla| Opera| Profile| UNTRUSTED|[;/\(\)]|$)' regex_flag: 'i' - device_replacement: 'HTC $1' + type_replacement: 'HTC $1' brand_replacement: 'HTC' model_replacement: '$1' # Android matchers without HTC - regex: '; *(A6277|ADR6200|ADR6300|ADR6350|ADR6400[A-Z]*|ADR6425[A-Z]*|APX515CKT|ARIA|Desire[^_ ]*|Dream|EndeavorU|Eris|Evo|Flyer|HD2|Hero|HERO200|Hero CDMA|HTL21|Incredible|Inspire[A-Z0-9]*|Legend|Liberty|Nexus ?(?:One|HD2)|One|One S C2|One[ _]?(?:S|V|X\+?)\w*|PC36100|PG06100|PG86100|S31HT|Sensation|Wildfire)(?: Build|[/;\(\)])' regex_flag: 'i' - device_replacement: 'HTC $1' + type_replacement: 'HTC $1' brand_replacement: 'HTC' model_replacement: '$1' - regex: '; *(ADR6200|ADR6400L|ADR6425LVW|Amaze|DesireS?|EndeavorU|Eris|EVO|Evo\d[A-Z]+|HD2|IncredibleS?|Inspire[A-Z0-9]*|Inspire[A-Z0-9]*|Sensation[A-Z0-9]*|Wildfire)[ _-](.+?)(?:[/;\)]|Build|MIUI|1\.0)' regex_flag: 'i' - device_replacement: 'HTC $1 $2' + type_replacement: 'HTC $1 $2' brand_replacement: 'HTC' model_replacement: '$1 $2' @@ -1182,16 +1182,16 @@ device_parsers: # @ref: http://www.hyundaitechnologies.com ######### - regex: '; *HYUNDAI (T\d[^/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Hyundai $1' + type_replacement: 'Hyundai $1' brand_replacement: 'Hyundai' model_replacement: '$1' - regex: '; *HYUNDAI ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Hyundai $1' + type_replacement: 'Hyundai $1' brand_replacement: 'Hyundai' model_replacement: '$1' # X900? http://www.amazon.com/Hyundai-X900-Retina-Android-Bluetooth/dp/B00AO07H3O - regex: '; *(X700|Hold X|MB-6900)(?: Build|\) AppleWebKit)' - device_replacement: 'Hyundai $1' + type_replacement: 'Hyundai $1' brand_replacement: 'Hyundai' model_replacement: '$1' @@ -1201,12 +1201,12 @@ device_parsers: ######### - regex: '; *(?:iBall[ _\-]|)(Andi)[ _]?(\d[^;/]*)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'iBall' model_replacement: '$1 $2' - regex: '; *(IBall)(?:[ _]([^;/]+?)|)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'iBall' model_replacement: '$2' @@ -1215,7 +1215,7 @@ device_parsers: # @ref: http://www.iconbit.com/catalog/tablets/ ######### - regex: '; *(NT-\d+[^ ;/]*|Net[Tt]AB [^;/]+|Mercury [A-Z]+|iconBIT)(?: S/N:[^;/]+|)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'IconBIT' model_replacement: '$1' @@ -1225,7 +1225,7 @@ device_parsers: ######### - regex: '; *(IMO)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'IMO' model_replacement: '$2' @@ -1235,12 +1235,12 @@ device_parsers: ######### - regex: '; *i-?mobile[ _]([^/]+)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'i-mobile $1' + type_replacement: 'i-mobile $1' brand_replacement: 'imobile' model_replacement: '$1' - regex: '; *(i-(?:style|note)[^/]*)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'i-mobile $1' + type_replacement: 'i-mobile $1' brand_replacement: 'imobile' model_replacement: '$1' @@ -1249,7 +1249,7 @@ device_parsers: # @ref: http://impression.ua/planshetnye-kompyutery ######### - regex: '; *(ImPAD) ?(\d+(?:.)*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Impression' model_replacement: '$1 $2' @@ -1258,7 +1258,7 @@ device_parsers: # @ref: http://www.infinixmobility.com/index.html ######### - regex: '; *(Infinix)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Infinix' model_replacement: '$2' @@ -1267,7 +1267,7 @@ device_parsers: # @ref: ?? ######### - regex: '; *(Informer)[ \-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Informer' model_replacement: '$2' @@ -1277,7 +1277,7 @@ device_parsers: # @models: 7":TAB 714,TAB 724;8":TAB 814,TAB 824;10":TAB 1004 ######### - regex: '; *(TAB) ?([78][12]4)(?: Build|\) AppleWebKit)' - device_replacement: 'Intenso $1' + type_replacement: 'Intenso $1' brand_replacement: 'Intenso' model_replacement: '$1 $2' @@ -1288,21 +1288,21 @@ device_parsers: ######### # smartphones - regex: '; *(?:Intex[ _]|)(AQUA|Aqua)([ _\.\-])([^;/]+?) *(?:Build|;)' - device_replacement: '$1$2$3' + type_replacement: '$1$2$3' brand_replacement: 'Intex' model_replacement: '$1 $3' # matches "INTEX CLOUD X1" - regex: '; *(?:INTEX|Intex)(?:[_ ]([^\ _;/]+))(?:[_ ]([^\ _;/]+)|) *(?:Build|;)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Intex' model_replacement: '$1 $2' # tablets - regex: '; *([iI]Buddy)[ _]?(Connect)(?:_|\?_| |)([^;/]*) *(?:Build|;)' - device_replacement: '$1 $2 $3' + type_replacement: '$1 $2 $3' brand_replacement: 'Intex' model_replacement: 'iBuddy $2 $3' - regex: '; *(I-Buddy)[ _]([^;/]+?) *(?:Build|;)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Intex' model_replacement: 'iBuddy $2' @@ -1312,7 +1312,7 @@ device_parsers: ######### - regex: '; *(iOCEAN) ([^/]+)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'iOCEAN' model_replacement: '$2' @@ -1321,7 +1321,7 @@ device_parsers: # @ref: http://www.i-onik.de/ ######### - regex: '; *(TP\d+(?:\.\d+|)\-\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'ionik $1' + type_replacement: 'ionik $1' brand_replacement: 'ionik' model_replacement: '$1' @@ -1330,7 +1330,7 @@ device_parsers: # @ref: http://www.iru.ru/catalog/soho/planetable/ ######### - regex: '; *(M702pro)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Iru' model_replacement: '$1' @@ -1339,7 +1339,7 @@ device_parsers: # @ref: https://www.itel-mobile.com/global/products/ ######### - regex: '; *itel ([^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Itel $1' + type_replacement: 'Itel $1' brand_replacement: 'Itel' model_replacement: '$1' @@ -1349,11 +1349,11 @@ device_parsers: # @models: DG80,DG20,DE38,DE88,MD70 ######### - regex: '; *(DE88Plus|MD70)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Ivio' model_replacement: '$1' - regex: '; *IVIO[_\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Ivio' model_replacement: '$1' @@ -1362,7 +1362,7 @@ device_parsers: # @ref: http://www.jay-tech.de/jaytech/servlet/frontend/ ######### - regex: '; *(TPC-\d+|JAY-TECH)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Jaytech' model_replacement: '$1' @@ -1371,7 +1371,7 @@ device_parsers: # @ref: http://www.ejiayu.com/en/Product.html ######### - regex: '; *(JY-[^;/]+|G[234]S?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Jiayu' model_replacement: '$1' @@ -1380,7 +1380,7 @@ device_parsers: # @ref: http://www.jxd.hk/ ######### - regex: '; *(JXD)[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'JXD' model_replacement: '$2' @@ -1390,15 +1390,15 @@ device_parsers: ######### - regex: '; *Karbonn[ _]?([^;/]+) *(?:Build|;)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Karbonn' model_replacement: '$1' - regex: '; *([^;]+) Build/Karbonn' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Karbonn' model_replacement: '$1' - regex: '; *(A11|A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2|Titanium S\d) +Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Karbonn' model_replacement: '$1' @@ -1407,84 +1407,84 @@ device_parsers: # @ref: http://www.ipentec.com/document/document.aspx?page=android-useragent ######### - regex: '; *(IS01|IS03|IS05|IS\d{2}SH)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sharp' model_replacement: '$1' - regex: '; *(IS04)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Regza' model_replacement: '$1' - regex: '; *(IS06|IS\d{2}PT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Pantech' model_replacement: '$1' - regex: '; *(IS11S)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'SonyEricsson' model_replacement: 'Xperia Acro' - regex: '; *(IS11CA)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Casio' model_replacement: 'GzOne $1' - regex: '; *(IS11LG)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'LG' model_replacement: 'Optimus X' - regex: '; *(IS11N)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Medias' model_replacement: '$1' - regex: '; *(IS11PT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Pantech' model_replacement: 'MIRACH' - regex: '; *(IS12F)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Fujitsu' model_replacement: 'Arrows ES' # @ref: https://ja.wikipedia.org/wiki/IS12M - regex: '; *(IS12M)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Motorola' model_replacement: 'XT909' - regex: '; *(IS12S)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'SonyEricsson' model_replacement: 'Xperia Acro HD' - regex: '; *(ISW11F)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Fujitsu' model_replacement: 'Arrowz Z' - regex: '; *(ISW11HT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: 'EVO' - regex: '; *(ISW11K)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Kyocera' model_replacement: 'DIGNO' - regex: '; *(ISW11M)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Motorola' model_replacement: 'Photon' - regex: '; *(ISW11SC)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Samsung' model_replacement: 'GALAXY S II WiMAX' - regex: '; *(ISW12HT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: 'EVO 3D' - regex: '; *(ISW13HT)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: 'J' - regex: '; *(ISW?[0-9]{2}[A-Z]{0,2})(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'KDDI' model_replacement: '$1' - regex: '; *(INFOBAR [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'KDDI' model_replacement: '$1' @@ -1493,7 +1493,7 @@ device_parsers: # @ref: http://www.e-kingcom.com ######### - regex: '; *(JOYPAD|Joypad)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Kingcom' model_replacement: '$1 $2' @@ -1504,11 +1504,11 @@ device_parsers: ######### - regex: '; *(Vox|VOX|Arc|K080)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Kobo' model_replacement: '$1' - regex: '\b(Kobo Touch)\b' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Kobo' model_replacement: '$1' @@ -1518,7 +1518,7 @@ device_parsers: ######### - regex: '; *(K-Touch)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Ktouch' model_replacement: '$2' @@ -1528,7 +1528,7 @@ device_parsers: ######### - regex: '; *((?:EV|KM)-S\d+[A-Z]?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'KTtech' model_replacement: '$1' @@ -1537,7 +1537,7 @@ device_parsers: # @ref: http://www.android.com/devices/?country=all&m=kyocera ######### - regex: '; *(Zio|Hydro|Torque|Event|EVENT|Echo|Milano|Rise|URBANO PROGRESSO|WX04K|WX06K|WX10K|KYL21|101K|C5[12]\d{2})(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Kyocera' model_replacement: '$1' @@ -1547,11 +1547,11 @@ device_parsers: ######### - regex: '; *(?:LAVA[ _]|)IRIS[ _\-]?([^/;\)]+) *(?:;|\)|Build)' regex_flag: 'i' - device_replacement: 'Iris $1' + type_replacement: 'Iris $1' brand_replacement: 'Lava' model_replacement: 'Iris $1' - regex: '; *LAVA[ _]([^;/]+) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Lava' model_replacement: '$1' @@ -1560,7 +1560,7 @@ device_parsers: # @ref: http://www.lemonmobiles.com/products.php?type=1 ######### - regex: '; *(?:(Aspire A1)|(?:LEMON|Lemon)[ _]([^;/]+))_?(?: Build|\) AppleWebKit)' - device_replacement: 'Lemon $1$2' + type_replacement: 'Lemon $1$2' brand_replacement: 'Lemon' model_replacement: '$1$2' @@ -1569,11 +1569,11 @@ device_parsers: # @ref: http://www.lenco.com/c/tablets/ ######### - regex: '; *(TAB-1012)(?: Build|\) AppleWebKit)' - device_replacement: 'Lenco $1' + type_replacement: 'Lenco $1' brand_replacement: 'Lenco' model_replacement: '$1' - regex: '; Lenco ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Lenco $1' + type_replacement: 'Lenco $1' brand_replacement: 'Lenco' model_replacement: '$1' @@ -1582,39 +1582,39 @@ device_parsers: # @ref: http://support.lenovo.com/en_GB/downloads/default.page?# ######### - regex: '; *(A1_07|A2107A-H|S2005A-H|S1-37AH0) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Lenovo' model_replacement: '$1' - regex: '; *(Idea[Tp]ab)[ _]([^;/]+);? Build' - device_replacement: 'Lenovo $1 $2' + type_replacement: 'Lenovo $1 $2' brand_replacement: 'Lenovo' model_replacement: '$1 $2' - regex: '; *(Idea(?:Tab|pad)) ?([^;/]+) Build' - device_replacement: 'Lenovo $1 $2' + type_replacement: 'Lenovo $1 $2' brand_replacement: 'Lenovo' model_replacement: '$1 $2' - regex: '; *(ThinkPad) ?(Tablet) Build/' - device_replacement: 'Lenovo $1 $2' + type_replacement: 'Lenovo $1 $2' brand_replacement: 'Lenovo' model_replacement: '$1 $2' - regex: '; *(?:LNV-|)(?:=?[Ll]enovo[ _\-]?|LENOVO[ _])(.+?)(?:Build|[;/\)])' - device_replacement: 'Lenovo $1' + type_replacement: 'Lenovo $1' brand_replacement: 'Lenovo' model_replacement: '$1' - regex: '[;,] (?:Vodafone |)(SmartTab) ?(II) ?(\d+) Build/' - device_replacement: 'Lenovo $1 $2 $3' + type_replacement: 'Lenovo $1 $2 $3' brand_replacement: 'Lenovo' model_replacement: '$1 $2 $3' - regex: '; *(?:Ideapad |)K1 Build/' - device_replacement: 'Lenovo Ideapad K1' + type_replacement: 'Lenovo Ideapad K1' brand_replacement: 'Lenovo' model_replacement: 'Ideapad K1' - regex: '; *(3GC101|3GW10[01]|A390) Build/' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Lenovo' model_replacement: '$1' - regex: '\b(?:Lenovo|LENOVO)+[ _\-]?([^,;:/ ]+)' - device_replacement: 'Lenovo $1' + type_replacement: 'Lenovo $1' brand_replacement: 'Lenovo' model_replacement: '$1' @@ -1623,7 +1623,7 @@ device_parsers: # @ref: http://www.lexibook.com/fr ######### - regex: '; *(MFC\d+)[A-Z]{2}([^;,/]*),?(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Lexibook' model_replacement: '$1$2' @@ -1632,27 +1632,27 @@ device_parsers: # @ref: http://www.lg.com/uk/mobile ######### - regex: '; *(E[34][0-9]{2}|LS[6-8][0-9]{2}|VS[6-9][0-9]+[^;/]+|Nexus 4|Nexus 5X?|GT540f?|Optimus (?:2X|G|4X HD)|OptimusX4HD) *(?:Build|;)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'LG' model_replacement: '$1' - regex: '[;:] *(L-\d+[A-Z]|LGL\d+[A-Z]?)(?:/V\d+|) *(?:Build|[;\)])' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'LG' model_replacement: '$1' - regex: '; *(LG-)([A-Z]{1,2}\d{2,}[^,;/\)\(]*?)(?:Build| V\d+|[,;/\)\(]|$)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'LG' model_replacement: '$2' - regex: '; *(LG[ \-]|LG)([^;/]+)[;/]? Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'LG' model_replacement: '$2' - regex: '^(LG)-([^;/]+)/ Mozilla/.*; Android' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'LG' model_replacement: '$2' - regex: '(Web0S); Linux/(SmartTV)' - device_replacement: 'LG $1 $2' + type_replacement: 'LG $1 $2' brand_replacement: 'LG' model_replacement: '$1 $2' @@ -1661,11 +1661,11 @@ device_parsers: # @ref: http://www.malata.com/en/products.aspx?classid=680 ######### - regex: '; *((?:SMB|smb)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Malata' model_replacement: '$1' - regex: '; *(?:Malata|MALATA) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Malata' model_replacement: '$1' @@ -1674,7 +1674,7 @@ device_parsers: # @ref: http://www.manta.com.pl/en ######### - regex: '; *(MS[45][0-9]{3}|MID0[568][NS]?|MID[1-9]|MID[78]0[1-9]|MID970[1-9]|MID100[1-9])(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Manta' model_replacement: '$1' @@ -1683,7 +1683,7 @@ device_parsers: # @ref: http://www.match.net.cn/products.asp ######### - regex: '; *(M1052|M806|M9000|M9100|M9701|MID100|MID120|MID125|MID130|MID135|MID140|MID701|MID710|MID713|MID727|MID728|MID731|MID732|MID733|MID735|MID736|MID737|MID760|MID800|MID810|MID820|MID830|MID833|MID835|MID860|MID900|MID930|MID933|MID960|MID980)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Match' model_replacement: '$1' @@ -1697,7 +1697,7 @@ device_parsers: # @note: Need more User-Agents!!! ######### - regex: '; *(GenxDroid7|MSD7.*?|AX\d.*?|Tab 701|Tab 722)(?: Build|\) AppleWebKit)' - device_replacement: 'Maxx $1' + type_replacement: 'Maxx $1' brand_replacement: 'Maxx' model_replacement: '$1' @@ -1706,11 +1706,11 @@ device_parsers: # @ref: http://www.mediacomeurope.it/ ######### - regex: '; *(M-PP[^;/]+|PhonePad ?\d{2,}[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Mediacom $1' + type_replacement: 'Mediacom $1' brand_replacement: 'Mediacom' model_replacement: '$1' - regex: '; *(M-MP[^;/]+|SmartPad ?\d{2,}[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Mediacom $1' + type_replacement: 'Mediacom $1' brand_replacement: 'Mediacom' model_replacement: '$1' @@ -1720,11 +1720,11 @@ device_parsers: ######### - regex: '; *(?:MD_|)LIFETAB[ _]([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Medion Lifetab $1' + type_replacement: 'Medion Lifetab $1' brand_replacement: 'Medion' model_replacement: 'Lifetab $1' - regex: '; *MEDION ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Medion $1' + type_replacement: 'Medion $1' brand_replacement: 'Medion' model_replacement: '$1' @@ -1733,11 +1733,11 @@ device_parsers: # @ref: http://www.meizu.com ######### - regex: '; *(M030|M031|M035|M040|M065|m9)(?: Build|\) AppleWebKit)' - device_replacement: 'Meizu $1' + type_replacement: 'Meizu $1' brand_replacement: 'Meizu' model_replacement: '$1' - regex: '; *(?:meizu_|MEIZU )(.+?) *(?:Build|[;\)])' - device_replacement: 'Meizu $1' + type_replacement: 'Meizu $1' brand_replacement: 'Meizu' model_replacement: '$1' @@ -1747,28 +1747,28 @@ device_parsers: ######### - regex: '; *(?:Micromax[ _](A111|A240)|(A111|A240)) Build' regex_flag: 'i' - device_replacement: 'Micromax $1$2' + type_replacement: 'Micromax $1$2' brand_replacement: 'Micromax' model_replacement: '$1$2' - regex: '; *Micromax[ _](A\d{2,3}[^;/]*) Build' regex_flag: 'i' - device_replacement: 'Micromax $1' + type_replacement: 'Micromax $1' brand_replacement: 'Micromax' model_replacement: '$1' # be carefull here with Acer e.g. A500 - regex: '; *(A\d{2}|A[12]\d{2}|A90S|A110Q) Build' regex_flag: 'i' - device_replacement: 'Micromax $1' + type_replacement: 'Micromax $1' brand_replacement: 'Micromax' model_replacement: '$1' - regex: '; *Micromax[ _](P\d{3}[^;/]*) Build' regex_flag: 'i' - device_replacement: 'Micromax $1' + type_replacement: 'Micromax $1' brand_replacement: 'Micromax' model_replacement: '$1' - regex: '; *(P\d{3}|P\d{3}\(Funbook\)) Build' regex_flag: 'i' - device_replacement: 'Micromax $1' + type_replacement: 'Micromax $1' brand_replacement: 'Micromax' model_replacement: '$1' @@ -1778,7 +1778,7 @@ device_parsers: ######### - regex: '; *(MITO)[ _\-]?([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Mito' model_replacement: '$2' @@ -1788,7 +1788,7 @@ device_parsers: ######### - regex: '; *(Cynus)[ _](F5|T\d|.+?) *(?:Build|[;/\)])' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Mobistel' model_replacement: '$1 $2' @@ -1798,12 +1798,12 @@ device_parsers: ######### - regex: '; *(MODECOM |)(FreeTab) ?([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1$2 $3' + type_replacement: '$1$2 $3' brand_replacement: 'Modecom' model_replacement: '$2 $3' - regex: '; *(MODECOM )([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Modecom' model_replacement: '$2' @@ -1812,32 +1812,32 @@ device_parsers: # @ref: http://www.motorola.com/us/shop-all-mobile-phones/ ######### - regex: '; *(MZ\d{3}\+?|MZ\d{3} 4G|Xoom|XOOM[^;/]*) Build' - device_replacement: 'Motorola $1' + type_replacement: 'Motorola $1' brand_replacement: 'Motorola' model_replacement: '$1' - regex: '; *(Milestone )(XT[^;/]*) Build' - device_replacement: 'Motorola $1$2' + type_replacement: 'Motorola $1$2' brand_replacement: 'Motorola' model_replacement: '$2' - regex: '; *(Motoroi ?x|Droid X|DROIDX) Build' regex_flag: 'i' - device_replacement: 'Motorola $1' + type_replacement: 'Motorola $1' brand_replacement: 'Motorola' model_replacement: 'DROID X' - regex: '; *(Droid[^;/]*|DROID[^;/]*|Milestone[^;/]*|Photon|Triumph|Devour|Titanium) Build' - device_replacement: 'Motorola $1' + type_replacement: 'Motorola $1' brand_replacement: 'Motorola' model_replacement: '$1' - regex: '; *(A555|A85[34][^;/]*|A95[356]|ME[58]\d{2}\+?|ME600|ME632|ME722|MB\d{3}\+?|MT680|MT710|MT870|MT887|MT917|WX435|WX453|WX44[25]|XT\d{3,4}[A-Z\+]*|CL[iI]Q|CL[iI]Q XT) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Motorola' model_replacement: '$1' - regex: '; *(Motorola MOT-|Motorola[ _\-]|MOT\-?)([^;/]+) Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Motorola' model_replacement: '$2' - regex: '; *(Moto[_ ]?|MOT\-)([^;/]+) Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Motorola' model_replacement: '$2' @@ -1846,7 +1846,7 @@ device_parsers: # @ref: http://www.mpmaneurope.com ######### - regex: '; *((?:MP[DQ]C|MPG\d{1,4}|MP\d{3,4}|MID(?:(?:10[234]|114|43|7[247]|8[24]|7)C|8[01]1))[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Mpman' model_replacement: '$1' @@ -1856,7 +1856,7 @@ device_parsers: ######### - regex: '; *(?:MSI[ _]|)(Primo\d+|Enjoy[ _\-][^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Msi' model_replacement: '$1' @@ -1865,7 +1865,7 @@ device_parsers: # http://www.multilaser.com.br/listagem_produtos.php?cat=5 ######### - regex: '; *Multilaser[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Multilaser' model_replacement: '$1' @@ -1874,16 +1874,16 @@ device_parsers: # @ref: http://myphone.com.ph/ ######### - regex: '; *(My)[_]?(Pad)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2 $3' + type_replacement: '$1$2 $3' brand_replacement: 'MyPhone' model_replacement: '$1$2 $3' - regex: '; *(My)\|?(Phone)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2 $3' + type_replacement: '$1$2 $3' brand_replacement: 'MyPhone' model_replacement: '$3' - regex: '; *(A\d+)[ _](Duo|)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'MyPhone' model_replacement: '$1 $2' @@ -1892,7 +1892,7 @@ device_parsers: # @ref: http://www.mytab.eu/en/category/mytab-products/ ######### - regex: '; *(myTab[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Mytab' model_replacement: '$1' @@ -1901,7 +1901,7 @@ device_parsers: # @ref: https://www.nabitablet.com ######### - regex: '; *(NABI2?-)([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Nabi' model_replacement: '$2' @@ -1910,15 +1910,15 @@ device_parsers: # @ref: http://www.n-keitai.com/ ######### - regex: '; *(N-\d+[CDE])(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Nec' model_replacement: '$1' - regex: '; ?(NEC-)(.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Nec' model_replacement: '$2' - regex: '; *(LT-NA7)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Nec' model_replacement: 'Lifetouch Note' @@ -1927,7 +1927,7 @@ device_parsers: # @ref: http://nextbookusa.com ######### - regex: '; *(NXM\d+[A-Za-z0-9_]*|Next\d[A-Za-z0-9_ \-]*|NEXT\d[A-Za-z0-9_ \-]*|Nextbook [A-Za-z0-9_ ]*|DATAM803HC|M805)(?: Build|[\);])' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Nextbook' model_replacement: '$1' @@ -1937,11 +1937,11 @@ device_parsers: ######### - regex: '; *(Nokia)([ _\-]*)([^;/]*) Build' regex_flag: 'i' - device_replacement: '$1$2$3' + type_replacement: '$1$2$3' brand_replacement: 'Nokia' model_replacement: '$3' - regex: '; *(TA\-\d{4})(?: Build|\) AppleWebKit)' - device_replacement: 'Nokia $1' + type_replacement: 'Nokia $1' brand_replacement: 'Nokia' model_replacement: '$1' @@ -1951,15 +1951,15 @@ device_parsers: # TODO nook browser/1.0 ######### - regex: '; *(Nook ?|Barnes & Noble Nook |BN )([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Nook' model_replacement: '$2' - regex: '; *(NOOK |)(BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Nook' model_replacement: '$2' - regex: '; Build/(Nook)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Nook' model_replacement: 'Tablet' @@ -1968,7 +1968,7 @@ device_parsers: # @ref: http://www.olivetti.de/EN/Page/t02/view_html?idp=348 ######### - regex: '; *(OP110|OliPad[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Olivetti $1' + type_replacement: 'Olivetti $1' brand_replacement: 'Olivetti' model_replacement: '$1' @@ -1979,11 +1979,11 @@ device_parsers: # @models: (T107|MID(?:700[2-5]|7031|7108|7132|750[02]|8001|8500|9001|971[12]) ######### - regex: '; *OMEGA[ _\-](MID[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Omega $1' + type_replacement: 'Omega $1' brand_replacement: 'Omega' model_replacement: '$1' - regex: '^(MID7500|MID\d+) Mozilla/5\.0 \(iPad;' - device_replacement: 'Omega $1' + type_replacement: 'Omega $1' brand_replacement: 'Omega' model_replacement: '$1' @@ -1992,7 +1992,7 @@ device_parsers: # @ref: https://support.google.com/googleplay/answer/1727131?hl=en ######### - regex: '; *((?:CIUS|cius)[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'Openpeak $1' + type_replacement: 'Openpeak $1' brand_replacement: 'Openpeak' model_replacement: '$1' @@ -2001,18 +2001,18 @@ device_parsers: # @ref: http://en.oppo.com/products/ ######### - regex: '; *(Find ?(?:5|7a)|R8[012]\d{1,2}|T703\d?|U70\d{1,2}T?|X90\d{1,2}|[AFR]\d{1,2}[a-z]{1,2})(?: Build|\) AppleWebKit)' - device_replacement: 'Oppo $1' + type_replacement: 'Oppo $1' brand_replacement: 'Oppo' model_replacement: '$1' - regex: '; *OPPO ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Oppo $1' + type_replacement: 'Oppo $1' brand_replacement: 'Oppo' model_replacement: '$1' - regex: '; *(CPH\d{1,4}|RMX\d{1,4}|P[A-Z]{3}\d{2})(?: Build|\) AppleWebKit)' - device_replacement: 'Oppo $1' + type_replacement: 'Oppo $1' brand_replacement: 'Oppo' - regex: '; *(A1601)(?: Build|\) AppleWebKit)' - device_replacement: 'Oppo F1s' + type_replacement: 'Oppo F1s' brand_replacement: 'Oppo' model_replacement: '$1' @@ -2021,20 +2021,20 @@ device_parsers: # @ref: http://odys.de ######### - regex: '; *(?:Odys\-|ODYS\-|ODYS )([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Odys $1' + type_replacement: 'Odys $1' brand_replacement: 'Odys' model_replacement: '$1' - regex: '; *(SELECT) ?(7)(?: Build|\) AppleWebKit)' - device_replacement: 'Odys $1 $2' + type_replacement: 'Odys $1 $2' brand_replacement: 'Odys' model_replacement: '$1 $2' - regex: '; *(PEDI)_(PLUS)_(W)(?: Build|\) AppleWebKit)' - device_replacement: 'Odys $1 $2 $3' + type_replacement: 'Odys $1 $2 $3' brand_replacement: 'Odys' model_replacement: '$1 $2 $3' # Weltbild - Tablet PC 4 = Cat Phoenix = Odys Tablet PC 4? - regex: '; *(AEON|BRAVIO|FUSION|FUSION2IN1|Genio|EOS10|IEOS[^;/]*|IRON|Loox|LOOX|LOOX Plus|Motion|NOON|NOON_PRO|NEXT|OPOS|PEDI[^;/]*|PRIME[^;/]*|STUDYTAB|TABLO|Tablet-PC-4|UNO_X8|XELIO[^;/]*|Xelio ?\d+ ?[Pp]ro|XENO10|XPRESS PRO)(?: Build|\) AppleWebKit)' - device_replacement: 'Odys $1' + type_replacement: 'Odys $1' brand_replacement: 'Odys' model_replacement: '$1' @@ -2043,11 +2043,11 @@ device_parsers: # @ref https://oneplus.net/ ######### - regex: '; (ONE [a-zA-Z]\d+)(?: Build|\) AppleWebKit)' - device_replacement: 'OnePlus $1' + type_replacement: 'OnePlus $1' brand_replacement: 'OnePlus' model_replacement: '$1' - regex: '; (ONEPLUS [a-zA-Z]\d+)(?: Build|\) AppleWebKit)' - device_replacement: 'OnePlus $1' + type_replacement: 'OnePlus $1' brand_replacement: 'OnePlus' model_replacement: '$1' @@ -2056,7 +2056,7 @@ device_parsers: # @ref: http://www.orion.ua/en/products/computer-products/tablet-pcs.html ######### - regex: '; *(TP-\d+)(?: Build|\) AppleWebKit)' - device_replacement: 'Orion $1' + type_replacement: 'Orion $1' brand_replacement: 'Orion' model_replacement: '$1' @@ -2065,7 +2065,7 @@ device_parsers: # @ref: http://www.packardbell.com/pb/en/AE/content/productgroup/tablets ######### - regex: '; *(G100W?)(?: Build|\) AppleWebKit)' - device_replacement: 'PackardBell $1' + type_replacement: 'PackardBell $1' brand_replacement: 'PackardBell' model_replacement: '$1' @@ -2076,17 +2076,17 @@ device_parsers: # @models: (tab) Toughpad FZ-A1, Toughpad JT-B1 ######### - regex: '; *(Panasonic)[_ ]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' # Toughpad - regex: '; *(FZ-A1B|JT-B1)(?: Build|\) AppleWebKit)' - device_replacement: 'Panasonic $1' + type_replacement: 'Panasonic $1' brand_replacement: 'Panasonic' model_replacement: '$1' # Eluga Power - regex: '; *(dL1|DL1)(?: Build|\) AppleWebKit)' - device_replacement: 'Panasonic $1' + type_replacement: 'Panasonic $1' brand_replacement: 'Panasonic' model_replacement: '$1' @@ -2097,15 +2097,15 @@ device_parsers: # @models: ADR8995, ADR910L, ADR930VW, C790, CDM8992, CDM8999, IS06, IS11PT, P2000, P2020, P2030, P4100, P5000, P6010, P6020, P6030, P7000, P7040, P8000, P8010, P9020, P9050, P9060, P9070, P9090, PT001, PT002, PT003, TXT8040, TXT8045, VEGA PTL21 ######### - regex: '; *(SKY[ _]|)(IM\-[AT]\d{3}[^;/]+).* Build/' - device_replacement: 'Pantech $1$2' + type_replacement: 'Pantech $1$2' brand_replacement: 'Pantech' model_replacement: '$1$2' - regex: '; *((?:ADR8995|ADR910L|ADR930L|ADR930VW|PTL21|P8000)(?: 4G|)) Build/' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Pantech' model_replacement: '$1' - regex: '; *Pantech([^;/]+).* Build/' - device_replacement: 'Pantech $1' + type_replacement: 'Pantech $1' brand_replacement: 'Pantech' model_replacement: '$1' @@ -2115,7 +2115,7 @@ device_parsers: ######### - regex: '; *(papyre)[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Papyre' model_replacement: '$2' @@ -2124,7 +2124,7 @@ device_parsers: # @ref: http://www.pearl.de/c-1540.shtml ######### - regex: '; *(?:Touchlet )?(X10\.[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Pearl $1' + type_replacement: 'Pearl $1' brand_replacement: 'Pearl' model_replacement: '$1' @@ -2133,15 +2133,15 @@ device_parsers: # @ref: http://www.phicomm.com.cn/ ######### - regex: '; PHICOMM (i800)(?: Build|\) AppleWebKit)' - device_replacement: 'Phicomm $1' + type_replacement: 'Phicomm $1' brand_replacement: 'Phicomm' model_replacement: '$1' - regex: '; PHICOMM ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Phicomm $1' + type_replacement: 'Phicomm $1' brand_replacement: 'Phicomm' model_replacement: '$1' - regex: '; *(FWS\d{3}[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Phicomm $1' + type_replacement: 'Phicomm $1' brand_replacement: 'Phicomm' model_replacement: '$1' @@ -2153,11 +2153,11 @@ device_parsers: ######### # @note: this a best guess according to available philips models. Need more User-Agents - regex: '; *(D633|D822|D833|T539|T939|V726|W335|W336|W337|W3568|W536|W5510|W626|W632|W6350|W6360|W6500|W732|W736|W737|W7376|W820|W832|W8355|W8500|W8510|W930)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Philips' model_replacement: '$1' - regex: '; *(?:Philips|PHILIPS)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Philips $1' + type_replacement: 'Philips $1' brand_replacement: 'Philips' model_replacement: '$1' @@ -2166,7 +2166,7 @@ device_parsers: # @ref: http://www.pipo.cn/En/ ######### - regex: 'Android 4\..*; *(M[12356789]|U[12368]|S[123])\ ?(pro)?(?: Build|\) AppleWebKit)' - device_replacement: 'Pipo $1$2' + type_replacement: 'Pipo $1$2' brand_replacement: 'Pipo' model_replacement: '$1$2' @@ -2175,7 +2175,7 @@ device_parsers: # @ref: http://en.ployer.cn/ ######### - regex: '; *(MOMO[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Ployer' model_replacement: '$1' @@ -2184,11 +2184,11 @@ device_parsers: # @ref: http://polaroidstore.com/store/start.asp?category_id=382&category_id2=0&order=title&filter1=&filter2=&filter3=&view=all ######### - regex: '; *(?:Polaroid[ _]|)((?:MIDC\d{3,}|PMID\d{2,}|PTAB\d{3,})[^;/]*?)(\/[^;/]*|)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Polaroid' model_replacement: '$1' - regex: '; *(?:Polaroid )(Tablet)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Polaroid' model_replacement: '$1' @@ -2198,7 +2198,7 @@ device_parsers: ######### #~ TODO - regex: '; *(POMP)[ _\-](.+?) *(?:Build|[;/\)])' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Pomp' model_replacement: '$2' @@ -2207,11 +2207,11 @@ device_parsers: # @ref: http://www.positivoinformatica.com.br/www/pessoal/tablet-ypy/ ######### - regex: '; *(TB07STA|TB10STA|TB07FTA|TB10FTA)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Positivo' model_replacement: '$1' - regex: '; *(?:Positivo |)((?:YPY|Ypy)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Positivo' model_replacement: '$1' @@ -2221,15 +2221,15 @@ device_parsers: # @TODO: Smartphone Models MOB-3515, MOB-5045-B missing ######### - regex: '; *(MOB-[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'POV' model_replacement: '$1' - regex: '; *POV[ _\-]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'POV $1' + type_replacement: 'POV $1' brand_replacement: 'POV' model_replacement: '$1' - regex: '; *((?:TAB-PLAYTAB|TAB-PROTAB|PROTAB|PlayTabPro|Mobii[ _\-]|TAB-P)[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'POV $1' + type_replacement: 'POV $1' brand_replacement: 'POV' model_replacement: '$1' @@ -2239,7 +2239,7 @@ device_parsers: # @ref: http://www.prestigio.com/catalogue/MultiPads ######### - regex: '; *(?:Prestigio |)((?:PAP|PMP)\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Prestigio $1' + type_replacement: 'Prestigio $1' brand_replacement: 'Prestigio' model_replacement: '$1' @@ -2248,7 +2248,7 @@ device_parsers: # @ref: http://www.proscanvideo.com/products-search.asp?itemClass=TABLET&itemnmbr= ######### - regex: '; *(PLT[0-9]{4}.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Proscan' model_replacement: '$1' @@ -2257,15 +2257,15 @@ device_parsers: # @ref: http://www.qmobile.com.pk/ ######### - regex: '; *(A2|A5|A8|A900)_?(Classic|)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Qmobile' model_replacement: '$1 $2' - regex: '; *(Q[Mm]obile)_([^_]+)_([^_]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Qmobile $2 $3' + type_replacement: 'Qmobile $2 $3' brand_replacement: 'Qmobile' model_replacement: '$2 $3' - regex: '; *(Q\-?[Mm]obile)[_ ](A[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Qmobile $2' + type_replacement: 'Qmobile $2' brand_replacement: 'Qmobile' model_replacement: '$2' @@ -2274,11 +2274,11 @@ device_parsers: # @ref: http://qmobile.vn/san-pham.html ######### - regex: '; *(Q\-Smart)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Qmobilevn' model_replacement: '$2' - regex: '; *(Q\-?[Mm]obile)[ _\-](S[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Qmobilevn' model_replacement: '$2' @@ -2287,7 +2287,7 @@ device_parsers: # @ref: ? ######### - regex: '; *(TA1013)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Quanta' model_replacement: '$1' @@ -2296,11 +2296,11 @@ device_parsers: # @ref: http://rcamobilephone.com/ ######### - regex: '; (RCT\w+)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'RCA' model_replacement: '$1' - regex: '; RCA (\w+)(?: Build|\) AppleWebKit)' - device_replacement: 'RCA $1' + type_replacement: 'RCA $1' brand_replacement: 'RCA' model_replacement: '$1' @@ -2310,11 +2310,11 @@ device_parsers: # @note: manufacturer sells chipsets - I assume that these UAs are dev-boards ######### - regex: '; *(RK\d+),?(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Rockchip' model_replacement: '$1' - regex: ' Build/(RK\d+)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Rockchip' model_replacement: '$1' @@ -2323,55 +2323,55 @@ device_parsers: # @ref: http://www.samsung.com/us/mobile/cell-phones/all-products ######### - regex: '; *(SAMSUNG |Samsung |)((?:Galaxy (?:Note II|S\d)|GT-I9082|GT-I9205|GT-N7\d{3}|SM-N9005)[^;/]*)\/?[^;/]* Build/' - device_replacement: 'Samsung $1$2' + type_replacement: 'Samsung $1$2' brand_replacement: 'Samsung' model_replacement: '$2' - regex: '; *(Google |)(Nexus [Ss](?: 4G|)) Build/' - device_replacement: 'Samsung $1$2' + type_replacement: 'Samsung $1$2' brand_replacement: 'Samsung' model_replacement: '$2' - regex: '; *(SAMSUNG |Samsung )([^\/]*)\/[^ ]* Build/' - device_replacement: 'Samsung $2' + type_replacement: 'Samsung $2' brand_replacement: 'Samsung' model_replacement: '$2' - regex: '; *(Galaxy(?: Ace| Nexus| S ?II+|Nexus S| with MCR 1.2| Mini Plus 4G|)) Build/' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' - regex: '; *(SAMSUNG[ _\-]|)(?:SAMSUNG[ _\-])([^;/]+) Build' - device_replacement: 'Samsung $2' + type_replacement: 'Samsung $2' brand_replacement: 'Samsung' model_replacement: '$2' - regex: '; *(SAMSUNG-|)(GT\-[BINPS]\d{4}[^\/]*)(\/[^ ]*) Build' - device_replacement: 'Samsung $1$2$3' + type_replacement: 'Samsung $1$2$3' brand_replacement: 'Samsung' model_replacement: '$2' - regex: '(?:; *|^)((?:GT\-[BIiNPS]\d{4}|I9\d{2}0[A-Za-z\+]?\b)[^;/\)]*?)(?:Build|Linux|MIUI|[;/\)])' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' - regex: '; (SAMSUNG-)([A-Za-z0-9\-]+).* Build/' - device_replacement: 'Samsung $1$2' + type_replacement: 'Samsung $1$2' brand_replacement: 'Samsung' model_replacement: '$2' - regex: '; *((?:SCH|SGH|SHV|SHW|SPH|SC|SM)\-[A-Za-z0-9 ]+)(/?[^ ]*|) Build' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' - regex: '; *((?:SC)\-[A-Za-z0-9 ]+)(/?[^ ]*|)\)' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' - regex: ' ((?:SCH)\-[A-Za-z0-9 ]+)(/?[^ ]*|) Build' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' - regex: '; *(Behold ?(?:2|II)|YP\-G[^;/]+|EK-GC100|SCL21|I9300) Build' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' - regex: '; *((?:SCH|SGH|SHV|SHW|SPH|SC|SM)\-[A-Za-z0-9]{5,6})[\)]' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' @@ -2381,11 +2381,11 @@ device_parsers: # @ref: http://www.android.com/devices/?country=all&m=sharp ######### - regex: '; *(SH\-?\d\d[^;/]+|SBM\d[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sharp' model_replacement: '$1' - regex: '; *(SHARP[ -])([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Sharp' model_replacement: '$2' @@ -2394,15 +2394,15 @@ device_parsers: # @ref: http://www.simvalley-mobile.de/ ######### - regex: '; *(SPX[_\-]\d[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Simvalley' model_replacement: '$1' - regex: '; *(SX7\-PEARL\.GmbH)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Simvalley' model_replacement: '$1' - regex: '; *(SP[T]?\-\d{2}[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Simvalley' model_replacement: '$1' @@ -2412,7 +2412,7 @@ device_parsers: # @ref: http://www.android.com/devices/?country=all&m=sk-telesys ######### - regex: '; *(SK\-.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'SKtelesys' model_replacement: '$1' @@ -2421,11 +2421,11 @@ device_parsers: # @ref: http://skytex.com/android ######### - regex: '; *(?:SKYTEX|SX)-([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Skytex' model_replacement: '$1' - regex: '; *(IMAGINE [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Skytex' model_replacement: '$1' @@ -2435,7 +2435,7 @@ device_parsers: # @models: Z8, X7, U7H, U7, T30, T20, Ten3, V5-II, T7-3G, SmartQ5, K7, S7, Q8, T19, Ten2, Ten, R10, T7, R7, V5, V7, SmartQ7 ######### - regex: '; *(SmartQ) ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -2445,7 +2445,7 @@ device_parsers: # @missing: SBT Useragents ######### - regex: '; *(WF7C|WF10C|SBT[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Smartbitt' model_replacement: '$1' @@ -2454,27 +2454,27 @@ device_parsers: # @ref: http://www.ipentec.com/document/document.aspx?page=android-useragent ######### - regex: '; *(SBM(?:003SH|005SH|006SH|007SH|102SH)) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sharp' model_replacement: '$1' - regex: '; *(003P|101P|101P11C|102P) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Panasonic' model_replacement: '$1' - regex: '; *(00\dZ) Build/' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'ZTE' model_replacement: '$1' - regex: '; HTC(X06HT) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: '$1' - regex: '; *(001HT|X06HT) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: '$1' - regex: '; *(201M) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Motorola' model_replacement: 'XT902' @@ -2484,11 +2484,11 @@ device_parsers: # @note: Must come before SonyEricsson ######### - regex: '; *(ST\d{4}.*)Build/ST' - device_replacement: 'Trekstor $1' + type_replacement: 'Trekstor $1' brand_replacement: 'Trekstor' model_replacement: '$1' - regex: '; *(ST\d{4}.*?)(?: Build|\) AppleWebKit)' - device_replacement: 'Trekstor $1' + type_replacement: 'Trekstor $1' brand_replacement: 'Trekstor' model_replacement: '$1' @@ -2500,17 +2500,17 @@ device_parsers: ######### # android matchers - regex: '; *(Sony ?Ericsson ?)([^;/]+) Build' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'SonyEricsson' model_replacement: '$2' - regex: '; *((?:SK|ST|E|X|LT|MK|MT|WT)\d{2}[a-z0-9]*(?:-o|)|R800i|U20i) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'SonyEricsson' model_replacement: '$1' # TODO X\d+ is wrong - regex: '; *(Xperia (?:A8|Arc|Acro|Active|Live with Walkman|Mini|Neo|Play|Pro|Ray|X\d+)[^;/]*) Build' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'SonyEricsson' model_replacement: '$1' @@ -2521,31 +2521,31 @@ device_parsers: # @ref: http://www.sony.jp/tablet/ ######### - regex: '; Sony (Tablet[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Sony $1' + type_replacement: 'Sony $1' brand_replacement: 'Sony' model_replacement: '$1' - regex: '; Sony ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Sony $1' + type_replacement: 'Sony $1' brand_replacement: 'Sony' model_replacement: '$1' - regex: '; *(Sony)([A-Za-z0-9\-]+)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' - regex: '; *(Xperia [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sony' model_replacement: '$1' - regex: '; *(C(?:1[0-9]|2[0-9]|53|55|6[0-9])[0-9]{2}|D[25]\d{3}|D6[56]\d{2})(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sony' model_replacement: '$1' - regex: '; *(SGP\d{3}|SGPT\d{2})(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sony' model_replacement: '$1' - regex: '; *(NW-Z1000Series)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sony' model_replacement: '$1' @@ -2555,11 +2555,11 @@ device_parsers: # The Vita spoofs the Kindle ########## - regex: 'PLAYSTATION 3' - device_replacement: 'PlayStation 3' + type_replacement: 'PlayStation 3' brand_replacement: 'Sony' model_replacement: 'PlayStation 3' - regex: '(PlayStation (?:Portable|Vita|\d+))' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sony' model_replacement: '$1' @@ -2568,7 +2568,7 @@ device_parsers: # @ref: http://www.spicemobilephones.co.in/ ######### - regex: '; *((?:CSL_Spice|Spice|SPICE|CSL)[ _\-]?|)([Mm][Ii])([ _\-]|)(\d{3}[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2$3$4' + type_replacement: '$1$2$3$4' brand_replacement: 'Spice' model_replacement: 'Mi$4' @@ -2577,11 +2577,11 @@ device_parsers: # @ref: ######### - regex: '; *(Sprint )(.+?) *(?:Build|[;/])' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Sprint' model_replacement: '$2' - regex: '\b(Sprint)[: ]([^;,/ ]+)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Sprint' model_replacement: '$2' @@ -2590,7 +2590,7 @@ device_parsers: # @ref: ?? ######### - regex: '; *(TAGI[ ]?)(MID) ?([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2$3' + type_replacement: '$1$2$3' brand_replacement: 'Tagi' model_replacement: '$2$3' @@ -2599,7 +2599,7 @@ device_parsers: # @ref: http://www.tecmobile.com/ ######### - regex: '; *(Oyster500|Opal 800)(?: Build|\) AppleWebKit)' - device_replacement: 'Tecmobile $1' + type_replacement: 'Tecmobile $1' brand_replacement: 'Tecmobile' model_replacement: '$1' @@ -2608,7 +2608,7 @@ device_parsers: # @ref: www.tecno-mobile.com/ ######### - regex: '; *(TECNO[ _])([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Tecno' model_replacement: '$2' @@ -2618,7 +2618,7 @@ device_parsers: ######### - regex: '; *Android for (Telechips|Techvision) ([^ ]+) ' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -2628,7 +2628,7 @@ device_parsers: # @ref: https://support.google.com/googleplay/answer/1727131?hl=en ######### - regex: '; *(T-Hub2)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Telstra' model_replacement: '$1' @@ -2637,7 +2637,7 @@ device_parsers: # @ref: http://www.wortmann.de/ ######### - regex: '; *(PAD) ?(100[12])(?: Build|\) AppleWebKit)' - device_replacement: 'Terra $1$2' + type_replacement: 'Terra $1$2' brand_replacement: 'Terra' model_replacement: '$1$2' @@ -2646,7 +2646,7 @@ device_parsers: # @ref: http://www.texet.ru/tablet/ ######### - regex: '; *(T[BM]-\d{3}[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Texet' model_replacement: '$1' @@ -2655,11 +2655,11 @@ device_parsers: # @ref: http://www.thalia.de/shop/tolino-shine-ereader/show/ ######### - regex: '; *(tolino [^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Thalia' model_replacement: '$1' - regex: '; *Build/.* (TOLINO_BROWSER)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Thalia' model_replacement: 'Tolino Shine' @@ -2669,11 +2669,11 @@ device_parsers: # @ref: http://thlmobilestore.com ######### - regex: '; *(?:CJ[ -])?(ThL|THL)[ -]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Thl' model_replacement: '$2' - regex: '; *(T100|T200|T5|W100|W200|W8s)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Thl' model_replacement: '$1' @@ -2682,40 +2682,40 @@ device_parsers: ######### # @ref: https://en.wikipedia.org/wiki/HTC_Hero - regex: '; *(T-Mobile[ _]G2[ _]Touch) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: 'Hero' # @ref: https://en.wikipedia.org/wiki/HTC_Desire_Z - regex: '; *(T-Mobile[ _]G2) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: 'Desire Z' - regex: '; *(T-Mobile myTouch Q) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Huawei' model_replacement: 'U8730' - regex: '; *(T-Mobile myTouch) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Huawei' model_replacement: 'U8680' - regex: '; *(T-Mobile_Espresso) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: 'Espresso' - regex: '; *(T-Mobile G1) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'HTC' model_replacement: 'Dream' - regex: '\b(T-Mobile ?|)(myTouch)[ _]?([34]G)[ _]?([^\/]*) (?:Mozilla|Build)' - device_replacement: '$1$2 $3 $4' + type_replacement: '$1$2 $3 $4' brand_replacement: 'HTC' model_replacement: '$2 $3 $4' - regex: '\b(T-Mobile)_([^_]+)_(.*) Build' - device_replacement: '$1 $2 $3' + type_replacement: '$1 $2 $3' brand_replacement: 'Tmobile' model_replacement: '$2 $3' - regex: '\b(T-Mobile)[_ ]?(.*?)Build' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Tmobile' model_replacement: '$2' @@ -2724,7 +2724,7 @@ device_parsers: # @ref: http://www.tom-tec.eu/pages/tablets.php ######### - regex: ' (ATP[0-9]{4})(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Tomtec' model_replacement: '$1' @@ -2734,7 +2734,7 @@ device_parsers: ######### - regex: ' *(TOOKY)[ _\-]([^;/]+?) ?(?:Build|;)' regex_flag: 'i' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Tooky' model_replacement: '$2' @@ -2744,15 +2744,15 @@ device_parsers: # @missing: LT170, Thrive 7, TOSHIBA STB10 ######### - regex: '\b(TOSHIBA_AC_AND_AZ|TOSHIBA_FOLIO_AND_A|FOLIO_AND_A)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Toshiba' model_replacement: 'Folio 100' - regex: '; *([Ff]olio ?100)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Toshiba' model_replacement: 'Folio 100' - regex: '; *(AT[0-9]{2,3}(?:\-A|LE\-A|PE\-A|SE|a|)|AT7-A|AT1S0|Hikari-iFrame/WDPF-[^;/]+|THRiVE|Thrive)(?: Build|\) AppleWebKit)' - device_replacement: 'Toshiba $1' + type_replacement: 'Toshiba $1' brand_replacement: 'Toshiba' model_replacement: '$1' @@ -2761,12 +2761,12 @@ device_parsers: # @ref: http://touchmatepc.com/new/ ######### - regex: '; *(TM-MID\d+[^;/]+|TOUCHMATE|MID-750)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Touchmate' model_replacement: '$1' # @todo: needs verification user-agents missing - regex: '; *(TM-SM\d+[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Touchmate' model_replacement: '$1' @@ -2775,12 +2775,12 @@ device_parsers: # @ref: http://www.treq.co.id/product ######### - regex: '; *(A10 [Bb]asic2?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Treq' model_replacement: '$1' - regex: '; *(TREQ[ _\-])([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Treq' model_replacement: '$2' @@ -2791,12 +2791,12 @@ device_parsers: ######### # @todo: guessed markers - regex: '; *(X-?5|X-?3)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Umeox' model_replacement: '$1' # @todo: guessed markers - regex: '; *(A502\+?|A936|A603|X1|X2)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Umeox' model_replacement: '$1' @@ -2806,7 +2806,7 @@ device_parsers: ######### - regex: '(TOUCH(?:TAB|PAD).+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Versus $1' + type_replacement: 'Versus $1' brand_replacement: 'Versus' model_replacement: '$1' @@ -2815,7 +2815,7 @@ device_parsers: # @ref: http://www.vertu.com/ ######### - regex: '(VERTU) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Vertu' model_replacement: '$2' @@ -2824,11 +2824,11 @@ device_parsers: # @ref: http://www.videoconmobiles.com ######### - regex: '; *(Videocon)[ _\-]([^;/]+?) *(?:Build|;)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'Videocon' model_replacement: '$2' - regex: ' (VT\d{2}[A-Za-z]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Videocon' model_replacement: '$1' @@ -2837,15 +2837,15 @@ device_parsers: # @ref: http://viewsonic.com ######### - regex: '; *((?:ViewPad|ViewPhone|VSD)[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Viewsonic' model_replacement: '$1' - regex: '; *(ViewSonic-)([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'Viewsonic' model_replacement: '$2' - regex: '; *(GTablet.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Viewsonic' model_replacement: '$1' @@ -2854,7 +2854,7 @@ device_parsers: # @ref: http://vivo.cn/ ######### - regex: '; *([Vv]ivo)[ _]([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'vivo' model_replacement: '$2' @@ -2863,7 +2863,7 @@ device_parsers: # @ref: ?? ######### - regex: '(Vodafone) (.*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -2873,7 +2873,7 @@ device_parsers: ######### - regex: '; *(?:Walton[ _\-]|)(Primo[ _\-][^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Walton $1' + type_replacement: 'Walton $1' brand_replacement: 'Walton' model_replacement: '$1' @@ -2883,7 +2883,7 @@ device_parsers: ######### - regex: '; *(?:WIKO[ \-]|)(CINK\+?|BARRY|BLOOM|DARKFULL|DARKMOON|DARKNIGHT|DARKSIDE|FIZZ|HIGHWAY|IGGY|OZZY|RAINBOW|STAIRWAY|SUBLIM|WAX|CINK [^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Wiko $1' + type_replacement: 'Wiko $1' brand_replacement: 'Wiko' model_replacement: '$1' @@ -2892,7 +2892,7 @@ device_parsers: # @ref: ?? ######### - regex: '; *WellcoM-([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Wellcom $1' + type_replacement: 'Wellcom $1' brand_replacement: 'Wellcom' model_replacement: '$1' @@ -2901,7 +2901,7 @@ device_parsers: # @ref: http://wetab.mobi/ ########## - regex: '(?:(WeTab)-Browser|; (wetab) Build)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'WeTab' model_replacement: 'WeTab' @@ -2910,7 +2910,7 @@ device_parsers: # @ref: http://wolfgangmobile.com/ ######### - regex: '; *(AT-AS[^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Wolfgang $1' + type_replacement: 'Wolfgang $1' brand_replacement: 'Wolfgang' model_replacement: '$1' @@ -2919,7 +2919,7 @@ device_parsers: # @ref: http://www.woxter.es/es-es/categories/index ######### - regex: '; *(?:Woxter|Wxt) ([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'Woxter $1' + type_replacement: 'Woxter $1' brand_replacement: 'Woxter' model_replacement: '$1' @@ -2928,7 +2928,7 @@ device_parsers: # @ref: http://yarvik.com ######### - regex: '; *(?:Xenta |Luna |)(TAB[234][0-9]{2}|TAB0[78]-\d{3}|TAB0?9-\d{3}|TAB1[03]-\d{3}|SMP\d{2}-\d{3})(?: Build|\) AppleWebKit)' - device_replacement: 'Yarvik $1' + type_replacement: 'Yarvik $1' brand_replacement: 'Yarvik' model_replacement: '$1' @@ -2942,7 +2942,7 @@ device_parsers: # M789, M799, M769, M757, M755, M753, M752, M739, M729, M723, M712, M727 ######### - regex: '; *([A-Z]{2,4})(M\d{3,}[A-Z]{2})([^;\)\/]*)(?: Build|[;\)])' - device_replacement: 'Yifang $1$2$3' + type_replacement: 'Yifang $1$2$3' brand_replacement: 'Yifang' model_replacement: '$2' @@ -2951,19 +2951,19 @@ device_parsers: # @ref: http://www.xiaomi.com/event/buyphone ######### - regex: '; *((Mi|MI|HM|MI-ONE|Redmi)[ -](NOTE |Note |)[^;/]*) (Build|MIUI)/' - device_replacement: 'XiaoMi $1' + type_replacement: 'XiaoMi $1' brand_replacement: 'XiaoMi' model_replacement: '$1' - regex: '; *((Mi|MI|HM|MI-ONE|Redmi)[ -](NOTE |Note |)[^;/\)]*)' - device_replacement: 'XiaoMi $1' + type_replacement: 'XiaoMi $1' brand_replacement: 'XiaoMi' model_replacement: '$1' - regex: '; *(MIX) (Build|MIUI)/' - device_replacement: 'XiaoMi $1' + type_replacement: 'XiaoMi $1' brand_replacement: 'XiaoMi' model_replacement: '$1' - regex: '; *((MIX) ([^;/]*)) (Build|MIUI)/' - device_replacement: 'XiaoMi $1' + type_replacement: 'XiaoMi $1' brand_replacement: 'XiaoMi' model_replacement: '$1' @@ -2973,17 +2973,17 @@ device_parsers: ######### - regex: '; *XOLO[ _]([^;/]*tab.*)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Xolo $1' + type_replacement: 'Xolo $1' brand_replacement: 'Xolo' model_replacement: '$1' - regex: '; *XOLO[ _]([^;/]+?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Xolo $1' + type_replacement: 'Xolo $1' brand_replacement: 'Xolo' model_replacement: '$1' - regex: '; *(q\d0{2,3}[a-z]?)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: 'Xolo $1' + type_replacement: 'Xolo $1' brand_replacement: 'Xolo' model_replacement: '$1' @@ -2992,7 +2992,7 @@ device_parsers: # @ref: http://www.xoro.de/produkte/ ######### - regex: '; *(PAD ?[79]\d+[^;/]*|TelePAD\d+[^;/])(?: Build|\) AppleWebKit)' - device_replacement: 'Xoro $1' + type_replacement: 'Xoro $1' brand_replacement: 'Xoro' model_replacement: '$1' @@ -3001,7 +3001,7 @@ device_parsers: # @ref: http://www.zopomobiles.com/products.html ######### - regex: '; *(?:(?:ZOPO|Zopo)[ _]([^;/]+?)|(ZP ?(?:\d{2}[^;/]+|C2))|(C[2379]))(?: Build|\) AppleWebKit)' - device_replacement: '$1$2$3' + type_replacement: '$1$2$3' brand_replacement: 'Zopo' model_replacement: '$1$2$3' @@ -3010,11 +3010,11 @@ device_parsers: # @ref: http://www.ziilabs.com/products/platforms/androidreferencetablets.php ######### - regex: '; *(ZiiLABS) (Zii[^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'ZiiLabs' model_replacement: '$2' - regex: '; *(Zii)_([^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'ZiiLabs' model_replacement: '$2' @@ -3023,45 +3023,45 @@ device_parsers: # @ref: http://www.ztedevices.com/ ######### - regex: '; *(ARIZONA|(?:ATLAS|Atlas) W|D930|Grand (?:[SX][^;]*?|Era|Memo[^;]*?)|JOE|(?:Kis|KIS)\b[^;]*?|Libra|Light [^;]*?|N8[056][01]|N850L|N8000|N9[15]\d{2}|N9810|NX501|Optik|(?:Vip )Racer[^;]*?|RacerII|RACERII|San Francisco[^;]*?|V9[AC]|V55|V881|Z[679][0-9]{2}[A-z]?)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'ZTE' model_replacement: '$1' - regex: '; *([A-Z]\d+)_USA_[^;]*(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'ZTE' model_replacement: '$1' - regex: '; *(SmartTab\d+)[^;]*(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'ZTE' model_replacement: '$1' - regex: '; *(?:Blade|BLADE|ZTE-BLADE)([^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'ZTE Blade$1' + type_replacement: 'ZTE Blade$1' brand_replacement: 'ZTE' model_replacement: 'Blade$1' - regex: '; *(?:Skate|SKATE|ZTE-SKATE)([^;/]*)(?: Build|\) AppleWebKit)' - device_replacement: 'ZTE Skate$1' + type_replacement: 'ZTE Skate$1' brand_replacement: 'ZTE' model_replacement: 'Skate$1' - regex: '; *(Orange |Optimus )(Monte Carlo|San Francisco)(?: Build|\) AppleWebKit)' - device_replacement: '$1$2' + type_replacement: '$1$2' brand_replacement: 'ZTE' model_replacement: '$1$2' - regex: '; *(?:ZXY-ZTE_|ZTE\-U |ZTE[\- _]|ZTE-C[_ ])([^;/]+?)(?: Build|\) AppleWebKit)' - device_replacement: 'ZTE $1' + type_replacement: 'ZTE $1' brand_replacement: 'ZTE' model_replacement: '$1' # operator specific - regex: '; (BASE) (lutea|Lutea 2|Tab[^;]*?)(?: Build|\) AppleWebKit)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: 'ZTE' model_replacement: '$1 $2' - regex: '; (Avea inTouch 2|soft stone|tmn smart a7|Movistar[ _]Link)(?: Build|\) AppleWebKit)' regex_flag: 'i' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'ZTE' model_replacement: '$1' - regex: '; *(vp9plus)\)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'ZTE' model_replacement: '$1' @@ -3070,7 +3070,7 @@ device_parsers: # @ref: http://www.zync.in/index.php/our-products/tablet-phablets ########## - regex: '; ?(Cloud[ _]Z5|z1000|Z99 2G|z99|z930|z999|z990|z909|Z919|z900)(?: Build|\) AppleWebKit)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Zync' model_replacement: '$1' @@ -3081,63 +3081,63 @@ device_parsers: # @ref: http://amazonsilk.wordpress.com/useful-bits/silk-user-agent/ ########## - regex: '; ?(KFOT|Kindle Fire) Build\b' - device_replacement: 'Kindle Fire' + type_replacement: 'Kindle Fire' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire' - regex: '; ?(KFOTE|Amazon Kindle Fire2) Build\b' - device_replacement: 'Kindle Fire 2' + type_replacement: 'Kindle Fire 2' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire 2' - regex: '; ?(KFTT) Build\b' - device_replacement: 'Kindle Fire HD' + type_replacement: 'Kindle Fire HD' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire HD 7"' - regex: '; ?(KFJWI) Build\b' - device_replacement: 'Kindle Fire HD 8.9" WiFi' + type_replacement: 'Kindle Fire HD 8.9" WiFi' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire HD 8.9" WiFi' - regex: '; ?(KFJWA) Build\b' - device_replacement: 'Kindle Fire HD 8.9" 4G' + type_replacement: 'Kindle Fire HD 8.9" 4G' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire HD 8.9" 4G' - regex: '; ?(KFSOWI) Build\b' - device_replacement: 'Kindle Fire HD 7" WiFi' + type_replacement: 'Kindle Fire HD 7" WiFi' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire HD 7" WiFi' - regex: '; ?(KFTHWI) Build\b' - device_replacement: 'Kindle Fire HDX 7" WiFi' + type_replacement: 'Kindle Fire HDX 7" WiFi' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire HDX 7" WiFi' - regex: '; ?(KFTHWA) Build\b' - device_replacement: 'Kindle Fire HDX 7" 4G' + type_replacement: 'Kindle Fire HDX 7" 4G' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire HDX 7" 4G' - regex: '; ?(KFAPWI) Build\b' - device_replacement: 'Kindle Fire HDX 8.9" WiFi' + type_replacement: 'Kindle Fire HDX 8.9" WiFi' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire HDX 8.9" WiFi' - regex: '; ?(KFAPWA) Build\b' - device_replacement: 'Kindle Fire HDX 8.9" 4G' + type_replacement: 'Kindle Fire HDX 8.9" 4G' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire HDX 8.9" 4G' - regex: '; ?Amazon ([^;/]+) Build\b' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Amazon' model_replacement: '$1' - regex: '; ?(Kindle) Build\b' - device_replacement: 'Kindle' + type_replacement: 'Kindle' brand_replacement: 'Amazon' model_replacement: 'Kindle' - regex: '; ?(Silk)/(\d+)\.(\d+)(?:\.([0-9\-]+)|) Build\b' - device_replacement: 'Kindle Fire' + type_replacement: 'Kindle Fire' brand_replacement: 'Amazon' model_replacement: 'Kindle Fire$2' - regex: ' (Kindle)/(\d+\.\d+)' - device_replacement: 'Kindle' + type_replacement: 'Kindle' brand_replacement: 'Amazon' model_replacement: '$1 $2' - regex: ' (Silk|Kindle)/(\d+)\.' - device_replacement: 'Kindle' + type_replacement: 'Kindle' brand_replacement: 'Amazon' model_replacement: 'Kindle' @@ -3146,20 +3146,20 @@ device_parsers: # @note: identified by x-wap-profile http://218.249.47.94/Xianghe/.* ######### - regex: '(sprd)\-([^/]+)/' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' # @ref: http://eshinechina.en.alibaba.com/ - regex: '; *(H\d{2}00\+?) Build' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Hero' model_replacement: '$1' - regex: '; *(iphone|iPhone5) Build/' - device_replacement: 'Xianghe $1' + type_replacement: 'Xianghe $1' brand_replacement: 'Xianghe' model_replacement: '$1' - regex: '; *(e\d{4}[a-z]?_?v\d+|v89_[^;/]+)[^;/]+ Build/' - device_replacement: 'Xianghe $1' + type_replacement: 'Xianghe $1' brand_replacement: 'Xianghe' model_replacement: '$1' @@ -3169,7 +3169,7 @@ device_parsers: # @note: Operator branded devices ######### - regex: '\bUSCC[_\-]?([^ ;/\)]+)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Cellular' model_replacement: '$1' @@ -3181,7 +3181,7 @@ device_parsers: # Alcatel Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:ALCATEL)[^;]*; *([^;,\)]+)' - device_replacement: 'Alcatel $1' + type_replacement: 'Alcatel $1' brand_replacement: 'Alcatel' model_replacement: '$1' @@ -3190,7 +3190,7 @@ device_parsers: ######### #~ - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:ASUS|Asus)[^;]*; *([^;,\)]+)' - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:ASUS|Asus)[^;]*; *([^;,\)]+)' - device_replacement: 'Asus $1' + type_replacement: 'Asus $1' brand_replacement: 'Asus' model_replacement: '$1' @@ -3198,7 +3198,7 @@ device_parsers: # Dell Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:DELL|Dell)[^;]*; *([^;,\)]+)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: '$1' @@ -3206,7 +3206,7 @@ device_parsers: # HTC Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:HTC|Htc|HTC_blocked[^;]*)[^;]*; *(?:HTC|)([^;,\)]+)' - device_replacement: 'HTC $1' + type_replacement: 'HTC $1' brand_replacement: 'HTC' model_replacement: '$1' @@ -3214,7 +3214,7 @@ device_parsers: # Huawei Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:HUAWEI)[^;]*; *(?:HUAWEI |)([^;,\)]+)' - device_replacement: 'Huawei $1' + type_replacement: 'Huawei $1' brand_replacement: 'Huawei' model_replacement: '$1' @@ -3222,7 +3222,7 @@ device_parsers: # LG Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:LG|Lg)[^;]*; *(?:LG[ \-]|)([^;,\)]+)' - device_replacement: 'LG $1' + type_replacement: 'LG $1' brand_replacement: 'LG' model_replacement: '$1' @@ -3230,15 +3230,15 @@ device_parsers: # Noka Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:rv:11; |)(?:NOKIA|Nokia)[^;]*; *(?:NOKIA ?|Nokia ?|LUMIA ?|[Ll]umia ?|)(\d{3,10}[^;\)]*)' - device_replacement: 'Lumia $1' + type_replacement: 'Lumia $1' brand_replacement: 'Nokia' model_replacement: 'Lumia $1' - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:NOKIA|Nokia)[^;]*; *(RM-\d{3,})' - device_replacement: 'Nokia $1' + type_replacement: 'Nokia $1' brand_replacement: 'Nokia' model_replacement: '$1' - regex: '(?:Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)]|WPDesktop;) ?(?:ARM; ?Touch; ?|Touch; ?|)(?:NOKIA|Nokia)[^;]*; *(?:NOKIA ?|Nokia ?|LUMIA ?|[Ll]umia ?|)([^;\)]+)' - device_replacement: 'Nokia $1' + type_replacement: 'Nokia $1' brand_replacement: 'Nokia' model_replacement: '$1' @@ -3246,7 +3246,7 @@ device_parsers: # Microsoft Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|)(?:Microsoft(?: Corporation|))[^;]*; *([^;,\)]+)' - device_replacement: 'Microsoft $1' + type_replacement: 'Microsoft $1' brand_replacement: 'Microsoft' model_replacement: '$1' @@ -3254,7 +3254,7 @@ device_parsers: # Samsung Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:SAMSUNG)[^;]*; *(?:SAMSUNG |)([^;,\.\)]+)' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' @@ -3262,7 +3262,7 @@ device_parsers: # Toshiba Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)(?:TOSHIBA|FujitsuToshibaMobileCommun)[^;]*; *([^;,\)]+)' - device_replacement: 'Toshiba $1' + type_replacement: 'Toshiba $1' brand_replacement: 'Toshiba' model_replacement: '$1' @@ -3270,7 +3270,7 @@ device_parsers: # Generic Windows Phones ######### - regex: 'Windows Phone [^;]+; .*?IEMobile/[^;\)]+[;\)] ?(?:ARM; ?Touch; ?|Touch; ?|WpsLondonTest; ?|)([^;]+); *([^;,\)]+)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -3282,7 +3282,7 @@ device_parsers: # Samsung Bada Phones ######### - regex: '(?:^|; )SAMSUNG\-([A-Za-z0-9\-]+).* Bada/' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' @@ -3290,11 +3290,11 @@ device_parsers: # Firefox OS ######### - regex: '\(Mobile; ALCATEL ?(One|ONE) ?(Touch|TOUCH) ?([^;/]+?)(?:/[^;]+|); rv:[^\)]+\) Gecko/[^\/]+ Firefox/' - device_replacement: 'Alcatel $1 $2 $3' + type_replacement: 'Alcatel $1 $2 $3' brand_replacement: 'Alcatel' model_replacement: 'One Touch $3' - regex: '\(Mobile; (?:ZTE([^;]+)|(OpenC)); rv:[^\)]+\) Gecko/[^\/]+ Firefox/' - device_replacement: 'ZTE $1$2' + type_replacement: 'ZTE $1$2' brand_replacement: 'ZTE' model_replacement: '$1$2' @@ -3302,15 +3302,15 @@ device_parsers: # KaiOS ######### - regex: '\(Mobile; ALCATEL([A-Za-z0-9\-]+); rv:[^\)]+\) Gecko/[^\/]+ Firefox/[^\/]+ KaiOS/' - device_replacement: 'Alcatel $1' + type_replacement: 'Alcatel $1' brand_replacement: 'Alcatel' model_replacement: '$1' - regex: '\(Mobile; LYF\/([A-Za-z0-9\-]+)\/.+;.+rv:[^\)]+\) Gecko/[^\/]+ Firefox/[^\/]+ KAIOS/' - device_replacement: 'LYF $1' + type_replacement: 'LYF $1' brand_replacement: 'LYF' model_replacement: '$1' - regex: '\(Mobile; Nokia_([A-Za-z0-9\-]+)_.+; rv:[^\)]+\) Gecko/[^\/]+ Firefox/[^\/]+ KAIOS/' - device_replacement: 'Nokia $1' + type_replacement: 'Nokia $1' brand_replacement: 'Nokia' model_replacement: '$1' @@ -3319,25 +3319,25 @@ device_parsers: # @note: NokiaN8-00 comes before iphone. Sometimes spoofs iphone ########## - regex: 'Nokia(N[0-9]+)([A-Za-z_\-][A-Za-z0-9_\-]*)' - device_replacement: 'Nokia $1' + type_replacement: 'Nokia $1' brand_replacement: 'Nokia' model_replacement: '$1$2' - regex: '(?:NOKIA|Nokia)(?:\-| *)(?:([A-Za-z0-9]+)\-[0-9a-f]{32}|([A-Za-z0-9\-]+)(?:UCBrowser)|([A-Za-z0-9\-]+))' - device_replacement: 'Nokia $1$2$3' + type_replacement: 'Nokia $1$2$3' brand_replacement: 'Nokia' model_replacement: '$1$2$3' - regex: 'Lumia ([A-Za-z0-9\-]+)' - device_replacement: 'Lumia $1' + type_replacement: 'Lumia $1' brand_replacement: 'Nokia' model_replacement: 'Lumia $1' # UCWEB Browser on Symbian - regex: '\(Symbian; U; S60 V5; [A-z]{2}\-[A-z]{2}; (SonyEricsson|Samsung|Nokia|LG)([^;/]+?)\)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' # Nokia Symbian - regex: '\(Symbian(?:/3|); U; ([^;]+);' - device_replacement: 'Nokia $1' + type_replacement: 'Nokia $1' brand_replacement: 'Nokia' model_replacement: '$1' @@ -3346,23 +3346,23 @@ device_parsers: # @ref: http://www.useragentstring.com/pages/BlackBerry/ ########## - regex: 'BB10; ([A-Za-z0-9\- ]+)\)' - device_replacement: 'BlackBerry $1' + type_replacement: 'BlackBerry $1' brand_replacement: 'BlackBerry' model_replacement: '$1' - regex: 'Play[Bb]ook.+RIM Tablet OS' - device_replacement: 'BlackBerry Playbook' + type_replacement: 'BlackBerry Playbook' brand_replacement: 'BlackBerry' model_replacement: 'Playbook' - regex: 'Black[Bb]erry ([0-9]+);' - device_replacement: 'BlackBerry $1' + type_replacement: 'BlackBerry $1' brand_replacement: 'BlackBerry' model_replacement: '$1' - regex: 'Black[Bb]erry([0-9]+)' - device_replacement: 'BlackBerry $1' + type_replacement: 'BlackBerry $1' brand_replacement: 'BlackBerry' model_replacement: '$1' - regex: 'Black[Bb]erry;' - device_replacement: 'BlackBerry' + type_replacement: 'BlackBerry' brand_replacement: 'BlackBerry' ########## @@ -3370,31 +3370,31 @@ device_parsers: # @note: some palm devices must come before iphone. sometimes spoofs iphone in ua ########## - regex: '(Pre|Pixi)/\d+\.\d+' - device_replacement: 'Palm $1' + type_replacement: 'Palm $1' brand_replacement: 'Palm' model_replacement: '$1' - regex: 'Palm([0-9]+)' - device_replacement: 'Palm $1' + type_replacement: 'Palm $1' brand_replacement: 'Palm' model_replacement: '$1' - regex: 'Treo([A-Za-z0-9]+)' - device_replacement: 'Palm Treo $1' + type_replacement: 'Palm Treo $1' brand_replacement: 'Palm' model_replacement: 'Treo $1' - regex: 'webOS.*(P160U(?:NA|))/(\d+).(\d+)' - device_replacement: 'HP Veer' + type_replacement: 'HP Veer' brand_replacement: 'HP' model_replacement: 'Veer' - regex: '(Touch[Pp]ad)/\d+\.\d+' - device_replacement: 'HP TouchPad' + type_replacement: 'HP TouchPad' brand_replacement: 'HP' model_replacement: 'TouchPad' - regex: 'HPiPAQ([A-Za-z0-9]+)/\d+.\d+' - device_replacement: 'HP iPAQ $1' + type_replacement: 'HP iPAQ $1' brand_replacement: 'HP' model_replacement: 'iPAQ $1' - regex: 'PDA; (PalmOS)/sony/model ([a-z]+)/Revision' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Sony' model_replacement: '$1 $2' @@ -3404,7 +3404,7 @@ device_parsers: # Stack Overflow indicated iTunes-AppleTV/4.1 as a known UA for app available and I'm seeing it in live traffic ########## - regex: '(Apple\s?TV)' - device_replacement: 'AppleTV' + type_replacement: 'AppleTV' brand_replacement: 'Apple' model_replacement: 'AppleTV' @@ -3412,7 +3412,7 @@ device_parsers: # Tesla Model S ######### - regex: '(QtCarBrowser)' - device_replacement: 'Tesla Model S' + type_replacement: 'Tesla Model S' brand_replacement: 'Tesla' model_replacement: 'Model S' @@ -3424,52 +3424,52 @@ device_parsers: ########## # @note: on some ua the device can be identified e.g. iPhone5,1 - regex: '(iPhone|iPad|iPod)(\d+,\d+)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Apple' model_replacement: '$1$2' # @note: iPad needs to be before iPhone - regex: '(iPad)(?:;| Simulator;)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Apple' model_replacement: '$1' - regex: '(iPod)(?:;| touch;| Simulator;)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Apple' model_replacement: '$1' - regex: '(iPhone)(?:;| Simulator;)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Apple' model_replacement: '$1' - regex: '(Watch)(\d+,\d+)' - device_replacement: 'Apple $1' + type_replacement: 'Apple $1' brand_replacement: 'Apple' model_replacement: '$1$2' - regex: '(Apple Watch)(?:;| Simulator;)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Apple' model_replacement: '$1' - regex: '(HomePod)(?:;| Simulator;)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Apple' model_replacement: '$1' - regex: 'iPhone' - device_replacement: 'iPhone' + type_replacement: 'iPhone' brand_replacement: 'Apple' model_replacement: 'iPhone' # @note: desktop applications show device info - regex: 'CFNetwork/.* Darwin/\d.*\(((?:Mac|iMac|PowerMac|PowerBook)[^\d]*)(\d+)(?:,|%2C)(\d+)' - device_replacement: '$1$2,$3' + type_replacement: '$1$2,$3' brand_replacement: 'Apple' model_replacement: '$1$2,$3' # @note: newer desktop applications don't show device info # This is here so as to not have them recorded as iOS-Device - regex: 'CFNetwork/.* Darwin/\d+\.\d+\.\d+ \(x86_64\)' - device_replacement: 'Mac' + type_replacement: 'Mac' brand_replacement: 'Apple' model_replacement: 'Mac' # @note: iOS applications do not show device info - regex: 'CFNetwork/.* Darwin/\d' - device_replacement: 'iOS-Device' + type_replacement: 'iOS-Device' brand_replacement: 'Apple' model_replacement: 'iOS-Device' @@ -3478,14 +3478,14 @@ device_parsers: ########################## - regex: 'Outlook-(iOS)/\d+\.\d+\.prod\.iphone' brand_replacement: 'Apple' - device_replacement: 'iPhone' + type_replacement: 'iPhone' model_replacement: 'iPhone' ########## # Acer ########## - regex: 'acer_([A-Za-z0-9]+)_' - device_replacement: 'Acer $1' + type_replacement: 'Acer $1' brand_replacement: 'Acer' model_replacement: '$1' @@ -3493,7 +3493,7 @@ device_parsers: # Alcatel ########## - regex: '(?:ALCATEL|Alcatel)-([A-Za-z0-9\-]+)' - device_replacement: 'Alcatel $1' + type_replacement: 'Alcatel $1' brand_replacement: 'Alcatel' model_replacement: '$1' @@ -3501,7 +3501,7 @@ device_parsers: # Amoi ########## - regex: '(?:Amoi|AMOI)\-([A-Za-z0-9]+)' - device_replacement: 'Amoi $1' + type_replacement: 'Amoi $1' brand_replacement: 'Amoi' model_replacement: '$1' @@ -3509,15 +3509,15 @@ device_parsers: # Asus ########## - regex: '(?:; |\/|^)((?:Transformer (?:Pad|Prime) |Transformer |PadFone[ _]?)[A-Za-z0-9]*)' - device_replacement: 'Asus $1' + type_replacement: 'Asus $1' brand_replacement: 'Asus' model_replacement: '$1' - regex: '(?:asus.*?ASUS|Asus|ASUS|asus)[\- ;]*((?:Transformer (?:Pad|Prime) |Transformer |Padfone |Nexus[ _]|)[A-Za-z0-9]+)' - device_replacement: 'Asus $1' + type_replacement: 'Asus $1' brand_replacement: 'Asus' model_replacement: '$1' - regex: '(?:ASUS)_([A-Za-z0-9\-]+)' - device_replacement: 'Asus $1' + type_replacement: 'Asus $1' brand_replacement: 'Asus' model_replacement: '$1' @@ -3526,7 +3526,7 @@ device_parsers: # Bird ########## - regex: '\bBIRD[ \-\.]([A-Za-z0-9]+)' - device_replacement: 'Bird $1' + type_replacement: 'Bird $1' brand_replacement: 'Bird' model_replacement: '$1' @@ -3534,7 +3534,7 @@ device_parsers: # Dell ########## - regex: '\bDell ([A-Za-z0-9]+)' - device_replacement: 'Dell $1' + type_replacement: 'Dell $1' brand_replacement: 'Dell' model_replacement: '$1' @@ -3542,15 +3542,15 @@ device_parsers: # DoCoMo ########## - regex: 'DoCoMo/2\.0 ([A-Za-z0-9]+)' - device_replacement: 'DoCoMo $1' + type_replacement: 'DoCoMo $1' brand_replacement: 'DoCoMo' model_replacement: '$1' - regex: '([A-Za-z0-9]+)_W;FOMA' - device_replacement: 'DoCoMo $1' + type_replacement: 'DoCoMo $1' brand_replacement: 'DoCoMo' model_replacement: '$1' - regex: '([A-Za-z0-9]+);FOMA' - device_replacement: 'DoCoMo $1' + type_replacement: 'DoCoMo $1' brand_replacement: 'DoCoMo' model_replacement: '$1' @@ -3558,7 +3558,7 @@ device_parsers: # htc ########## - regex: '\b(?:HTC/|HTC/[a-z0-9]+/|)HTC[ _\-;]? *(.*?)(?:-?Mozilla|fingerPrint|[;/\(\)]|$)' - device_replacement: 'HTC $1' + type_replacement: 'HTC $1' brand_replacement: 'HTC' model_replacement: '$1' @@ -3566,19 +3566,19 @@ device_parsers: # Huawei ########## - regex: 'Huawei([A-Za-z0-9]+)' - device_replacement: 'Huawei $1' + type_replacement: 'Huawei $1' brand_replacement: 'Huawei' model_replacement: '$1' - regex: 'HUAWEI-([A-Za-z0-9]+)' - device_replacement: 'Huawei $1' + type_replacement: 'Huawei $1' brand_replacement: 'Huawei' model_replacement: '$1' - regex: 'HUAWEI ([A-Za-z0-9\-]+)' - device_replacement: 'Huawei $1' + type_replacement: 'Huawei $1' brand_replacement: 'Huawei' model_replacement: '$1' - regex: 'vodafone([A-Za-z0-9]+)' - device_replacement: 'Huawei Vodafone $1' + type_replacement: 'Huawei Vodafone $1' brand_replacement: 'Huawei' model_replacement: 'Vodafone $1' @@ -3586,7 +3586,7 @@ device_parsers: # i-mate ########## - regex: 'i\-mate ([A-Za-z0-9]+)' - device_replacement: 'i-mate $1' + type_replacement: 'i-mate $1' brand_replacement: 'i-mate' model_replacement: '$1' @@ -3594,11 +3594,11 @@ device_parsers: # kyocera ########## - regex: 'Kyocera\-([A-Za-z0-9]+)' - device_replacement: 'Kyocera $1' + type_replacement: 'Kyocera $1' brand_replacement: 'Kyocera' model_replacement: '$1' - regex: 'KWC\-([A-Za-z0-9]+)' - device_replacement: 'Kyocera $1' + type_replacement: 'Kyocera $1' brand_replacement: 'Kyocera' model_replacement: '$1' @@ -3606,7 +3606,7 @@ device_parsers: # lenovo ########## - regex: 'Lenovo[_\-]([A-Za-z0-9]+)' - device_replacement: 'Lenovo $1' + type_replacement: 'Lenovo $1' brand_replacement: 'Lenovo' model_replacement: '$1' @@ -3615,32 +3615,32 @@ device_parsers: # written before the LG regexes, as LG is making HbbTV too ########## - regex: '(HbbTV)/[0-9]+\.[0-9]+\.[0-9]+ \( ?;(LG)E ?;([^;]{0,30})' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: '$2' model_replacement: '$3' - regex: '(HbbTV)/1\.1\.1.*CE-HTML/1\.\d;(Vendor/|)(THOM[^;]*?)[;\s].{0,30}(LF[^;]+);?' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Thomson' model_replacement: '$4' - regex: '(HbbTV)(?:/1\.1\.1|) ?(?: \(;;;;;\)|); *CE-HTML(?:/1\.\d|); *([^ ]+) ([^;]+);' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: '$2' model_replacement: '$3' - regex: '(HbbTV)/1\.1\.1 \(;;;;;\) Maple_2011' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Samsung' - regex: '(HbbTV)/[0-9]+\.[0-9]+\.[0-9]+ \([^;]{0,30}; ?(?:CUS:([^;]*)|([^;]+)) ?; ?([^;]{0,30})' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: '$2$3' model_replacement: '$4' - regex: '(HbbTV)/[0-9]+\.[0-9]+\.[0-9]+' - device_replacement: '$1' + type_replacement: '$1' ########## # LGE NetCast TV ########## - regex: 'LGE; (?:Media\/|)([^;]*);[^;]*;[^;]*;?\); "?LG NetCast(\.TV|\.Media|)-\d+' - device_replacement: 'NetCast$2' + type_replacement: 'NetCast$2' brand_replacement: 'LG' model_replacement: '$1' @@ -3648,15 +3648,15 @@ device_parsers: # InettvBrowser ########## - regex: 'InettvBrowser/[0-9]+\.[0-9A-Z]+ \([^;]*;(Sony)([^;]*);[^;]*;[^\)]*\)' - device_replacement: 'Inettv' + type_replacement: 'Inettv' brand_replacement: '$1' model_replacement: '$2' - regex: 'InettvBrowser/[0-9]+\.[0-9A-Z]+ \([^;]*;([^;]*);[^;]*;[^\)]*\)' - device_replacement: 'Inettv' + type_replacement: 'Inettv' brand_replacement: 'Generic_Inettv' model_replacement: '$1' - regex: '(?:InettvBrowser|TSBNetTV|NETTV|HBBTV)' - device_replacement: 'Inettv' + type_replacement: 'Inettv' brand_replacement: 'Generic_Inettv' ########## @@ -3664,20 +3664,20 @@ device_parsers: ########## # LG Symbian Phones - regex: 'Series60/\d\.\d (LG)[\-]?([A-Za-z0-9 \-]+)' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' # other LG phones - regex: '\b(?:LGE[ \-]LG\-(?:AX|)|LGE |LGE?-LG|LGE?[ \-]|LG[ /\-]|lg[\-])([A-Za-z0-9]+)\b' - device_replacement: 'LG $1' + type_replacement: 'LG $1' brand_replacement: 'LG' model_replacement: '$1' - regex: '(?:^LG[\-]?|^LGE[\-/]?)([A-Za-z]+[0-9]+[A-Za-z]*)' - device_replacement: 'LG $1' + type_replacement: 'LG $1' brand_replacement: 'LG' model_replacement: '$1' - regex: '^LG([0-9]+[A-Za-z]*)' - device_replacement: 'LG $1' + type_replacement: 'LG $1' brand_replacement: 'LG' model_replacement: '$1' @@ -3685,15 +3685,15 @@ device_parsers: # microsoft ########## - regex: '(KIN\.[^ ]+) (\d+)\.(\d+)' - device_replacement: 'Microsoft $1' + type_replacement: 'Microsoft $1' brand_replacement: 'Microsoft' model_replacement: '$1' - regex: '(?:MSIE|XBMC).*\b(Xbox)\b' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Microsoft' model_replacement: '$1' - regex: '; ARM; Trident/6\.0; Touch[\);]' - device_replacement: 'Microsoft Surface RT' + type_replacement: 'Microsoft Surface RT' brand_replacement: 'Microsoft' model_replacement: 'Surface RT' @@ -3701,15 +3701,15 @@ device_parsers: # motorola ########## - regex: 'Motorola\-([A-Za-z0-9]+)' - device_replacement: 'Motorola $1' + type_replacement: 'Motorola $1' brand_replacement: 'Motorola' model_replacement: '$1' - regex: 'MOTO\-([A-Za-z0-9]+)' - device_replacement: 'Motorola $1' + type_replacement: 'Motorola $1' brand_replacement: 'Motorola' model_replacement: '$1' - regex: 'MOT\-([A-z0-9][A-z0-9\-]*)' - device_replacement: 'Motorola $1' + type_replacement: 'Motorola $1' brand_replacement: 'Motorola' model_replacement: '$1' @@ -3717,11 +3717,11 @@ device_parsers: # nintendo ########## - regex: 'Nintendo WiiU' - device_replacement: 'Nintendo Wii U' + type_replacement: 'Nintendo Wii U' brand_replacement: 'Nintendo' model_replacement: 'Wii U' - regex: 'Nintendo (DS|3DS|DSi|Wii);' - device_replacement: 'Nintendo $1' + type_replacement: 'Nintendo $1' brand_replacement: 'Nintendo' model_replacement: '$1' @@ -3729,7 +3729,7 @@ device_parsers: # pantech ########## - regex: '(?:Pantech|PANTECH)[ _-]?([A-Za-z0-9\-]+)' - device_replacement: 'Pantech $1' + type_replacement: 'Pantech $1' brand_replacement: 'Pantech' model_replacement: '$1' @@ -3737,11 +3737,11 @@ device_parsers: # philips ########## - regex: 'Philips([A-Za-z0-9]+)' - device_replacement: 'Philips $1' + type_replacement: 'Philips $1' brand_replacement: 'Philips' model_replacement: '$1' - regex: 'Philips ([A-Za-z0-9]+)' - device_replacement: 'Philips $1' + type_replacement: 'Philips $1' brand_replacement: 'Philips' model_replacement: '$1' @@ -3750,27 +3750,27 @@ device_parsers: ########## # Samsung Smart-TV - regex: '(SMART-TV); .* Tizen ' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' # Samsung Symbian Devices - regex: 'SymbianOS/9\.\d.* Samsung[/\-]([A-Za-z0-9 \-]+)' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' - regex: '(Samsung)(SGH)(i[0-9]+)' - device_replacement: '$1 $2$3' + type_replacement: '$1 $2$3' brand_replacement: '$1' model_replacement: '$2-$3' - regex: 'SAMSUNG-ANDROID-MMS/([^;/]+)' - device_replacement: '$1' + type_replacement: '$1' brand_replacement: 'Samsung' model_replacement: '$1' # Other Samsung #- regex: 'SAMSUNG(?:; |-)([A-Za-z0-9\-]+)' - regex: 'SAMSUNG(?:; |[ -/])([A-Za-z0-9\-]+)' regex_flag: 'i' - device_replacement: 'Samsung $1' + type_replacement: 'Samsung $1' brand_replacement: 'Samsung' model_replacement: '$1' @@ -3778,7 +3778,7 @@ device_parsers: # Sega ########## - regex: '(Dreamcast)' - device_replacement: 'Sega $1' + type_replacement: 'Sega $1' brand_replacement: 'Sega' model_replacement: '$1' @@ -3786,7 +3786,7 @@ device_parsers: # Siemens mobile ########## - regex: '^SIE-([A-Za-z0-9]+)' - device_replacement: 'Siemens $1' + type_replacement: 'Siemens $1' brand_replacement: 'Siemens' model_replacement: '$1' @@ -3794,7 +3794,7 @@ device_parsers: # Softbank ########## - regex: 'Softbank/[12]\.0/([A-Za-z0-9]+)' - device_replacement: 'Softbank $1' + type_replacement: 'Softbank $1' brand_replacement: 'Softbank' model_replacement: '$1' @@ -3802,7 +3802,7 @@ device_parsers: # SonyEricsson ########## - regex: 'SonyEricsson ?([A-Za-z0-9\-]+)' - device_replacement: 'Ericsson $1' + type_replacement: 'Ericsson $1' brand_replacement: 'SonyEricsson' model_replacement: '$1' @@ -3810,11 +3810,11 @@ device_parsers: # Sony ########## - regex: 'Android [^;]+; ([^ ]+) (Sony)/' - device_replacement: '$2 $1' + type_replacement: '$2 $1' brand_replacement: '$2' model_replacement: '$1' - regex: '(Sony)(?:BDP\/|\/|)([^ /;\)]+)[ /;\)]' - device_replacement: '$1 $2' + type_replacement: '$1 $2' brand_replacement: '$1' model_replacement: '$2' @@ -3824,19 +3824,19 @@ device_parsers: # AT=Android+Tablet ######### - regex: 'Puffin/[\d\.]+IT' - device_replacement: 'iPad' + type_replacement: 'iPad' brand_replacement: 'Apple' model_replacement: 'iPad' - regex: 'Puffin/[\d\.]+IP' - device_replacement: 'iPhone' + type_replacement: 'iPhone' brand_replacement: 'Apple' model_replacement: 'iPhone' - regex: 'Puffin/[\d\.]+AT' - device_replacement: 'Generic Tablet' + type_replacement: 'Generic Tablet' brand_replacement: 'Generic' model_replacement: 'Tablet' - regex: 'Puffin/[\d\.]+AP' - device_replacement: 'Generic Smartphone' + type_replacement: 'Generic Smartphone' brand_replacement: 'Generic' model_replacement: 'Smartphone' @@ -3857,7 +3857,7 @@ device_parsers: model_replacement: '$1' # No build info at all - "Build" follows locale immediately - regex: 'Android[\- ][\d]+(?:\.[\d]+)(?:\.[\d]+|); *[a-z]{0,2}[_\-]?[A-Za-z]{0,2};?( Build[/ ]|\))' - device_replacement: 'Generic Smartphone' + type_replacement: 'Generic Smartphone' brand_replacement: 'Generic' model_replacement: 'Smartphone' - regex: 'Android[\- ][\d]+(?:\.[\d]+)(?:\.[\d]+|); *\-?[A-Za-z]{2}; *(.+?)( Build[/ ]|\))' @@ -3896,7 +3896,7 @@ device_parsers: ########## - regex: '(Android 3\.\d|Opera Tablet|Tablet; .+Firefox/|Android.*(?:Tab|Pad))' regex_flag: 'i' - device_replacement: 'Generic Tablet' + type_replacement: 'Generic Tablet' brand_replacement: 'Generic' model_replacement: 'Tablet' @@ -3904,12 +3904,12 @@ device_parsers: # Generic Smart Phone ########## - regex: '(Symbian|\bS60(Version|V\d)|\bS60\b|\((Series 60|Windows Mobile|Palm OS|Bada); Opera Mini|Windows CE|Opera Mobi|BREW|Brew|Mobile; .+Firefox/|iPhone OS|Android|MobileSafari|Windows *Phone|\(webOS/|PalmOS)' - device_replacement: 'Generic Smartphone' + type_replacement: 'Generic Smartphone' brand_replacement: 'Generic' model_replacement: 'Smartphone' - regex: '(hiptop|avantgo|plucker|xiino|blazer|elaine)' regex_flag: 'i' - device_replacement: 'Generic Smartphone' + type_replacement: 'Generic Smartphone' brand_replacement: 'Generic' model_replacement: 'Smartphone' @@ -3918,7 +3918,7 @@ device_parsers: ########## - regex: '(bot|BUbiNG|zao|borg|DBot|oegp|silk|Xenu|zeal|^NING|CCBot|crawl|htdig|lycos|slurp|teoma|voila|yahoo|Sogou|CiBra|Nutch|^Java/|^JNLP/|Daumoa|Daum|Genieo|ichiro|larbin|pompos|Scrapy|snappy|speedy|spider|msnbot|msrbot|vortex|^vortex|crawler|favicon|indexer|Riddler|scooter|scraper|scrubby|WhatWeb|WinHTTP|bingbot|BingPreview|openbot|gigabot|furlbot|polybot|seekbot|^voyager|archiver|Icarus6j|mogimogi|Netvibes|blitzbot|altavista|charlotte|findlinks|Retreiver|TLSProber|WordPress|SeznamBot|ProoXiBot|wsr\-agent|Squrl Java|EtaoSpider|PaperLiBot|SputnikBot|A6\-Indexer|netresearch|searchsight|baiduspider|YisouSpider|ICC\-Crawler|http%20client|Python-urllib|dataparksearch|converacrawler|Screaming Frog|AppEngine-Google|YahooCacheSystem|fast\-webcrawler|Sogou Pic Spider|semanticdiscovery|Innovazion Crawler|facebookexternalhit|Google.*/\+/web/snippet|Google-HTTP-Java-Client|BlogBridge|IlTrovatore-Setaccio|InternetArchive|GomezAgent|WebThumbnail|heritrix|NewsGator|PagePeeker|Reaper|ZooShot|holmes|NL-Crawler|Pingdom|StatusCake|WhatsApp|masscan|Google Web Preview|Qwantify|Yeti|OgScrper)' regex_flag: 'i' - device_replacement: 'Spider' + type_replacement: 'Spider' brand_replacement: 'Spider' model_replacement: 'Desktop' @@ -3928,31 +3928,31 @@ device_parsers: ########## - regex: '^(1207|3gso|4thp|501i|502i|503i|504i|505i|506i|6310|6590|770s|802s|a wa|acer|acs\-|airn|alav|asus|attw|au\-m|aur |aus |abac|acoo|aiko|alco|alca|amoi|anex|anny|anyw|aptu|arch|argo|bmobile|bell|bird|bw\-n|bw\-u|beck|benq|bilb|blac|c55/|cdm\-|chtm|capi|comp|cond|dall|dbte|dc\-s|dica|ds\-d|ds12|dait|devi|dmob|doco|dopo|dorado|el(?:38|39|48|49|50|55|58|68)|el[3456]\d{2}dual|erk0|esl8|ex300|ez40|ez60|ez70|ezos|ezze|elai|emul|eric|ezwa|fake|fly\-|fly_|g\-mo|g1 u|g560|gf\-5|grun|gene|go.w|good|grad|hcit|hd\-m|hd\-p|hd\-t|hei\-|hp i|hpip|hs\-c|htc |htc\-|htca|htcg)' regex_flag: 'i' - device_replacement: 'Generic Feature Phone' + type_replacement: 'Generic Feature Phone' brand_replacement: 'Generic' model_replacement: 'Feature Phone' - regex: '^(htcp|htcs|htct|htc_|haie|hita|huaw|hutc|i\-20|i\-go|i\-ma|i\-mobile|i230|iac|iac\-|iac/|ig01|im1k|inno|iris|jata|kddi|kgt|kgt/|kpt |kwc\-|klon|lexi|lg g|lg\-a|lg\-b|lg\-c|lg\-d|lg\-f|lg\-g|lg\-k|lg\-l|lg\-m|lg\-o|lg\-p|lg\-s|lg\-t|lg\-u|lg\-w|lg/k|lg/l|lg/u|lg50|lg54|lge\-|lge/|leno|m1\-w|m3ga|m50/|maui|mc01|mc21|mcca|medi|meri|mio8|mioa|mo01|mo02|mode|modo|mot |mot\-|mt50|mtp1|mtv |mate|maxo|merc|mits|mobi|motv|mozz|n100|n101|n102|n202|n203|n300|n302|n500|n502|n505|n700|n701|n710|nec\-|nem\-|newg|neon)' regex_flag: 'i' - device_replacement: 'Generic Feature Phone' + type_replacement: 'Generic Feature Phone' brand_replacement: 'Generic' model_replacement: 'Feature Phone' - regex: '^(netf|noki|nzph|o2 x|o2\-x|opwv|owg1|opti|oran|ot\-s|p800|pand|pg\-1|pg\-2|pg\-3|pg\-6|pg\-8|pg\-c|pg13|phil|pn\-2|pt\-g|palm|pana|pire|pock|pose|psio|qa\-a|qc\-2|qc\-3|qc\-5|qc\-7|qc07|qc12|qc21|qc32|qc60|qci\-|qwap|qtek|r380|r600|raks|rim9|rove|s55/|sage|sams|sc01|sch\-|scp\-|sdk/|se47|sec\-|sec0|sec1|semc|sgh\-|shar|sie\-|sk\-0|sl45|slid|smb3|smt5|sp01|sph\-|spv |spv\-|sy01|samm|sany|sava|scoo|send|siem|smar|smit|soft|sony|t\-mo|t218|t250|t600|t610|t618|tcl\-|tdg\-|telm|tim\-|ts70|tsm\-|tsm3|tsm5|tx\-9|tagt)' regex_flag: 'i' - device_replacement: 'Generic Feature Phone' + type_replacement: 'Generic Feature Phone' brand_replacement: 'Generic' model_replacement: 'Feature Phone' - regex: '^(talk|teli|topl|tosh|up.b|upg1|utst|v400|v750|veri|vk\-v|vk40|vk50|vk52|vk53|vm40|vx98|virg|vertu|vite|voda|vulc|w3c |w3c\-|wapj|wapp|wapu|wapm|wig |wapi|wapr|wapv|wapy|wapa|waps|wapt|winc|winw|wonu|x700|xda2|xdag|yas\-|your|zte\-|zeto|aste|audi|avan|blaz|brew|brvw|bumb|ccwa|cell|cldc|cmd\-|dang|eml2|fetc|hipt|http|ibro|idea|ikom|ipaq|jbro|jemu|jigs|keji|kyoc|kyok|libw|m\-cr|midp|mmef|moto|mwbp|mywa|newt|nok6|o2im|pant|pdxg|play|pluc|port|prox|rozo|sama|seri|smal|symb|treo|upsi|vx52|vx53|vx60|vx61|vx70|vx80|vx81|vx83|vx85|wap\-|webc|whit|wmlb|xda\-|xda_)' regex_flag: 'i' - device_replacement: 'Generic Feature Phone' + type_replacement: 'Generic Feature Phone' brand_replacement: 'Generic' model_replacement: 'Feature Phone' - regex: '^(Ice)$' - device_replacement: 'Generic Feature Phone' + type_replacement: 'Generic Feature Phone' brand_replacement: 'Generic' model_replacement: 'Feature Phone' - regex: '(wap[\-\ ]browser|maui|netfront|obigo|teleca|up\.browser|midp|Opera Mini)' regex_flag: 'i' - device_replacement: 'Generic Feature Phone' + type_replacement: 'Generic Feature Phone' brand_replacement: 'Generic' model_replacement: 'Feature Phone' @@ -3963,6 +3963,6 @@ device_parsers: # @note: put this at the end, since it is hard to implement contains foo, but not contain bar1, bar 2, bar 3 in go's re2 ######### - regex: 'Mac OS' - device_replacement: 'Mac' + type_replacement: 'Mac' brand_replacement: 'Apple' model_replacement: 'Mac' diff --git a/src/test/java/com/mesalab/ua/ClientTest.java b/src/test/java/com/mesalab/ua/ClientTest.java index 38d38d3..e7bea88 100644 --- a/src/test/java/com/mesalab/ua/ClientTest.java +++ b/src/test/java/com/mesalab/ua/ClientTest.java @@ -16,6 +16,8 @@ package com.mesalab.ua; +import com.mesalab.ua.dto.Client; + /** * @author Steve Jiang (@sjiang) <gh at iamsteve com> */ diff --git a/src/test/java/com/mesalab/ua/DeviceTest.java b/src/test/java/com/mesalab/ua/DeviceTest.java index cbef837..960ab0e 100644 --- a/src/test/java/com/mesalab/ua/DeviceTest.java +++ b/src/test/java/com/mesalab/ua/DeviceTest.java @@ -16,6 +16,8 @@ package com.mesalab.ua; +import com.mesalab.ua.dto.Device; + /** * @author Steve Jiang (@sjiang) <gh at iamsteve com> */ diff --git a/src/test/java/com/mesalab/ua/OSTest.java b/src/test/java/com/mesalab/ua/OSTest.java index 45edf83..8113b2a 100644 --- a/src/test/java/com/mesalab/ua/OSTest.java +++ b/src/test/java/com/mesalab/ua/OSTest.java @@ -16,6 +16,8 @@ package com.mesalab.ua; +import com.mesalab.ua.dto.OS; + /** * @author Steve Jiang (@sjiang) <gh at iamsteve com> */ diff --git a/src/test/java/com/mesalab/ua/ParserTest.java b/src/test/java/com/mesalab/ua/ParserTest.java index dfc4f48..508b935 100644 --- a/src/test/java/com/mesalab/ua/ParserTest.java +++ b/src/test/java/com/mesalab/ua/ParserTest.java @@ -24,14 +24,13 @@ import java.io.InputStream; import java.util.List; import java.util.Map; -import com.mesalab.ua.Client; +import com.mesalab.ua.dto.Client; +import com.mesalab.ua.dto.Device; +import com.mesalab.ua.dto.OS; +import com.mesalab.ua.dto.UserAgent; import org.junit.Before; import org.junit.Test; import org.yaml.snakeyaml.Yaml; -import com.mesalab.ua.UserAgent; -import com.mesalab.ua.Device; -import com.mesalab.ua.OS; -import com.mesalab.ua.Parser; /** * Tests parsing results match the expected results in the test_resources yamls diff --git a/src/test/java/com/mesalab/ua/Test.java b/src/test/java/com/mesalab/ua/Test.java index 3a86001..fcd7ee4 100644 --- a/src/test/java/com/mesalab/ua/Test.java +++ b/src/test/java/com/mesalab/ua/Test.java @@ -5,8 +5,7 @@ import com.alibaba.fastjson.JSONObject; import org.springframework.http.HttpEntity; import org.springframework.util.LinkedMultiValueMap; import org.springframework.web.client.RestTemplate; -import com.mesalab.ua.UserAgent; -import com.mesalab.ua.Parser; +import com.mesalab.ua.dto.UserAgent; import java.io.*; import java.util.*; diff --git a/src/test/java/com/mesalab/ua/UaTest.java b/src/test/java/com/mesalab/ua/UaTest.java index b6632a2..5a96480 100644 --- a/src/test/java/com/mesalab/ua/UaTest.java +++ b/src/test/java/com/mesalab/ua/UaTest.java @@ -1,7 +1,6 @@ package com.mesalab.ua; -import com.mesalab.ua.UserAgent; -import com.mesalab.ua.Parser; +import com.mesalab.ua.dto.UserAgent; import java.io.IOException; |