Skip to content

Commit

Permalink
Couple more tweaks and a version bump.
Browse files Browse the repository at this point in the history
  • Loading branch information
diosmosis committed Dec 18, 2019
1 parent c5757cc commit d43a35e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
## Changelog

# 1.1.3

Features:
* Resume button to make it clearer that on an errored import the import doesn't have to be cancelled and restarted.
* Add feature to change import end date dynamically so users don't have to restart if they enter the wrong end date (or don't enter one).
* Support new VisitFrequency metrics in core if available.

Bug fixes:
* Tweaks to messages for clarity.
* Goals record importer was not applying new/returning segments.
* GA does not trim page titles, so ignore on error and hope users report issues.

# 1.1.2

Bug fixes:
Expand Down
6 changes: 2 additions & 4 deletions Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,8 @@ public function resumeImport()
/** @var ImportStatus $importStatus */
$importStatus = StaticContainer::get(ImportStatus::class);
$status = $importStatus->getImportStatus($idSite);
if ($status['status'] == ImportStatus::STATUS_FINISHED
|| $status['status'] == ImportStatus::STATUS_ONGOING
) {
throw new \Exception("This import cannot be resumed since it is either finished or currently ongoing.");
if ($status['status'] == ImportStatus::STATUS_FINISHED) {
throw new \Exception("This import cannot be resumed since it is finished.");
}

$importStatus->resumeImport($idSite);
Expand Down
3 changes: 2 additions & 1 deletion Importer.php
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@ public function import($idSite, $viewId, Date $start, Date $end, Lock $lock, $se
}

if (!empty($status['import_range_end'])
&& $end->toString() == $status['import_range_end']
&& ($end->toString() == $status['import_range_end']
|| $end->isLater(Date::factory($status['import_range_end'])))
) {
$this->importStatus->finishedImport($idSite);
}
Expand Down
2 changes: 1 addition & 1 deletion plugin.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "GoogleAnalyticsImporter",
"description": "Import reports from a Google Analytics account into Matomo.",
"version": "1.1.2",
"version": "1.1.3",
"theme": false,
"require": {
"piwik": ">=3.12.0-b1,<4.0.0-b1"
Expand Down

0 comments on commit d43a35e

Please sign in to comment.