diff --git a/app/DoctrineMigrations/Version20230728093912.php b/app/DoctrineMigrations/Version20230728093912.php
new file mode 100644
index 000000000..3319f06d6
--- /dev/null
+++ b/app/DoctrineMigrations/Version20230728093912.php
@@ -0,0 +1,50 @@
+getTable($this->getTable('entry'));
+
+ $this->skipIf($entryTable->hasColumn('is_not_parsed'), 'It seems that you already played this migration.');
+
+ $entryTable->addColumn('is_not_parsed', 'boolean', [
+ 'default' => 0,
+ 'notnull' => false,
+ ]);
+ }
+
+ /**
+ * Query to update entries where content is equal to `fetching_error_message`.
+ */
+ public function postUp(Schema $schema): void
+ {
+ $entryTable = $schema->getTable($this->getTable('entry'));
+ $this->skipIf(!$entryTable->hasColumn('is_not_parsed'), 'Unable to update is_not_parsed colum');
+
+ // Need to do a `LIKE` with a final percent to handle the new line character
+ $this->connection->executeQuery(
+ 'UPDATE ' . $this->getTable('entry') . ' SET is_not_parsed = :isNotParsed WHERE content LIKE :content',
+ [
+ 'isNotParsed' => true,
+ 'content' => str_replace("\n", '', addslashes($this->container->getParameter('wallabag_core.fetching_error_message'))) . '%',
+ ]
+ );
+ }
+
+ public function down(Schema $schema): void
+ {
+ $entryTable = $schema->getTable($this->getTable('entry'));
+ $entryTable->dropColumn('is_not_parsed');
+ }
+}
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index 748e5b0cc..89753facb 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -176,6 +176,17 @@ class EntryRestController extends WallabagRestController
* )
* ),
* @OA\Parameter(
+ * name="notParsed",
+ * in="query",
+ * description="filter by notParsed status. all entries by default",
+ * required=false,
+ * @OA\Schema(
+ * type="integer",
+ * enum={"1", "0"},
+ * default="0"
+ * )
+ * ),
+ * @OA\Parameter(
* name="sort",
* in="query",
* description="sort entries by date.",
@@ -286,6 +297,7 @@ class EntryRestController extends WallabagRestController
$isArchived = (null === $request->query->get('archive')) ? null : (bool) $request->query->get('archive');
$isStarred = (null === $request->query->get('starred')) ? null : (bool) $request->query->get('starred');
$isPublic = (null === $request->query->get('public')) ? null : (bool) $request->query->get('public');
+ $isNotParsed = (null === $request->query->get('notParsed')) ? null : (bool) $request->query->get('notParsed');
$sort = strtolower($request->query->get('sort', 'created'));
$order = strtolower($request->query->get('order', 'desc'));
$page = (int) $request->query->get('page', 1);
@@ -307,7 +319,8 @@ class EntryRestController extends WallabagRestController
$since,
$tags,
$detail,
- $domainName
+ $domainName,
+ $isNotParsed
);
} catch (\Exception $e) {
throw new BadRequestHttpException($e->getMessage());
@@ -325,6 +338,7 @@ class EntryRestController extends WallabagRestController
'archive' => $isArchived,
'starred' => $isStarred,
'public' => $isPublic,
+ 'notParsed' => $isNotParsed,
'sort' => $sort,
'order' => $order,
'page' => $page,
diff --git a/src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php b/src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php
index f62a76180..b8357bbf2 100644
--- a/src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php
@@ -7,6 +7,7 @@ use Doctrine\ORM\NoResultException;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -41,13 +42,19 @@ class ReloadEntryCommand extends Command
->setDescription('Reload entries')
->setHelp('This command reload entries')
->addArgument('username', InputArgument::OPTIONAL, 'Reload entries only for the given user')
- ;
+ ->addOption(
+ 'only-not-parsed',
+ null,
+ InputOption::VALUE_NONE,
+ 'Only reload entries which have `is_not_parsed` set to `true`'
+ );
}
protected function execute(InputInterface $input, OutputInterface $output)
{
$io = new SymfonyStyle($input, $output);
+ $onlyNotParsed = (bool) $input->getOption('only-not-parsed');
$userId = null;
if ($username = $input->getArgument('username')) {
try {
@@ -61,7 +68,8 @@ class ReloadEntryCommand extends Command
}
}
- $entryIds = $this->entryRepository->findAllEntriesIdByUserId($userId);
+ $methodName = $onlyNotParsed ? 'findAllEntriesIdByUserIdAndNotParsed' : 'findAllEntriesIdByUserId';
+ $entryIds = $this->entryRepository->$methodName($userId);
$nbEntries = \count($entryIds);
if (!$nbEntries) {
diff --git a/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php
index 6ce8d0db1..064c874ba 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php
@@ -85,6 +85,7 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
'language' => 'de',
'archived' => true,
'tags' => ['bar-tag'],
+ 'is_not_parsed' => true,
],
];
@@ -120,6 +121,10 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
$entry->setPreviewPicture($item['preview']);
}
+ if (isset($item['is_not_parsed'])) {
+ $entry->setNotParsed($item['is_not_parsed']);
+ }
+
$manager->persist($entry);
$this->addReference($reference, $entry);
}
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 5a00c0dbe..b8a1cd97b 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -276,6 +276,17 @@ class Entry
*/
private $headers;
+ /**
+ * @var bool
+ *
+ * @Exclude
+ *
+ * @ORM\Column(name="is_not_parsed", type="boolean")
+ *
+ * @Groups({"entries_for_user", "export_all"})
+ */
+ private $isNotParsed = false;
+
/**
* @Exclude
*
@@ -1006,4 +1017,28 @@ class Entry
return $this;
}
+
+ /**
+ * Set isNotParsed.
+ *
+ * @param bool $isNotParsed
+ *
+ * @return Entry
+ */
+ public function setNotParsed($isNotParsed)
+ {
+ $this->isNotParsed = $isNotParsed;
+
+ return $this;
+ }
+
+ /**
+ * Get isNotParsed.
+ *
+ * @return bool
+ */
+ public function isNotParsed()
+ {
+ return $this->isNotParsed;
+ }
}
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index 6581a99fc..c494a6a3e 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -151,6 +151,10 @@ class EntryFilterType extends AbstractType
$qb->innerJoin('e.annotations', 'a');
},
])
+ ->add('isNotParsed', CheckboxFilterType::class, [
+ 'label' => 'entry.filters.parsed_label',
+ 'data' => $options['filter_parsed'],
+ ])
->add('previewPicture', CheckboxFilterType::class, [
'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
if (false === $values['value']) {
@@ -198,6 +202,7 @@ class EntryFilterType extends AbstractType
'filter_starred' => false,
'filter_unread' => false,
'filter_annotated' => false,
+ 'filter_parsed' => false,
]);
}
}
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 918f10c66..52dcd8af0 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -260,6 +260,7 @@ class ContentProxy
if (empty($content['html'])) {
$content['html'] = $this->fetchingErrorMessage;
+ $entry->setNotParsed(true);
if (!empty($content['description'])) {
$content['html'] .= 'But we found a short description:
';
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index 9dded5e57..37d80c83c 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -207,14 +207,15 @@ class EntryRepository extends ServiceEntityRepository
* @param string $order
* @param int $since
* @param string $tags
- * @param string $detail 'metadata' or 'full'. Include content field if 'full'
+ * @param string $detail 'metadata' or 'full'. Include content field if 'full'
* @param string $domainName
+ * @param bool $isNotParsed
*
* @todo Breaking change: replace default detail=full by detail=metadata in a future version
*
* @return Pagerfanta
*/
- public function findEntries($userId, $isArchived = null, $isStarred = null, $isPublic = null, $sort = 'created', $order = 'asc', $since = 0, $tags = '', $detail = 'full', $domainName = '')
+ public function findEntries($userId, $isArchived = null, $isStarred = null, $isPublic = null, $sort = 'created', $order = 'asc', $since = 0, $tags = '', $detail = 'full', $domainName = '', $isNotParsed = null)
{
if (!\in_array(strtolower($detail), ['full', 'metadata'], true)) {
throw new \Exception('Detail "' . $detail . '" parameter is wrong, allowed: full or metadata');
@@ -244,6 +245,10 @@ class EntryRepository extends ServiceEntityRepository
$qb->andWhere('e.uid IS ' . (true === $isPublic ? 'NOT' : '') . ' NULL');
}
+ if (null !== $isNotParsed) {
+ $qb->andWhere('e.isNotParsed = :isNotParsed')->setParameter('isNotParsed', (bool) $isNotParsed);
+ }
+
if ($since > 0) {
$qb->andWhere('e.updatedAt > :since')->setParameter('since', new \DateTime(date('Y-m-d H:i:s', $since)));
}
@@ -563,6 +568,24 @@ class EntryRepository extends ServiceEntityRepository
return $qb->getQuery()->getArrayResult();
}
+ /**
+ * @param int $userId
+ *
+ * @return array
+ */
+ public function findAllEntriesIdByUserIdAndNotParsed($userId = null)
+ {
+ $qb = $this->createQueryBuilder('e')
+ ->select('e.id')
+ ->where('e.isNotParsed = true');
+
+ if (null !== $userId) {
+ $qb->where('e.user = :userid')->setParameter(':userid', $userId);
+ }
+
+ return $qb->getQuery()->getArrayResult();
+ }
+
/**
* Find all entries by url and owner.
*
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
index f3f1488a8..6ad6f562e 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
@@ -138,7 +138,7 @@
{{ form_label(form.isStarred) }}
-
+
+ {{ form_widget(form.isNotParsed) }}
+ {{ form_label(form.isNotParsed) }}
+
+
diff --git a/src/Wallabag/ImportBundle/Import/WallabagImport.php b/src/Wallabag/ImportBundle/Import/WallabagImport.php
index 7a03b9377..f1e1b0659 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagImport.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagImport.php
@@ -119,6 +119,10 @@ abstract class WallabagImport extends AbstractImport
$entry->setUrl($data['url']);
$entry->setTitle($data['title']);
+ if (\array_key_exists('is_parsed', $data)) {
+ $entry->setNotParsed(true);
+ }
+
// update entry with content (in case fetching failed, the given entry will be return)
$this->fetchContent($entry, $data['url'], $data);
diff --git a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
index 895fba11c..8b60eed33 100644
--- a/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
+++ b/src/Wallabag/ImportBundle/Import/WallabagV1Import.php
@@ -65,6 +65,7 @@ class WallabagV1Import extends WallabagImport
if (\in_array($entry['title'], $this->untitled, true)) {
$data['title'] = $this->fetchingErrorMessageTitle;
$data['html'] = $this->fetchingErrorMessage;
+ $entry['is_not_parsed'] = 1;
}
if (\array_key_exists('tags', $entry) && '' !== $entry['tags']) {
diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
index f2cd1f873..d88b99e64 100644
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
@@ -190,6 +190,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
'tags' => 'foo',
'since' => 1443274283,
'public' => 0,
+ 'notParsed' => 0,
]);
$this->assertSame(200, $this->client->getResponse()->getStatusCode());
@@ -348,6 +349,60 @@ class EntryRestControllerTest extends WallabagApiTestCase
$this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
}
+ public function testGetNotParsedEntries()
+ {
+ $this->client->request('GET', '/api/entries', ['notParsed' => 1]);
+
+ $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ $this->assertGreaterThanOrEqual(1, \count($content));
+ $this->assertNotEmpty($content['_embedded']['items']);
+ $this->assertGreaterThanOrEqual(1, $content['total']);
+ $this->assertSame(1, $content['page']);
+ $this->assertGreaterThanOrEqual(1, $content['pages']);
+
+ $this->assertArrayHasKey('_links', $content);
+ $this->assertArrayHasKey('self', $content['_links']);
+ $this->assertArrayHasKey('first', $content['_links']);
+ $this->assertArrayHasKey('last', $content['_links']);
+
+ foreach (['self', 'first', 'last'] as $link) {
+ $this->assertArrayHasKey('href', $content['_links'][$link]);
+ $this->assertStringContainsString('notParsed=1', $content['_links'][$link]['href']);
+ }
+
+ $this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
+ }
+
+ public function testGetParsedEntries()
+ {
+ $this->client->request('GET', '/api/entries', ['notParsed' => 0]);
+
+ $this->assertSame(200, $this->client->getResponse()->getStatusCode());
+
+ $content = json_decode($this->client->getResponse()->getContent(), true);
+
+ $this->assertGreaterThanOrEqual(1, \count($content));
+ $this->assertNotEmpty($content['_embedded']['items']);
+ $this->assertGreaterThanOrEqual(1, $content['total']);
+ $this->assertSame(1, $content['page']);
+ $this->assertGreaterThanOrEqual(1, $content['pages']);
+
+ $this->assertArrayHasKey('_links', $content);
+ $this->assertArrayHasKey('self', $content['_links']);
+ $this->assertArrayHasKey('first', $content['_links']);
+ $this->assertArrayHasKey('last', $content['_links']);
+
+ foreach (['self', 'first', 'last'] as $link) {
+ $this->assertArrayHasKey('href', $content['_links'][$link]);
+ $this->assertStringContainsString('notParsed=0', $content['_links'][$link]['href']);
+ }
+
+ $this->assertSame('application/json', $this->client->getResponse()->headers->get('Content-Type'));
+ }
+
public function testGetTaggedEntries()
{
$this->client->request('GET', '/api/entries', ['tags' => 'foo,bar']);
diff --git a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php b/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php
index f49ba1a15..8860a4599 100644
--- a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php
@@ -21,6 +21,16 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
*/
public $bobEntry;
+ /**
+ * @var Entry
+ */
+ public $bobParsedEntry;
+
+ /**
+ * @var Entry
+ */
+ public $bobNotParsedEntry;
+
protected function setUp(): void
{
parent::setUp();
@@ -41,6 +51,19 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
$this->bobEntry->setContent('');
$this->getEntityManager()->persist($this->bobEntry);
+ $this->bobParsedEntry = new Entry($user);
+ $this->bobParsedEntry->setUrl($this->url);
+ $this->bobParsedEntry->setTitle('title foo');
+ $this->bobParsedEntry->setContent('');
+ $this->getEntityManager()->persist($this->bobParsedEntry);
+
+ $this->bobNotParsedEntry = new Entry($user);
+ $this->bobNotParsedEntry->setUrl($this->url);
+ $this->bobNotParsedEntry->setTitle('title foo');
+ $this->bobNotParsedEntry->setContent('');
+ $this->bobNotParsedEntry->setNotParsed(true);
+ $this->getEntityManager()->persist($this->bobNotParsedEntry);
+
$this->getEntityManager()->flush();
}
@@ -95,6 +118,27 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
$this->assertStringContainsString('Done', $tester->getDisplay());
}
+ public function testRunReloadEntryWithNotParsedOption()
+ {
+ $application = new Application($this->getTestClient()->getKernel());
+
+ $command = $application->find('wallabag:entry:reload');
+ $tester = new CommandTester($command);
+ $tester->execute([
+ '--only-not-parsed' => true,
+ ]);
+
+ $entryRepository = $this->getTestClient()->getContainer()->get('wallabag_core.entry_repository.test');
+
+ $reloadedBobParsedEntry = $entryRepository->find($this->bobParsedEntry->getId());
+ $this->assertEmpty($reloadedBobParsedEntry->getContent());
+
+ $reloadedBobNotParsedEntry = $entryRepository->find($this->bobNotParsedEntry->getId());
+ $this->assertNotEmpty($reloadedBobNotParsedEntry->getContent());
+
+ $this->assertStringContainsString('Done', $tester->getDisplay());
+ }
+
public function testRunReloadEntryWithoutEntryCommand()
{
$application = new Application($this->getTestClient()->getKernel());
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index a6e0f395b..6505d7af2 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -967,6 +967,34 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertCount(3, $crawler->filter('ol.entries > li'));
}
+ public function testFilterOnNotCorrectlyParsedStatus()
+ {
+ $this->logInAs('admin');
+ $client = $this->getTestClient();
+
+ $crawler = $client->request('GET', '/all/list');
+
+ $form = $crawler->filter('button[id=submit-filter]')->form();
+
+ $data = [
+ 'entry_filter[isNotParsed]' => true,
+ ];
+
+ $crawler = $client->submit($form, $data);
+
+ $this->assertCount(1, $crawler->filter($this->entryDataTestAttribute));
+
+ $entry = new Entry($this->getLoggedInUser());
+ $entry->setUrl($this->url);
+ $entry->setNotParsed(true);
+ $this->getEntityManager()->persist($entry);
+ $this->getEntityManager()->flush();
+
+ $crawler = $client->submit($form, $data);
+
+ $this->assertCount(2, $crawler->filter($this->entryDataTestAttribute));
+ }
+
public function testPaginationWithFilter()
{
$this->logInAs('admin');
diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index 353b44489..7d430cbef 100644
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -57,6 +57,7 @@ class ContentProxyTest extends TestCase
$this->assertEmpty($entry->getLanguage());
$this->assertSame(0.0, $entry->getReadingTime());
$this->assertNull($entry->getDomainName());
+ $this->assertTrue($entry->isNotParsed());
}
public function testWithEmptyContent()
@@ -96,6 +97,7 @@ class ContentProxyTest extends TestCase
$this->assertEmpty($entry->getLanguage());
$this->assertSame(0.0, $entry->getReadingTime());
$this->assertSame('0.0.0.0', $entry->getDomainName());
+ $this->assertTrue($entry->isNotParsed());
}
public function testWithEmptyContentButOG()
@@ -138,6 +140,7 @@ class ContentProxyTest extends TestCase
$this->assertEmpty($entry->getMimetype());
$this->assertSame(0.0, $entry->getReadingTime());
$this->assertSame('domain.io', $entry->getDomainName());
+ $this->assertTrue($entry->isNotParsed());
}
public function testWithContent()
@@ -183,6 +186,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('200', $entry->getHttpStatus());
$this->assertSame(4.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithContentAndNoOgImage()
@@ -228,6 +232,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('200', $entry->getHttpStatus());
$this->assertSame(4.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithContentAndContentImage()
@@ -272,6 +277,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('200', $entry->getHttpStatus());
$this->assertSame(0.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithContentImageAndOgImage()
@@ -316,6 +322,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('200', $entry->getHttpStatus());
$this->assertSame(0.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithContentAndBadLanguage()
@@ -363,6 +370,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('200', $entry->getHttpStatus());
$this->assertSame(4.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithContentAndBadOgImage()
@@ -416,6 +424,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('200', $entry->getHttpStatus());
$this->assertSame(4.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithForcedContent()
@@ -460,6 +469,7 @@ class ContentProxyTest extends TestCase
$this->assertContains('Thomas', $entry->getPublishedBy());
$this->assertNotNull($entry->getHeaders(), 'Headers are stored, so value is not null');
$this->assertContains('no-cache', $entry->getHeaders());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithForcedContentAndDateTime()
@@ -498,6 +508,7 @@ class ContentProxyTest extends TestCase
$this->assertSame(4.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
$this->assertSame('08/09/2016', $entry->getPublishedAt()->format('d/m/Y'));
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithForcedContentAndBadDate()
@@ -537,6 +548,7 @@ class ContentProxyTest extends TestCase
$this->assertSame(4.0, $entry->getReadingTime());
$this->assertSame('1.1.1.1', $entry->getDomainName());
$this->assertNull($entry->getPublishedAt());
+ $this->assertFalse($entry->isNotParsed());
$records = $handler->getRecords();
@@ -625,6 +637,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('fr', $entry->getLanguage());
$this->assertSame('200', $entry->getHttpStatus());
$this->assertSame('1.1.1.1', $entry->getDomainName());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWithImageAsContent()
@@ -663,6 +676,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('image/jpeg', $entry->getMimetype());
$this->assertSame('200', $entry->getHttpStatus());
$this->assertSame('1.1.1.1', $entry->getDomainName());
+ $this->assertFalse($entry->isNotParsed());
}
public function testWebsiteWithValidUTF8TitleDoNothing()
diff --git a/translations/messages.en.yml b/translations/messages.en.yml
index 51aa509f6..d05f9247f 100644
--- a/translations/messages.en.yml
+++ b/translations/messages.en.yml
@@ -252,6 +252,7 @@ entry:
starred_label: Starred
unread_label: Unread
annotated_label: Annotated
+ parsed_label: Not correctly fetched
preview_picture_label: Has a preview picture
preview_picture_help: Preview picture
is_public_label: Has a public link