Reimplement full-text scraping

composer.json

@@ -49,7 +49,8 @@
     "arthurhoaro/favicon": "^1.2",
     "ext-json": "*",
     "ext-simplexml": "*",
-    "ext-libxml": "*"
+    "ext-libxml": "*",
+    "andreskrey/readability.php": "^2.1"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.5",

lib/AppInfo/Application.php

@@ -41,6 +41,7 @@
 use OCA\News\Fetcher\Fetcher;
 use OCA\News\Fetcher\YoutubeFetcher;
 use OCA\News\Utility\ProxyConfigParser;
+use OCA\News\Scraper\Scraper;
 
 /**
  * Class Application
@@ -193,5 +194,14 @@ public function __construct(array $urlParams = [])
             $fetcher->registerFetcher($c->query(FeedFetcher::class));
             return $fetcher;
         });
+
+        /**
+         * Scrapers
+         */
+        $container->registerService(Scraper::class, function (IContainer $c): Scraper {
+            return new Scraper(
+                $c->query(PsrLogger::class)
+            );
+        });
     }
 }

lib/Command/ShowFeed.php

@@ -48,17 +48,19 @@ protected function configure()
             ->setDescription('Prints a JSON string which represents the given feed as it would be in the DB.')
             ->addArgument('feed', InputArgument::REQUIRED, 'Feed to parse')
             ->addOption('user', 'u', InputOption::VALUE_OPTIONAL, 'Username for the feed')
-            ->addOption('password', 'p', InputOption::VALUE_OPTIONAL, 'Password for the feed');
+            ->addOption('password', 'p', InputOption::VALUE_OPTIONAL, 'Password for the feed')
+            ->addOption('full-text', 'f', InputOption::VALUE_NONE, 'Usa a scraper to get full text');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $url   = $input->getArgument('feed');
         $user = $input->getOption('user');
         $password = $input->getOption('password');
