diff --git a/CHANGELOG.md b/CHANGELOG.md index f47a410ab..4991b6cc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: diff --git a/Controller.php b/Controller.php index acac251b7..c27c3e825 100644 --- a/Controller.php +++ b/Controller.php @@ -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); diff --git a/Importer.php b/Importer.php index ee8e5d10e..f686ebb67 100644 --- a/Importer.php +++ b/Importer.php @@ -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); } diff --git a/plugin.json b/plugin.json index 398d08bf2..31cd8265e 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.1.2", + "version": "1.1.3", "theme": false, "require": { "piwik": ">=3.12.0-b1,<4.0.0-b1"