Improves detection for Apple devices and iOS, iPadOS #7744
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@sanchezzzhak can you double check the names please? https://gist.github.com/adamawolf/3048717, theapplewiki, everymac report different names. Thanks! |
|
script compare <?php
use DeviceDetector\DeviceDetector;
use DeviceDetector\Parser\AbstractParser;
include __DIR__ . '/../vendor/autoload.php';
AbstractParser::setVersionTruncation(AbstractParser::VERSION_TRUNCATION_NONE);
$fixtureFiles = array_merge(
glob(__DIR__ . '/../Tests/fixtures/*.yml'),
glob(__DIR__ . '/../Tests/Parser/Client/fixtures/*.yml'),
glob(__DIR__ . '/../Tests/Parser/Device/fixtures/*.yml')
);
$compareListUrl = 'https://raw.githubusercontent.com/fieldnotescommunities/ios-device-identifiers/master/ios-device-identifiers.json';
$compareList = json_decode(file_get_contents($compareListUrl), true);
$regexes = [
# Iphone for x-ucbrowser-ua
[
'regex' => 'dv\(iPh([^)]+)\);pr\(UCBrowser/',
'name' => 'iPhone$1',
],
# iPhone/iPad/iPod/Watch code devices
[
'regex' => '[\(, ](iP(?:hone|[ao]d)|Watch)(\d{1,2}),(\d{1,2})[;\]]',
'name' => '$1$2,$3',
],
// # MS Office Apple
[
'regex' => '(?:Non)?AppStore; Apple/(.*?)\)',
'name' => '$1$2,$3',
],
];
function buildByMatch(string $item, array $matches): string
{
$search = [];
$replace = [];
for ($nb = 1; $nb <= \count($matches); $nb++) {
$search[] = '$' . $nb;
$replace[] = $matches[$nb] ?? '';
}
return \trim(\str_replace($search, $replace, $item));
}
$matomoList = [];
foreach ($fixtureFiles as $file) {
foreach (Spyc::YAMLLoad(file_get_contents($file)) as $i => $fixture) {
$useragent = $fixture['user_agent'];
$brand = $fixture['device']['brand'] ?? '';
$model = $fixture['device']['model'] ?? '';
$isApple = $brand === 'Apple';
$result = null;
if ($isApple) {
$code = null;
foreach ($regexes as $regex){
if (preg_match("#{$regex['regex']}#i", $useragent, $matches)) {
$code = buildByMatch($regex['name'], $matches);
$matomoList[strtolower($code)] = $model;
break;
}
}
}
}
}
$std = fopen("php://output", 'r+');
fputcsv($std, ['Code', 'Compare Name', 'Matomo Name'], ',', '"');
foreach ($compareList as $compareCode => $compareName) {
$code = strtolower($compareCode);
$matomoName = $matomoList[$code] ?? '';
$deviceDetector = new DeviceDetector(' ' . $compareCode);
$deviceDetector->parse();
if ($matomoName !== '') {
unset($matomoList[$code]);
}
$data = [
$code, $compareName, $matomoName, $deviceDetector->getModel()
];
fputcsv($std, $data);
}
fwrite($std, PHP_EOL);
fwrite($std, PHP_EOL);
if (count($matomoList) > 0) {
foreach ($matomoList as $compareCode => $compareName) {
$code = strtolower($compareCode);
}
$data = [
$code, '', $matomoName, '',
];
fputcsv($std, $data);
}result
|
|
Thanks for the script! I've added 4 missing models. Also, you should update it, because the original is fetched from https://gist.github.com/adamawolf/3048717/ |
sanchezzzhak
approved these changes
Jul 19, 2024
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.