+        $fullTextEnabled = (bool) $input->getOption('full-text');
 
         try {
-            list($feed, $items) = $this->feedFetcher->fetch($url, true, null, $user, $password);
+            list($feed, $items) = $this->feedFetcher->fetch($url, true, null, $fullTextEnabled, $user, $password);
             $output->writeln("Feed: " . json_encode($feed, JSON_PRETTY_PRINT));
             $output->writeln("Items: " . json_encode($items, JSON_PRETTY_PRINT));
         } catch (\Throwable $ex) {

lib/Fetcher/FeedFetcher.php

@@ -26,6 +26,7 @@
 use OCA\News\Db\Item;
 use OCA\News\Db\Feed;
 use OCA\News\Utility\Time;
+use OCA\News\Scraper\Scraper;
 use SimpleXMLElement;
 
 class FeedFetcher implements IFeedFetcher
@@ -36,14 +37,22 @@ class FeedFetcher implements IFeedFetcher
     private $l10n;
     private $time;
     private $logger;
-
-    public function __construct(FeedIo $fetcher, Favicon $favicon, IL10N $l10n, Time $time, PsrLogger $logger)
-    {
+    private $scraper;
+
+    public function __construct(
+        FeedIo $fetcher,
+        Favicon $favicon,
+        IL10N $l10n,
+        Time $time,
+        PsrLogger $logger,
+        Scraper $scraper
+    ) {
         $this->reader         = $fetcher;
         $this->faviconFactory = $favicon;
         $this->l10n           = $l10n;
         $this->time           = $time;
         $this->logger         = $logger;
+        $this->scraper        = $scraper;
     }
 
 
@@ -65,7 +74,7 @@ public function canHandle($url): bool
      *
      * @inheritdoc
      */
-    public function fetch(string $url, bool $favicon, $lastModified, $user, $password): array
+    public function fetch(string $url, bool $favicon, $lastModified, bool $fullTextEnabled, $user, $password): array
     {
         $url2 = new Net_URL2($url);
         if (!empty($user) && !empty(trim($user))) {
@@ -99,12 +108,32 @@ public function fetch(string $url, bool $favicon, $lastModified, $user, $passwor
         );
 
         $items = [];
+        $RTL = $this->determineRtl($parsedFeed);
+        $feedName = $parsedFeed->getTitle();
         $this->logger->debug('Feed {url} was modified since last fetch. #{count} items', [
             'url'   => $url,
             'count' => count($parsedFeed),
         ]);
+
         foreach ($parsedFeed as $item) {
-            $items[] = $this->buildItem($item, $parsedFeed);
+            $body = null;
+            $currRTL = $RTL;
+
+            // Scrape content if enabled
+            if ($fullTextEnabled) {
+                if ($this->scraper->scrape($item->getLink())) {
+                    $body = $this->scraper->getContent();
+                    $currRTL = $this->scraper->getRTL($currRTL);
+                }
+            }
+
+            $builtItem = $this->buildItem($item, $body, $currRTL);
+            $this->logger->debug('Added item {title} for feed {feed} publishdate: {datetime}', [
+                'title' => $builtItem->getTitle(),
+                'feed'  => $feedName,
+                'datetime'  => $builtItem->getLastModified(),
+            ]);
+            $items[] = $builtItem;
         }
 
         return [$feed, $items];
@@ -164,11 +193,12 @@ protected function determineRtl(FeedInterface $parsedFeed): bool
      * Build an item based on a feed.
      *
      * @param ItemInterface $parsedItem The item to use
-     * @param FeedInterface $parsedFeed The feed to use
+     * @param string        $body       Text of the item, if not provided use description from $parsedItem
+     * @param bool          $RTL        True if the feed is RTL (Right-to-left)
      *
      * @return Item
      */
-    protected function buildItem(ItemInterface $parsedItem, FeedInterface $parsedFeed): Item
+    protected function buildItem(ItemInterface $parsedItem, string $body = null, bool $RTL = false): Item
     {
         $item = new Item();
         $item->setUnread(true);
@@ -188,7 +218,7 @@ protected function buildItem(ItemInterface $parsedItem, FeedInterface $parsedFee
         $item->setPubDate($pubDT->getTimestamp());
 
         $item->setLastModified($lastmodified->getTimestamp());
-        $item->setRtl($this->determineRtl($parsedFeed));
+        $item->setRtl($RTL);
 
         // unescape content because angularjs helps against XSS
         $item->setTitle($this->decodeTwice($parsedItem->getTitle()));
@@ -197,8 +227,12 @@ protected function buildItem(ItemInterface $parsedItem, FeedInterface $parsedFee
             $item->setAuthor($this->decodeTwice($author->getName()));
         }
 
+        // Use description from feed if body is not provided (by a scraper)
+        if ($body === null) {
+            $body = $parsedItem->getValue("content:encoded") ?? $parsedItem->getDescription();
+        }
+
         // purification is done in the service layer
-        $body = $parsedItem->getValue("content:encoded") ?? $parsedItem->getDescription();
         $body = mb_convert_encoding(
             $body,
             'HTML-ENTITIES',
@@ -231,12 +265,6 @@ protected function buildItem(ItemInterface $parsedItem, FeedInterface $parsedFee
         }
 
         $item->generateSearchIndex();
-
-        $this->logger->debug('Added item {title} for feed {feed} publishdate: {datetime}', [
-            'title' => $item->getTitle(),
-            'feed'  => $parsedFeed->getTitle(),
-            'datetime'  => $item->getLastModified(),
-        ]);
         return $item;
     }
 

lib/Fetcher/Fetcher.php

@@ -45,17 +45,24 @@ public function registerFetcher(IFeedFetcher $fetcher)
      *
      * @param  string  $url               remote url of the feed
      * @param  boolean $getFavicon        if the favicon should also be fetched, defaults to true
-     * @param  string $lastModified       a last modified value from an http header defaults to false.
+     * @param  string  $lastModified      a last modified value from an http header defaults to false.
      *                                    If lastModified matches the http header from the feed no results are fetched
-     * @param  string $user               if given, basic auth is set for this feed
-     * @param  string $password           if given, basic auth is set for this feed. Ignored if user is empty
+     * @param  bool    $fullTextEnabled   If true use a scraper to download the full article
+     * @param  string  $user              if given, basic auth is set for this feed
+     * @param  string  $password          if given, basic auth is set for this feed. Ignored if user is empty
      *
      * @throws ReadErrorException if FeedIO fails
      * @return array an array containing the new feed and its items, first
      * element being the Feed and second element being an array of Items
      */
-    public function fetch($url, $getFavicon = true, $lastModified = null, $user = null, $password = null)
-    {
+    public function fetch(
+        $url,
+        $getFavicon = true,
+        $lastModified = null,
+        $fullTextEnabled = false,
+        $user = null,
+        $password = null
+    ) {
         foreach ($this->fetchers as $fetcher) {
             if (!$fetcher->canHandle($url)) {
                 continue;
@@ -64,6 +71,7 @@ public function fetch($url, $getFavicon = true, $lastModified = null, $user = nu
                 $url,
                 $getFavicon,
                 $lastModified,
+                $fullTextEnabled,
                 $user,
                 $password
             );

lib/Fetcher/IFeedFetcher.php

@@ -25,14 +25,15 @@ interface IFeedFetcher
      * @param  boolean     $favicon       if the favicon should also be fetched, defaults to true
      * @param  string|null $lastModified  a last modified value from an http header defaults to false.
      *                                    If lastModified matches the http header from the feed no results are fetched
+     * @param  bool      $fullTextEnabled If true use a scraper to download the full article
      * @param  string|null $user          if given, basic auth is set for this feed
      * @param  string|null $password      if given, basic auth is set for this feed. Ignored if user is empty
      *
      * @return array an array containing the new feed and its items, first
      * element being the Feed and second element being an array of Items
      * @throws ReadErrorException if the Feed-IO fetcher encounters a problem
      */
-    public function fetch(string $url, bool $favicon, $lastModified, $user, $password): array;
+    public function fetch(string $url, bool $favicon, $lastModified, bool $fullTextEnabled, $user, $password): array;
 
     /**
      * Can a fetcher handle a feed.

lib/Fetcher/YoutubeFetcher.php

@@ -50,14 +50,15 @@ public function canHandle($url): bool
      *
      * @inheritdoc
      */
-    public function fetch(string $url, bool $favicon, $lastModified, $user, $password): array
+    public function fetch(string $url, bool $favicon, $lastModified, bool $fullTextEnabled, $user, $password): array
     {
         $transformedUrl = $this->buildUrl($url);
 
         $result = $this->feedFetcher->fetch(
             $transformedUrl,
             $favicon,
             $lastModified,
+            $fullTextEnabled,
             $user,
             $password
         );

lib/Scraper/IScraper.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Nextcloud - News
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Gioele Falcetti <thegio.f@gmail.com>
+ * @copyright 2019 Gioele Falcetti
+ */
+
+namespace OCA\News\Scraper;
+
+interface IScraper
+{
+    /**
+     * Scrape feed url
+     *
+     * @param string $url
+     *
+     * @return bool False if failed
+     *
+     */
+    public function scrape(string $url): bool;
+
+    /**
+     * Get the scraped content
+     *
+     * @return string
+     *
+     */
+    public function getContent(): string;
+
+    /**
+     * Get the RTL (rigth-to-left) information
+     *
+     * @param  bool $default Return this value if the scraper is unable to determine it
+     *
+     * @return bool
+     *
+     */
+    public function getRTL(bool $default = false): bool;
+}