nextcloud
/
bookmarks
mirror of https://github.com/nextcloud/bookmarks
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix logger interface 

for NC20 compatibility
This commit is contained in:
Marcel Klehr 2020-10-09 13:25:17 +02:00
parent dcd03400c9
commit 31e709b5a6
9 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Controller/BookmarkController.php
View File

@ -45,7 +45,9 @@ use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\IL10N;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
use OCP\IURLGenerator;
class BookmarkController extends ApiController {
@ -57,7 +59,7 @@ class BookmarkController extends ApiController {
private $l10n;
/**
* @var ILogger
* @var LoggerInterface
*/
private $logger;
@ -117,7 +119,7 @@ class BookmarkController extends ApiController {
private $folders;
public function __construct(
$appName, $request, IL10N $l10n, BookmarkMapper $bookmarkMapper, TagMapper $tagMapper, FolderMapper $folderMapper, TreeMapper $treeMapper, PublicFolderMapper $publicFolderMapper, ITimeFactory $timeFactory, ILogger $logger, IURLGenerator $url, HtmlExporter $htmlExporter, Authorizer $authorizer, BookmarkService $bookmarks, FolderService $folders
$appName, $request, IL10N $l10n, BookmarkMapper $bookmarkMapper, TagMapper $tagMapper, FolderMapper $folderMapper, TreeMapper $treeMapper, PublicFolderMapper $publicFolderMapper, ITimeFactory $timeFactory, LoggerInterface $logger, IURLGenerator $url, HtmlExporter $htmlExporter, Authorizer $authorizer, BookmarkService $bookmarks, FolderService $folders
) {
parent::__construct($appName, $request);
$this->request = $request;

8
lib/Flow/CreateBookmark.php
View File

@ -17,7 +17,9 @@ use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Folder;
use OCP\Files\Node;
use OCP\IL10N;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
use OCP\IURLGenerator;
use OCP\IUser;
use OCP\IUserSession;
@ -47,11 +49,11 @@ class CreateBookmark implements IOperation {
*/
private $urlGenerator;
/**
* @var ILogger
* @var LoggerInterface
*/
private $logger;
public function __construct(IL10N $l, BookmarkService $bookmarks, IUserSession $session, IURLGenerator $urlGenerator, ILogger $logger) {
public function __construct(IL10N $l, BookmarkService $bookmarks, IUserSession $session, IURLGenerator $urlGenerator, LoggerInterface $logger) {
$this->l = $l;
$this->bookmarks = $bookmarks;
$this->session = $session;

8
lib/Service/FaviconPreviewer.php
View File

@ -16,7 +16,9 @@ use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Http\Client\IClient;
use OCP\Http\Client\IClientService;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
class FaviconPreviewer implements IBookmarkPreviewer {
public const CACHE_TTL = 4 * 4 * 7 * 24 * 60 * 60; // cache for one month
@ -34,7 +36,7 @@ class FaviconPreviewer implements IBookmarkPreviewer {
private $linkExplorer;
/**
* @var ILogger
* @var LoggerInterface
*/
private $logger;
@ -51,7 +53,7 @@ class FaviconPreviewer implements IBookmarkPreviewer {
*/
private $enabled;
public function __construct(FileCache $cache, LinkExplorer $linkExplorer, ILogger $logger, IClientService $clientService, \OCP\IConfig $config) {
public function __construct(FileCache $cache, LinkExplorer $linkExplorer, LoggerInterface $logger, IClientService $clientService, \OCP\IConfig $config) {
$this->cache = $cache;
$this->linkExplorer = $linkExplorer;
$this->logger = $logger;

6
lib/Service/LinkExplorer.php
View File

@ -13,7 +13,9 @@ use OCA\Bookmarks\Http\Client;
use OCA\Bookmarks\Http\RequestFactory;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
use phpUri;
class LinkExplorer {
@ -27,7 +29,7 @@ class LinkExplorer {
*/
private $enabled;
public function __construct(IClientService $clientService, ILogger $logger, IConfig $config) {
public function __construct(IClientService $clientService, LoggerInterface $logger, IConfig $config) {
$client = $clientService->newClient();
$this->linkPreview = new LinkPreview(new Client($client), new RequestFactory());
$this->linkPreview->getParser('general')->setMinimumImageDimensions(150, 550);

10
lib/Service/Previewers/DefaultBookmarkPreviewer.php
View File

@ -15,7 +15,9 @@ use OCA\Bookmarks\Image;
use OCA\Bookmarks\Service\LinkExplorer;
use OCP\Http\Client\IClient;
use OCP\Http\Client\IClientService;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
class DefaultBookmarkPreviewer implements IBookmarkPreviewer {
public const CACHE_PREFIX = 'bookmarks.DefaultPreviewService';
@ -27,15 +29,15 @@ class DefaultBookmarkPreviewer implements IBookmarkPreviewer {
/** @var LinkExplorer */
protected $linkExplorer;
/** @var ILogger */
/** @var LoggerInterface */
private $logger;
/**
* @param LinkExplorer $linkExplorer
* @param IClientService $clientService
* @param ILogger $logger
* @param LoggerInterface $logger
*/
public function __construct(LinkExplorer $linkExplorer, IClientService $clientService, ILogger $logger) {
public function __construct(LinkExplorer $linkExplorer, IClientService $clientService, LoggerInterface $logger) {
$this->linkExplorer = $linkExplorer;
$this->client = $clientService->newClient();
$this->logger = $logger;

8
lib/Service/Previewers/PageresBookmarkPreviewer.php
View File

@ -12,14 +12,16 @@ use OCA\Bookmarks\Contract\IBookmarkPreviewer;
use OCA\Bookmarks\Contract\IImage;
use OCA\Bookmarks\Db\Bookmark;
use OCA\Bookmarks\Image;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
use OCP\ITempManager;
class PageresBookmarkPreviewer implements IBookmarkPreviewer {
public const CACHE_PREFIX = 'bookmarks.WebshotPreviewService';
public const CAPTURE_MAX_RETRIES = 3;
/** @var ILogger */
/** @var LoggerInterface */
private $logger;
/**
@ -27,7 +29,7 @@ class PageresBookmarkPreviewer implements IBookmarkPreviewer {
*/
private $tempManager;
public function __construct(ITempManager $tempManager, ILogger $logger) {
public function __construct(ITempManager $tempManager, LoggerInterface $logger) {
$this->tempManager = $tempManager;
$this->logger = $logger;
}

10
lib/Service/Previewers/ScreeenlyBookmarkPreviewer.php
View File

@ -15,7 +15,9 @@ use OCA\Bookmarks\Image;
use OCA\Bookmarks\Service\FileCache;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
class ScreeenlyBookmarkPreviewer implements IBookmarkPreviewer {
public const CACHE_PREFIX = 'bookmarks.ScreenlyPreviewService';
@ -31,7 +33,7 @@ class ScreeenlyBookmarkPreviewer implements IBookmarkPreviewer {
private $cache;
/** @var ILogger */
/** @var LoggerInterface */
private $logger;
private $width = 800;
@ -42,7 +44,7 @@ class ScreeenlyBookmarkPreviewer implements IBookmarkPreviewer {
*/
private $apiUrl;
public function __construct(FileCache $cache, IConfig $config, IClientService $clientService, ILogger $logger) {
public function __construct(FileCache $cache, IConfig $config, IClientService $clientService, LoggerInterface $logger) {
$this->config = $config;
$this->apiUrl = $config->getAppValue('bookmarks', 'previews.screenly.url', 'http://screeenly.com/api/v1/fullsize');
$this->apiKey = $config->getAppValue('bookmarks', 'previews.screenly.token', '');
@ -83,7 +85,7 @@ class ScreeenlyBookmarkPreviewer implements IBookmarkPreviewer {
]);
$body = json_decode($response->getBody(), true, 512, JSON_THROW_ON_ERROR);
} catch (Exception $e) {
$this->logger->logException($e, ['app' => 'bookmarks']);
$this->logger->warning($e->getMessage(), ['app' => 'bookmarks']);
return null;
}

10
lib/Service/Previewers/ScreenshotMachineBookmarkPreviewer.php
View File

@ -15,7 +15,9 @@ use OCA\Bookmarks\Image;
use OCA\Bookmarks\Service\FileCache;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
class ScreenshotMachineBookmarkPreviewer implements IBookmarkPreviewer {
public const CACHE_PREFIX = 'bookmarks.ScreenshotMachinePreviewService';
@ -29,7 +31,7 @@ class ScreenshotMachineBookmarkPreviewer implements IBookmarkPreviewer {
/** @var IConfig */
private $config;
/** @var ILogger */
/** @var LoggerInterface */
private $logger;
private $width = 800;
@ -40,7 +42,7 @@ class ScreenshotMachineBookmarkPreviewer implements IBookmarkPreviewer {
*/
private $cache;
public function __construct(FileCache $cache, IConfig $config, IClientService $clientService, ILogger $logger) {
public function __construct(FileCache $cache, IConfig $config, IClientService $clientService, LoggerInterface $logger) {
$this->config = $config;
$this->apiKey = $config->getAppValue('bookmarks', 'previews.screenshotmachine.key', '');
$this->cache = $cache;
@ -84,7 +86,7 @@ class ScreenshotMachineBookmarkPreviewer implements IBookmarkPreviewer {
}
$body = $response->getBody();
} catch (Exception $e) {
$this->logger->logException($e, ['app' => 'bookmarks']);
$this->logger->warning($e->getMessage(), ['app' => 'bookmarks']);
return null;
}

10
lib/Service/Previewers/WebshotBookmarkPreviewer.php
View File

@ -15,7 +15,9 @@ use OCA\Bookmarks\Image;
use OCA\Bookmarks\Service\FileCache;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\ILogger;
use Psr\Log\LoggerInterface;
;
class WebshotBookmarkPreviewer implements IBookmarkPreviewer {
public const CACHE_PREFIX = 'bookmarks.WebshotPreviewService';
@ -29,7 +31,7 @@ class WebshotBookmarkPreviewer implements IBookmarkPreviewer {
private $cache;
/** @var ILogger */
/** @var LoggerInterface */
private $logger;
private $width = 800;
@ -40,7 +42,7 @@ class WebshotBookmarkPreviewer implements IBookmarkPreviewer {
*/
private $apiUrl;
public function __construct(FileCache $cache, IConfig $config, IClientService $clientService, ILogger $logger) {
public function __construct(FileCache $cache, IConfig $config, IClientService $clientService, LoggerInterface $logger) {
$this->config = $config;
$this->apiUrl = $config->getAppValue('bookmarks', 'previews.webshot.url', '');
$this->cache = $cache;
@ -92,7 +94,7 @@ class WebshotBookmarkPreviewer implements IBookmarkPreviewer {
}
$body = $response->getBody();
} catch (Exception $e) {
$this->logger->logException($e, ['app' => 'bookmarks']);
$this->logger->warning($e->getMessage(), ['app' => 'bookmarks']);
return null;
}