scrutinizer

Rello · Jan 11, 2020 · 41a3e81 · 41a3e81
1 parent 724ea13
commit 41a3e81
Show file tree

Hide file tree

Showing 42 changed files with 96 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,12 @@ All notable changes to this project will be documented in this file.
 ## 1.3.0 - 2020-01-1x
 ### Added
 - NC 18 Flow integration #10 [#10](https://github.com/rello/analytics/issues/10)
-- Thresholds for all datasource types (notifications just for database)
 - Enhanced dataloads with scheduling [#13](https://github.com/rello/analytics/issues/13)
 - Advanced configuration page for more options than sidebar [#12](https://github.com/rello/analytics/issues/12)
-- new Datasource: Regex grabber for external html [#14](https://github.com/rello/analytics/issues/14)
+- new datasource: website grabber [#14](https://github.com/rello/analytics/issues/14)
+- Thresholds for all datasource types (notifications just for database)
 - Compatibility dark mode [#11](https://github.com/rello/analytics/issues/11)
+- [Wiki](https://github.com/Rello/analytics/wiki)
 
 ### Changed
 - link report in activity message

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ From data to report. This on premise data warehouse solution provides modular da
 
 ## Features
 - Datasources: local/remote file, API, imports, manual entry
-- 3rd party*: GitHub Statistics, Regex grabber
+- 3rd party*: GitHub Statistics, website grabber
 - Storage: stream or database
 - Advanced dataloads with scheduling
 - Visualization: charts, tables

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -8,7 +8,7 @@ From data to report. This on premise data warehouse solution provides modular da
 
 ## Features:
 - Datasources: local/remote file, API, imports, manual entry
-- 3rd party*: GitHub Statistics, Regex grabber
+- 3rd party*: GitHub Statistics, website grabber
 - Storage: stream or database
 - Advanced dataloads with scheduling
 - Visualization: charts, tables
@@ -19,10 +19,14 @@ From data to report. This on premise data warehouse solution provides modular da
 (*work in progress)
 ]]></description>
  <version>1.2.11</version>
- <licence>agpl</licence>
- <author>Marcel Scherello</author>
- <namespace>Analytics</namespace>
+ <licence>agpl</licence>
+ <author>Marcel Scherello</author>
+ <namespace>Analytics</namespace>
+ <documentation>
+ <user>https://github.com/Rello/analytics/wiki</user>
+ </documentation>
  <category>office</category>
+ <category>workflow</category>
  <website>https://github.com/rello/analytics</website>
  <bugs>https://github.com/rello/analytics/issues</bugs>
  <repository type="git">https://github.com/rello/analytics.git</repository>

diff --git a/composer.json b/composer.json
@@ -5,8 +5,8 @@
  "ext-json": "*"
  },
  "require-dev": {
- "christophwurst/nextcloud": "^17.0.1",
- "symfony/symfony": "^4.2.3",
- "guzzlehttp/guzzle": "^6.3.0"
- }
+ "christophwurst/nextcloud": "^18.0.0-rc2",
+ "symfony/symfony": "^4.2.3",
+ "guzzlehttp/guzzle": "^6.3.0"
+ }
 }
diff --git a/js/app.js b/js/app.js
@@ -10,6 +10,7 @@
 /** global: OCA */
 /** global: OCP */
 /** global: OC */
+/** global: table */
 'use strict';
 
 if (!OCA.Analytics) {

diff --git a/js/viewer.js b/js/viewer.js
@@ -7,6 +7,9 @@
  * @author Marcel Scherello <audioplayer@scherello.de>
  * @copyright 2020 Marcel Scherello
  */
+/** global: OCA */
+/** global: OCP */
+/** global: OC */
 'use strict';
 
 if (!OCA.Analytics) {

diff --git a/l10n/de.js b/l10n/de.js
@@ -1,3 +1,4 @@
+/** global: OC */
 OC.L10N.register(
  'analytics',
  {
@@ -23,18 +24,18 @@ OC.L10N.register(
  'Technical error. Please check the logs': 'Technischer Fehler. Bitte die Logs prüfen',
  'Search': 'Suche',
  'first': 'erster',
-  'previous': 'zurück',
-  'next': 'weiter',
-  'last': 'letzter',
-  'Show _MENU_ entries': 'Zeige _MENU_ Einträge',
-  'Showing 0 to 0 of 0 entries': 'Zeige 0 bis 0 von 0 Einträgen',
-  'Showing _START_ to _END_ of _TOTAL_ entries': 'Zeige _START_ bis _END_ von _TOTAL_ Einträgen',
-  'Delete Report': 'Bericht löschen',
-  'Are you sure?': 'Bist Du sicher?',
-  'All data will be deleted!': 'Alle Daten werden gelöscht!',
-  'Show in Analytics': 'In Analytics anzeigen',
-  'Column 1': 'Spalte 1',
-  'Column 3': 'Spalte 3',
-  'Thresholds': 'Schwellwerte'
+ 'previous': 'zurück',
+ 'next': 'weiter',
+ 'last': 'letzter',
+ 'Show _MENU_ entries': 'Zeige _MENU_ Einträge',
+ 'Showing 0 to 0 of 0 entries': 'Zeige 0 bis 0 von 0 Einträgen',
+ 'Showing _START_ to _END_ of _TOTAL_ entries': 'Zeige _START_ bis _END_ von _TOTAL_ Einträgen',
+ 'Delete Report': 'Bericht löschen',
+ 'Are you sure?': 'Bist Du sicher?',
+ 'All data will be deleted!': 'Alle Daten werden gelöscht!',
+ 'Show in Analytics': 'In Analytics anzeigen',
+ 'Column 1': 'Spalte 1',
+ 'Column 3': 'Spalte 3',
+ 'Thresholds': 'Schwellwerte'
  },
  '');
diff --git a/l10n/de_DE.js b/l10n/de_DE.js
@@ -1,3 +1,4 @@
+/** global: OC */
 OC.L10N.register(
  'analytics',
  {
@@ -23,19 +24,19 @@ OC.L10N.register(
  'Technical error. Please check the logs': 'Technischer Fehler. Bitte die Logs prüfen',
  'Search': 'Suche',
  'first': 'erster',
-  'previous': 'zurück',
-  'next': 'weiter',
-  'last': 'letzter',
-  'Show _MENU_ entries': 'Zeige _MENU_ Einträge',
-  'Showing 0 to 0 of 0 entries': 'Zeige 0 bis 0 von 0 Einträgen',
-  'Showing _START_ to _END_ of _TOTAL_ entries': 'Zeige _START_ bis _END_ von _TOTAL_ Einträgen',
-  'Delete Report': 'Bericht löschen',
-  'Are you sure?': 'Bist Du sicher?',
-  'All data will be deleted!': 'Alle Daten werden gelöscht!',
-  'Show in Analytics': 'In Analytics anzeigen',
-  'Column 1': 'Spalte 1',
-  'Column 3': 'Spalte 3',
-  'Thresholds': 'Schwellwerte'
+ 'previous': 'zurück',
+ 'next': 'weiter',
+ 'last': 'letzter',
+ 'Show _MENU_ entries': 'Zeige _MENU_ Einträge',
+ 'Showing 0 to 0 of 0 entries': 'Zeige 0 bis 0 von 0 Einträgen',
+ 'Showing _START_ to _END_ of _TOTAL_ entries': 'Zeige _START_ bis _END_ von _TOTAL_ Einträgen',
+ 'Delete Report': 'Bericht löschen',
+ 'Are you sure?': 'Bist Du sicher?',
+ 'All data will be deleted!': 'Alle Daten werden gelöscht!',
+ 'Show in Analytics': 'In Analytics anzeigen',
+ 'Column 1': 'Spalte 1',
+ 'Column 3': 'Spalte 3',
+ 'Thresholds': 'Schwellwerte'
  },
  '');
 

diff --git a/lib/Activity/ActivityManager.php b/lib/Activity/ActivityManager.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Activity;

diff --git a/lib/Activity/Filter.php b/lib/Activity/Filter.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Activity;

diff --git a/lib/Activity/Provider.php b/lib/Activity/Provider.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Activity;

diff --git a/lib/Activity/SettingDataset.php b/lib/Activity/SettingDataset.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Activity;

diff --git a/lib/BackgroundJob/Daily.php b/lib/BackgroundJob/Daily.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\BackgroundJob;

diff --git a/lib/BackgroundJob/Hourly.php b/lib/BackgroundJob/Hourly.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\BackgroundJob;

diff --git a/lib/Controller/ApiDataController.php b/lib/Controller/ApiDataController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Controller;

diff --git a/lib/Controller/DataSourceController.php b/lib/Controller/DataSourceController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Controller;

diff --git a/lib/Controller/DataloadController.php b/lib/Controller/DataloadController.php
@@ -6,11 +6,12 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Controller;
 
+use Exception;
 use OCA\Analytics\Activity\ActivityManager;
 use OCA\Analytics\Db\DataloadMapper;
 use OCP\AppFramework\Controller;
@@ -82,7 +83,8 @@ public function create(int $datasetId, int $datasourceId)
  */
  public function read(int $datasetId)
  {
- $result['dataloads'] = $this->DataloadMapper->read($datasetId);;
+ $result = array();
+ $result['dataloads'] = $this->DataloadMapper->read($datasetId);
  $result['templates'] = $this->DataSourceController->getTemplates();
  return new DataResponse($result);
  }
@@ -135,7 +137,7 @@ public function simulate(int $dataloadId)
  * @NoAdminRequired
  * @param $schedule
  * @return void
- * @throws \Exception
+ * @throws Exception
  */
  public function executeBySchedule($schedule)
  {
@@ -153,7 +155,7 @@ public function executeBySchedule($schedule)
  * @NoAdminRequired
  * @param int $dataloadId
  * @return DataResponse
- * @throws \Exception
+ * @throws Exception
  */
  public function execute(int $dataloadId)
  {
@@ -190,7 +192,7 @@ public function execute(int $dataloadId)
  *
  * @NoAdminRequired
  * @param int $dataloadId
- * @return array
+ * @return array|NotFoundResponse
  * @throws NotFoundException
  */
  private function getDataFromDatasource(int $dataloadId)
@@ -263,7 +265,7 @@ private function replaceDimension($Array, $Find, $Replace)
  * @param $dimension2
  * @param $dimension3
  * @return DataResponse|NotFoundResponse
- * @throws \Exception
+ * @throws Exception
  */
  public function updateData(int $datasetId, $dimension1, $dimension2, $dimension3)
  {
@@ -322,7 +324,7 @@ public function deleteData(int $datasetId, $dimension1, $dimension2)
  * @param int $datasetId
  * @param $import
  * @return DataResponse|NotFoundResponse
- * @throws \Exception
+ * @throws Exception
  */
  public function importClipboard($datasetId, $import)
  {
@@ -371,14 +373,15 @@ public function importClipboard($datasetId, $import)
  * @param $path
  * @return DataResponse|NotFoundResponse
  * @throws NotFoundException
- * @throws \Exception
+ * @throws Exception
  */
  public function importFile(int $datasetId, $path)
  {
  $this->logger->error('DataLoadController 378:' . $datasetId . $path);
  $datasetMetadata = $this->DatasetController->getOwnDataset($datasetId);
  if (!empty($datasetMetadata)) {
  $insert = $update = 0;
+ $option = array();
  $option['user_id'] = $datasetMetadata['user_id'];
  $option['path'] = $path;
  $option['link'] = $datasetMetadata['link'];

diff --git a/lib/Controller/DatasetController.php b/lib/Controller/DatasetController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Controller;

diff --git a/lib/Controller/OutputController.php b/lib/Controller/OutputController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Controller;
@@ -89,7 +89,7 @@ public function read(int $datasetId, $objectDrilldown, $dateDrilldown)
  * @param $datasetMetadata
  * @param $objectDrilldown
  * @param $dateDrilldown
- * @return array
+ * @return array|NotFoundException
  * @throws NotFoundException
  */
  private function getData($datasetMetadata, $objectDrilldown, $dateDrilldown)
@@ -99,6 +99,7 @@ private function getData($datasetMetadata, $objectDrilldown, $dateDrilldown)
  if ($datasource === DataSourceController::DATASET_TYPE_INTERNAL_DB) {
  $result = $this->StorageController->read($datasetMetadata, $objectDrilldown, $dateDrilldown);
  } else {
+ $option = array();
  $option['user_id'] = $datasetMetadata['user_id'];
  $option['link'] = $datasetMetadata['link'];
  $result = $this->DataSourceController->read($datasource, $option);

diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Controller;

diff --git a/lib/Controller/StorageController.php b/lib/Controller/StorageController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Controller;

diff --git a/lib/Controller/ThresholdController.php b/lib/Controller/ThresholdController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Controller;

diff --git a/lib/Datasource/ExternalFileService.php b/lib/Datasource/ExternalFileService.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Datasource;

diff --git a/lib/Datasource/FileService.php b/lib/Datasource/FileService.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2020 Marcel Scherello
  */
 
 namespace OCA\Analytics\Datasource;