From c9b4f2f2a059af8bc0dcf7909c7677c1cac258e3 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 15 Nov 2021 20:41:49 +0100
Subject: [PATCH] browser: merge deprecated agents on newer target

Originally inverted to keep deprecated names, but after this long Edge
should be more familiar than IE.  Special case and_chr to keep shorter
"And." though.
---
 tools/mkcaniuse           | 19 +++++++++++--------
 tools/mkusage-squid       |  6 +++---
 tools/mkusage-statcounter |  8 ++++----
 tools/mkusage-wikimedia   | 14 +++++++-------
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/tools/mkcaniuse b/tools/mkcaniuse
index adb437c..8378d2f 100755
--- a/tools/mkcaniuse
+++ b/tools/mkcaniuse
@@ -29,16 +29,19 @@ delete $data->{eras};
 for (values %{ $data->{data} }) {
 	delete @{$_}{qw[ usage_perc_a usage_perc_y ]};
 }
-while (my ($browser, $target) = each %BROWSERJOIN) {
-	my $agent1 = delete $data->{agents}->{$browser} or next;
-	my $agent2 =        $data->{agents}->{$target}  or next;
-	push @{ $agent2->{version_list} }, @{ $agent1->{version_list} };
-	$agent2->{browser} = sprintf '%s (former %s)',
-		$agent1->{browser}, $agent2->{browser};
+while (my ($browser, $alias) = each %BROWSERJOIN) {
+	my $agent =        $data->{agents}->{$browser} or next;
+	my $amend = delete $data->{agents}->{$alias}   or next;
+	unshift @{ $agent->{version_list} }, @{ $amend->{version_list} };
+	$agent->{browser} = sprintf '%s (former %s)',
+		$agent->{browser}, $amend->{browser};
+
+	# prefer deprecated name if newer is convoluted (Chr/And.)
+	$agent->{abbr} = $amend->{abbr} if $agent->{abbr} =~ m{/};
 
 	for (values %{ $data->{data} }) {
-		my $stats = delete $_->{stats}->{$browser} or next;
-		$_ = { %{$_}, %{$stats} } for $_->{stats}->{$target};
+		my $stats = delete $_->{stats}->{$alias} or next;
+		$_ = { %{$_}, %{$stats} } for $_->{stats}->{$browser};
 	}
 }
 
diff --git a/tools/mkusage-squid b/tools/mkusage-squid
index c751f76..a43c573 100755
--- a/tools/mkusage-squid
+++ b/tools/mkusage-squid
@@ -60,7 +60,7 @@ given ($browser) {
 		continue;
 	}
 	when ('MSIE') {
-		$browser = $mobile ? 'ie_mob' : 'ie';
+		$browser = $mobile ? 'ie_mob' : 'edge';
 		continue;
 	}
 	when ('Opera') {
@@ -79,11 +79,11 @@ given ($browser) {
 		$browser = $mobile ? 'ios_saf' : 'safari';
 	}
 	when ('Chrome') {
-		$browser = $mobile ? 'android' : 'chrome';
+		$browser = $mobile ? 'and_chr' : 'chrome';
 		s/\.\d+$// for $version;
 	}
 	when ('Android') {
-		$browser = 'android';
+		$browser = 'and_chr';
 	}
 	when ('BlackBerry') {
 		$browser = 'bb';
diff --git a/tools/mkusage-statcounter b/tools/mkusage-statcounter
index d728cae..0548fc9 100755
--- a/tools/mkusage-statcounter
+++ b/tools/mkusage-statcounter
@@ -8,8 +8,8 @@ use Text::CSV;
 our $VERSION = '1.01';
 
 my %BROWSERID = qw(
-	IE          ie
-	Edge        ie
+	IE          edge
+	Edge        edge
 	Firefox     firefox
 	Safari      safari
 	Safari-iPad ios_saf
@@ -24,8 +24,8 @@ my %BROWSERID = qw(
 	BlackBerry  bb
 
 	IEMobile    ie_mob
-	Android     android
-	Chrome-for-Android android
+	Android     and_chr
+	Chrome-for-Android and_chr
 	UC-Browser  and_uc
 	QQ-Browser  and_qq
 	iPhone      ios_saf
diff --git a/tools/mkusage-wikimedia b/tools/mkusage-wikimedia
index 4470c50..88b7cef 100755
--- a/tools/mkusage-wikimedia
+++ b/tools/mkusage-wikimedia
@@ -4,13 +4,13 @@ use warnings;
 
 use Data::Dump 'pp';
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 my %BROWSERID = qw(
-	IE                      ie
+	IE                      edge
 	IE-Mobile               ie_mob
-	Edge                    ie
-	Edge-Mobile             ie
+	Edge                    edge
+	Edge-Mobile             edge
 	Firefox                 firefox
 	Firefox-Mobile          and_ff
 	Safari                  safari
@@ -18,9 +18,9 @@ my %BROWSERID = qw(
 	Mobile-Safari-UIWebView ios_saf
 	Chrome                  chrome
 	Chromium                chrome
-	Chrome-Mobile           android
-	Chrome-Mobile-iOS       android
-	Android                 android
+	Chrome-Mobile           and_chr
+	Chrome-Mobile-iOS       and_chr
+	Android                 and_chr
 	Opera                   opera
 	Opera-Mini              op_mini
 	BlackBerry-WebKit       bb
-- 
2.30.0