diff options
author | Sean Molenaar <sean@seanmolenaar.eu> | 2019-01-30 20:36:40 +0100 |
---|---|---|
committer | Sean Molenaar <sean@seanmolenaar.eu> | 2019-01-30 20:36:40 +0100 |
commit | a3246a927de542e1b3ab403359bfd3c08705b6a7 (patch) | |
tree | 2062fe74608d41017d4403f2efa388488ca9bdb7 /lib/Utility | |
parent | 270409d0d6d4cd9cbae6588c39e3058b22b4734e (diff) |
Parser: Switch to feedIO for parsing instead of picoFeed
Diffstat (limited to 'lib/Utility')
-rw-r--r-- | lib/Utility/PicoFeedClientFactory.php | 42 | ||||
-rw-r--r-- | lib/Utility/PicoFeedFaviconFactory.php | 40 | ||||
-rw-r--r-- | lib/Utility/PsrLogger.php | 97 |
3 files changed, 97 insertions, 82 deletions
diff --git a/lib/Utility/PicoFeedClientFactory.php b/lib/Utility/PicoFeedClientFactory.php deleted file mode 100644 index 046224919..000000000 --- a/lib/Utility/PicoFeedClientFactory.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php -/** - * Nextcloud - News - * - * This file is licensed under the Affero General Public License version 3 or - * later. See the COPYING file. - * - * @author Alessandro Cosentino <cosenal@gmail.com> - * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright 2012 Alessandro Cosentino - * @copyright 2012-2014 Bernhard Posselt - */ - - -namespace OCA\News\Utility; - -use \PicoFeed\Config\Config; -use \PicoFeed\Client\Client; - -class PicoFeedClientFactory -{ - - private $config; - - public function __construct(Config $config) - { - $this->config = $config; - } - - - /** - * Returns a new instance of an PicoFeed Http client - * - * @return \PicoFeed\Client instance - */ - public function build() - { - $client = Client::getInstance(); - $client->setConfig($this->config); - return $client; - } -} diff --git a/lib/Utility/PicoFeedFaviconFactory.php b/lib/Utility/PicoFeedFaviconFactory.php deleted file mode 100644 index 09a1b76c8..000000000 --- a/lib/Utility/PicoFeedFaviconFactory.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php -/** - * Nextcloud - News - * - * This file is licensed under the Affero General Public License version 3 or - * later. See the COPYING file. - * - * @author Alessandro Cosentino <cosenal@gmail.com> - * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright 2012 Alessandro Cosentino - * @copyright 2012-2014 Bernhard Posselt - */ - - -namespace OCA\News\Utility; - -use \PicoFeed\Config\Config; -use \PicoFeed\Reader\Favicon; - -class PicoFeedFaviconFactory -{ - - private $config; - - public function __construct(Config $config) - { - $this->config = $config; - } - - - /** - * Returns a new instance of an PicoFeed Http client - * - * @return \PicoFeed\Favicon instance - */ - public function build() - { - return new Favicon($this->config); - } -} diff --git a/lib/Utility/PsrLogger.php b/lib/Utility/PsrLogger.php new file mode 100644 index 000000000..5d9a2529b --- /dev/null +++ b/lib/Utility/PsrLogger.php @@ -0,0 +1,97 @@ +<?php +/** + * Nextcloud - News + * + * This file is licensed under the Affero General Public License version 3 or + * later. See the COPYING file. + * + * @author Sean Molenaar <sean@seanmolenaar.eu> + * @copyright 2018 Sean Molenaar + */ + +namespace OCA\News\Utility; + +use \OCP\ILogger; + +/** + * This is a wrapper to make OC\Log conform to Psr\Log\LoggerInterface + * + * @package OCA\News\Utility + */ +class PsrLogger implements \Psr\Log\LoggerInterface +{ + private $logger; + private $appName; + + /** + * PsrLogger constructor. + * + * @param ILogger $logger The logger + * @param string $appName Name of the app + */ + public function __construct(ILogger $logger, $appName) + { + $this->logger = $logger; + $this->appName = $appName; + } + + public function logException($exception, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->logException($exception, $context); + } + + public function emergency($message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->emergency($message, $context); + } + + public function alert($message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->alert($message, $context); + } + + public function critical($message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->critical($message, $context); + } + + public function error($message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->error($message, $context); + } + + public function warning($message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->warning($message, $context); + } + + public function notice($message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->notice($message, $context); + } + + public function info($message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->info($message, $context); + } + + public function debug($message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->debug($message, $context); + } + + public function log($level, $message, array $context = []) + { + $context['app'] = $this->appName; + $this->logger->log($level, $message, $context); + } +} |