From 88097db25da9f5828372f52b5c2c8769b6612475 Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Sun, 3 Nov 2019 12:39:42 -0800
Subject: [PATCH 1/2] Bump version.

---
 CHANGELOG.md | 6 ++++++
 plugin.json  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9316702d0..029b0fced 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## Changelog
 
+# 1.0.3
+
+* Allow account ID to be specified explicitly since it can differ from the number in the UA-... property ID.
+* Print debug message when account ID is deduced from property ID in CLI command.
+* Use exponentially increasing wait time between rate limited requests when querying GA API.
+
 # 1.0.2
 
 * Add import date to error message when import fails.
diff --git a/plugin.json b/plugin.json
index 898fef63a..53042732c 100644
--- a/plugin.json
+++ b/plugin.json
@@ -1,7 +1,7 @@
 {
     "name": "GoogleAnalyticsImporter",
     "description": "Import reports from a Google Analytics account into Matomo.",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "theme": false,
     "require": {
         "piwik": ">=3.12.0-b1,<4.0.0-b1"

From d7f7ef6df502792aaf1962ff19c20fccdf2fa607 Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Sun, 3 Nov 2019 12:39:52 -0800
Subject: [PATCH 2/2] Update some test files.

---
 .../expected/test___Referrers.get_day.xml     | 19 +++++++++++++++++++
 .../expected/test___Referrers.get_month.xml   | 19 +++++++++++++++++++
 .../expected/test___Referrers.get_week.xml    | 19 +++++++++++++++++++
 .../expected/test___Referrers.get_year.xml    | 19 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 tests/System/expected/test___Referrers.get_day.xml
 create mode 100644 tests/System/expected/test___Referrers.get_month.xml
 create mode 100644 tests/System/expected/test___Referrers.get_week.xml
 create mode 100644 tests/System/expected/test___Referrers.get_year.xml

diff --git a/tests/System/expected/test___Referrers.get_day.xml b/tests/System/expected/test___Referrers.get_day.xml
new file mode 100644
index 000000000..7efe62d25
--- /dev/null
+++ b/tests/System/expected/test___Referrers.get_day.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<Referrers_visitorsFromSearchEngines>11</Referrers_visitorsFromSearchEngines>
+	<Referrers_visitorsFromSocialNetworks>64</Referrers_visitorsFromSocialNetworks>
+	<Referrers_visitorsFromDirectEntry>20</Referrers_visitorsFromDirectEntry>
+	<Referrers_visitorsFromWebsites>101</Referrers_visitorsFromWebsites>
+	<Referrers_visitorsFromCampaigns>0</Referrers_visitorsFromCampaigns>
+	<Referrers_distinctSearchEngines>1</Referrers_distinctSearchEngines>
+	<Referrers_distinctSocialNetworks>3</Referrers_distinctSocialNetworks>
+	<Referrers_distinctKeywords>1</Referrers_distinctKeywords>
+	<Referrers_distinctWebsites>6</Referrers_distinctWebsites>
+	<Referrers_distinctWebsitesUrls>0</Referrers_distinctWebsitesUrls>
+	<Referrers_distinctCampaigns>0</Referrers_distinctCampaigns>
+	<Referrers_visitorsFromDirectEntry_percent>10%</Referrers_visitorsFromDirectEntry_percent>
+	<Referrers_visitorsFromSearchEngines_percent>6%</Referrers_visitorsFromSearchEngines_percent>
+	<Referrers_visitorsFromCampaigns_percent>0%</Referrers_visitorsFromCampaigns_percent>
+	<Referrers_visitorsFromSocialNetworks_percent>33%</Referrers_visitorsFromSocialNetworks_percent>
+	<Referrers_visitorsFromWebsites_percent>52%</Referrers_visitorsFromWebsites_percent>
+</result>
\ No newline at end of file
diff --git a/tests/System/expected/test___Referrers.get_month.xml b/tests/System/expected/test___Referrers.get_month.xml
new file mode 100644
index 000000000..2e4981959
--- /dev/null
+++ b/tests/System/expected/test___Referrers.get_month.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<Referrers_visitorsFromSearchEngines>28</Referrers_visitorsFromSearchEngines>
+	<Referrers_visitorsFromSocialNetworks>180</Referrers_visitorsFromSocialNetworks>
+	<Referrers_visitorsFromDirectEntry>35</Referrers_visitorsFromDirectEntry>
+	<Referrers_visitorsFromWebsites>205</Referrers_visitorsFromWebsites>
+	<Referrers_visitorsFromCampaigns>0</Referrers_visitorsFromCampaigns>
+	<Referrers_distinctSearchEngines>1</Referrers_distinctSearchEngines>
+	<Referrers_distinctSocialNetworks>3</Referrers_distinctSocialNetworks>
+	<Referrers_distinctKeywords>1</Referrers_distinctKeywords>
+	<Referrers_distinctWebsites>8</Referrers_distinctWebsites>
+	<Referrers_distinctWebsitesUrls>13</Referrers_distinctWebsitesUrls>
+	<Referrers_distinctCampaigns>0</Referrers_distinctCampaigns>
+	<Referrers_visitorsFromDirectEntry_percent>8%</Referrers_visitorsFromDirectEntry_percent>
+	<Referrers_visitorsFromSearchEngines_percent>6%</Referrers_visitorsFromSearchEngines_percent>
+	<Referrers_visitorsFromCampaigns_percent>0%</Referrers_visitorsFromCampaigns_percent>
+	<Referrers_visitorsFromSocialNetworks_percent>40%</Referrers_visitorsFromSocialNetworks_percent>
+	<Referrers_visitorsFromWebsites_percent>46%</Referrers_visitorsFromWebsites_percent>
+</result>
\ No newline at end of file
diff --git a/tests/System/expected/test___Referrers.get_week.xml b/tests/System/expected/test___Referrers.get_week.xml
new file mode 100644
index 000000000..2e4981959
--- /dev/null
+++ b/tests/System/expected/test___Referrers.get_week.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<Referrers_visitorsFromSearchEngines>28</Referrers_visitorsFromSearchEngines>
+	<Referrers_visitorsFromSocialNetworks>180</Referrers_visitorsFromSocialNetworks>
+	<Referrers_visitorsFromDirectEntry>35</Referrers_visitorsFromDirectEntry>
+	<Referrers_visitorsFromWebsites>205</Referrers_visitorsFromWebsites>
+	<Referrers_visitorsFromCampaigns>0</Referrers_visitorsFromCampaigns>
+	<Referrers_distinctSearchEngines>1</Referrers_distinctSearchEngines>
+	<Referrers_distinctSocialNetworks>3</Referrers_distinctSocialNetworks>
+	<Referrers_distinctKeywords>1</Referrers_distinctKeywords>
+	<Referrers_distinctWebsites>8</Referrers_distinctWebsites>
+	<Referrers_distinctWebsitesUrls>13</Referrers_distinctWebsitesUrls>
+	<Referrers_distinctCampaigns>0</Referrers_distinctCampaigns>
+	<Referrers_visitorsFromDirectEntry_percent>8%</Referrers_visitorsFromDirectEntry_percent>
+	<Referrers_visitorsFromSearchEngines_percent>6%</Referrers_visitorsFromSearchEngines_percent>
+	<Referrers_visitorsFromCampaigns_percent>0%</Referrers_visitorsFromCampaigns_percent>
+	<Referrers_visitorsFromSocialNetworks_percent>40%</Referrers_visitorsFromSocialNetworks_percent>
+	<Referrers_visitorsFromWebsites_percent>46%</Referrers_visitorsFromWebsites_percent>
+</result>
\ No newline at end of file
diff --git a/tests/System/expected/test___Referrers.get_year.xml b/tests/System/expected/test___Referrers.get_year.xml
new file mode 100644
index 000000000..3d02fa065
--- /dev/null
+++ b/tests/System/expected/test___Referrers.get_year.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<Referrers_visitorsFromSearchEngines>44</Referrers_visitorsFromSearchEngines>
+	<Referrers_visitorsFromSocialNetworks>242</Referrers_visitorsFromSocialNetworks>
+	<Referrers_visitorsFromDirectEntry>52</Referrers_visitorsFromDirectEntry>
+	<Referrers_visitorsFromWebsites>370</Referrers_visitorsFromWebsites>
+	<Referrers_visitorsFromCampaigns>0</Referrers_visitorsFromCampaigns>
+	<Referrers_distinctSearchEngines>1</Referrers_distinctSearchEngines>
+	<Referrers_distinctSocialNetworks>3</Referrers_distinctSocialNetworks>
+	<Referrers_distinctKeywords>1</Referrers_distinctKeywords>
+	<Referrers_distinctWebsites>8</Referrers_distinctWebsites>
+	<Referrers_distinctWebsitesUrls>13</Referrers_distinctWebsitesUrls>
+	<Referrers_distinctCampaigns>0</Referrers_distinctCampaigns>
+	<Referrers_visitorsFromDirectEntry_percent>7%</Referrers_visitorsFromDirectEntry_percent>
+	<Referrers_visitorsFromSearchEngines_percent>6%</Referrers_visitorsFromSearchEngines_percent>
+	<Referrers_visitorsFromCampaigns_percent>0%</Referrers_visitorsFromCampaigns_percent>
+	<Referrers_visitorsFromSocialNetworks_percent>34%</Referrers_visitorsFromSocialNetworks_percent>
+	<Referrers_visitorsFromWebsites_percent>52%</Referrers_visitorsFromWebsites_percent>
+</result>
\ No newline at end of file