public function import()
{
if (!$this->user) {
- $this->logger->error('WallabagImport: user is not defined');
+ $this->logger->error('Wallabag Browser Import: user is not defined');
return false;
}
if (!file_exists($this->filepath) || !is_readable($this->filepath)) {
- $this->logger->error('WallabagImport: unable to read file', ['filepath' => $this->filepath]);
+ $this->logger->error('Wallabag Browser Import: unable to read file', ['filepath' => $this->filepath]);
return false;
}
return 'import.chrome.description';
}
- /**
- * {@inheritdoc}
- */
- protected function prepareEntry($entry = [])
- {
- $data = [
- 'title' => $entry['name'],
- 'html' => '',
- 'url' => $entry['url'],
- 'is_archived' => $this->markAsRead,
- 'tags' => '',
- 'created_at' => $entry['date_added'],
- ];
-
- if (array_key_exists('tags', $entry) && $entry['tags'] != '') {
- $data['tags'] = $entry['tags'];
- }
-
- return $data;
- }
+ /**
+ * {@inheritdoc}
+ */
+ protected function prepareEntry($entry = [])
+ {
+ $data = [
+ 'title' => $entry['name'],
+ 'html' => '',
+ 'url' => $entry['url'],
+ 'is_archived' => $this->markAsRead,
+ 'tags' => '',
+ 'created_at' => $entry['date_added'],
+ ];
+
+ if (array_key_exists('tags', $entry) && $entry['tags'] != '') {
+ $data['tags'] = $entry['tags'];
+ }
+
+ return $data;
+ }
/**
* {@inheritdoc}
- "@wallabag_core.redis.client"
- "wallabag.import.chrome"
- wallabag_import.producer.redis.firefox:
+ wallabag_import.producer.redis.chrome:
class: Wallabag\ImportBundle\Redis\Producer
arguments:
- "@wallabag_import.queue.redis.chrome"
- wallabag_import.consumer.redis.firefox:
+ wallabag_import.consumer.redis.chrome:
class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
arguments:
- "@doctrine.orm.entity_manager"
$this->getLoggedInUserId()
);
- $this->assertEmpty($content->getMimetype());
$this->assertNotEmpty($content->getPreviewPicture());
$this->assertNotEmpty($content->getLanguage());
$this->assertEquals(0, count($content->getTags()));
->disableOriginalConstructor()
->getMock();
- $entryRepo->expects($this->exactly(4))
+ $entryRepo->expects($this->exactly(1))
->method('findByUrlAndUserId')
->willReturn(false);
->getMock();
$this->contentProxy
- ->expects($this->exactly(4))
+ ->expects($this->exactly(1))
->method('updateEntry')
->willReturn($entry);
$res = $chromeImport->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 4, 'queued' => 0], $chromeImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 1, 'queued' => 0], $chromeImport->getSummary());
}
public function testImportAndMarkAllAsRead()
{
$chromeImport = $this->getChromeImport();
- $chromeImport->setFilepath(__DIR__.'/../fixtures/readability-read.json');
+ $chromeImport->setFilepath(__DIR__.'/../fixtures/chrome-bookmarks');
$entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
->disableOriginalConstructor()
->getMock();
- $entryRepo->expects($this->exactly(2))
+ $entryRepo->expects($this->exactly(1))
->method('findByUrlAndUserId')
->will($this->onConsecutiveCalls(false, true));
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 1, 'queued' => 0], $chromeImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 1, 'queued' => 0], $chromeImport->getSummary());
}
public function testImportWithRabbit()
{
$chromeImport = $this->getChromeImport();
- $chromeImport->setFilepath(__DIR__.'/../fixtures/readability.json');
+ $chromeImport->setFilepath(__DIR__.'/../fixtures/chrome-bookmarks');
$entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
->disableOriginalConstructor()
->getMock();
$producer
- ->expects($this->exactly(4))
+ ->expects($this->exactly(1))
->method('publish');
$chromeImport->setProducer($producer);
- $res = $readabilityImport->setMarkAsRead(true)->import();
+ $res = $chromeImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $chromeImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 1], $chromeImport->getSummary());
}
public function testImportWithRedis()
{
- $chromeImport = $this->getReadabilityImport();
+ $chromeImport = $this->getChromeImport();
$chromeImport->setFilepath(__DIR__.'/../fixtures/chrome-bookmarks');
$entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
$res = $chromeImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $chromeImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 1], $chromeImport->getSummary());
$this->assertNotEmpty($redisMock->lpop('chrome'));
}
$this->assertFalse($res);
$records = $this->logHandler->getRecords();
- $this->assertContains('ChromeImport: unable to read file', $records[0]['message']);
+ $this->assertContains('Wallabag Browser Import: unable to read file', $records[0]['message']);
$this->assertEquals('ERROR', $records[0]['level_name']);
}
public function testImportUserNotDefined()
{
$chromeImport = $this->getChromeImport(true);
- $chromeImport->setFilepath(__DIR__.'/../fixtures/readability.json');
+ $chromeImport->setFilepath(__DIR__.'/../fixtures/chrome-bookmarks');
$res = $chromeImport->import();
$this->assertFalse($res);
$records = $this->logHandler->getRecords();
- $this->assertContains('ChromeImport: user is not defined', $records[0]['message']);
+ $this->assertContains('Wallabag Browser Import: user is not defined', $records[0]['message']);
$this->assertEquals('ERROR', $records[0]['level_name']);
}
}
public function testImportAndMarkAllAsRead()
{
$firefoxImport = $this->getFirefoxImport();
- $firefoxImport->setFilepath(__DIR__.'/../fixtures/readability-read.json');
+ $firefoxImport->setFilepath(__DIR__.'/../fixtures/firefox-bookmarks.json');
$entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
->disableOriginalConstructor()
->getMock();
- $entryRepo->expects($this->exactly(2))
+ $entryRepo->expects($this->exactly(4))
->method('findByUrlAndUserId')
->will($this->onConsecutiveCalls(false, true));
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 1, 'imported' => 1, 'queued' => 0], $firefoxImport->getSummary());
+ $this->assertEquals(['skipped' => 3, 'imported' => 1, 'queued' => 0], $firefoxImport->getSummary());
}
public function testImportWithRabbit()
{
$firefoxImport = $this->getFirefoxImport();
- $firefoxImport->setFilepath(__DIR__.'/../fixtures/readability.json');
+ $firefoxImport->setFilepath(__DIR__.'/../fixtures/firefox-bookmarks.json');
$entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
->disableOriginalConstructor()
->getMock();
$producer
- ->expects($this->exactly(4))
+ ->expects($this->exactly(1))
->method('publish');
$firefoxImport->setProducer($producer);
- $res = $readabilityImport->setMarkAsRead(true)->import();
+ $res = $firefoxImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $firefoxImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 1], $firefoxImport->getSummary());
}
public function testImportWithRedis()
{
- $firefoxImport = $this->getReadabilityImport();
+ $firefoxImport = $this->getFirefoxImport();
$firefoxImport->setFilepath(__DIR__.'/../fixtures/firefox-bookmarks.json');
$entryRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\EntryRepository')
$res = $firefoxImport->setMarkAsRead(true)->import();
$this->assertTrue($res);
- $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 4], $firefoxImport->getSummary());
+ $this->assertEquals(['skipped' => 0, 'imported' => 0, 'queued' => 1], $firefoxImport->getSummary());
$this->assertNotEmpty($redisMock->lpop('firefox'));
}
$this->assertFalse($res);
$records = $this->logHandler->getRecords();
- $this->assertContains('FirefoxImport: unable to read file', $records[0]['message']);
+ $this->assertContains('Wallabag Browser Import: unable to read file', $records[0]['message']);
$this->assertEquals('ERROR', $records[0]['level_name']);
}
public function testImportUserNotDefined()
{
$firefoxImport = $this->getFirefoxImport(true);
- $firefoxImport->setFilepath(__DIR__.'/../fixtures/readability.json');
+ $firefoxImport->setFilepath(__DIR__.'/../fixtures/firefox-bookmarks.json');
$res = $firefoxImport->import();
$this->assertFalse($res);
$records = $this->logHandler->getRecords();
- $this->assertContains('FirefoxImport: user is not defined', $records[0]['message']);
+ $this->assertContains('Wallabag Browser Import: user is not defined', $records[0]['message']);
$this->assertEquals('ERROR', $records[0]['level_name']);
}
}