From cb32a2c4ed9a360bffd967db98d6b9157cc41e43 Mon Sep 17 00:00:00 2001 From: anoy Date: Fri, 6 Nov 2020 17:09:36 +0100 Subject: remove deprecated YouTube playlist API Signed-off-by: anoy --- lib/AppInfo/Application.php | 2 - lib/Fetcher/YoutubeFetcher.php | 88 ------------------------------------------ 2 files changed, 90 deletions(-) delete mode 100644 lib/Fetcher/YoutubeFetcher.php (limited to 'lib') diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index b22775924..a262e2a03 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -36,7 +36,6 @@ use OCA\News\Db\MapperFactory; use OCA\News\Db\ItemMapper; use OCA\News\Fetcher\FeedFetcher; use OCA\News\Fetcher\Fetcher; -use OCA\News\Fetcher\YoutubeFetcher; use OCP\User\Events\BeforeUserDeletedEvent; use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; @@ -81,7 +80,6 @@ class Application extends App implements IBootstrap // register fetchers in order, the most generic fetcher should be // the last one - $fetcher->registerFetcher($container->get(YoutubeFetcher::class)); $fetcher->registerFetcher($container->get(FeedFetcher::class)); return $fetcher; }); diff --git a/lib/Fetcher/YoutubeFetcher.php b/lib/Fetcher/YoutubeFetcher.php deleted file mode 100644 index 7c197a1b1..000000000 --- a/lib/Fetcher/YoutubeFetcher.php +++ /dev/null @@ -1,88 +0,0 @@ - - * @copyright Bernhard Posselt 2012, 2014 - */ - -namespace OCA\News\Fetcher; - -class YoutubeFetcher implements IFeedFetcher -{ - - private $feedFetcher; - - public function __construct(FeedFetcher $feedFetcher) - { - $this->feedFetcher = $feedFetcher; - } - - - /** - * Build YouTube URL - * - * @param string $url - * - * @return string - */ - private function buildUrl(string $url): string - { - $baseRegex = '%(?:https?://|//)?(?:www.)?youtube.com'; - $playRegex = $baseRegex . '.*?list=([^&]*)%'; - - if (preg_match($playRegex, $url, $matches)) { - $id = $matches[1]; - return 'http://gdata.youtube.com/feeds/api/playlists/' . $id; - } else { - return $url; - } - } - - - /** - * Check if the URL is a youtube URL by reformatting it. - * - * @param string $url the url that should be fetched - * - * @return bool - */ - public function canHandle(string $url): bool - { - return $this->buildUrl($url) !== $url; - } - - - /** - * Fetch a feed from remote - * - * @inheritdoc - */ - public function fetch( - string $url, - bool $favicon, - ?string $lastModified, - bool $fullTextEnabled, - ?string $user, - ?string $password - ): array { - $transformedUrl = $this->buildUrl($url); - - $result = $this->feedFetcher->fetch( - $transformedUrl, - $favicon, - $lastModified, - $fullTextEnabled, - $user, - $password - ); - - // reset feed url so we know the correct added url for the feed - $result[0]->setUrl($url); - - return $result; - } -} -- cgit v1.2.3