pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #3143 from wallabag/fix-wllbg2-import

Browse Source 
Fixed is_starred for wallabag v2 import
This commit is contained in:
Nicolas Lœuillet
2017-05-31 09:08:34 +02:00
committed by GitHub
parent 2150576d86 047fdc767a
commit 7aa5607f29
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Wallabag/ImportBundle/Import/WallabagV2Import.php
View File

@ -36,8 +36,8 @@ class WallabagV2Import extends WallabagImport
return [ return [
'html' => $entry['content'], 'html' => $entry['content'],
'content_type' => $entry['mimetype'], 'content_type' => $entry['mimetype'],
'is_archived' => (int) ($entry['is_archived'] || $this->markAsRead), 'is_archived' => (bool) ($entry['is_archived'] || $this->markAsRead),
'is_starred' => false, 'is_starred' => (bool) $entry['is_starred'],
] + $entry; ] + $entry;
} }

1
tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
View File

@ -138,6 +138,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
$this->assertEquals(3, count($content->getTags())); $this->assertEquals(3, count($content->getTags()));
$this->assertInstanceOf(\DateTime::class, $content->getCreatedAt()); $this->assertInstanceOf(\DateTime::class, $content->getCreatedAt());
$this->assertEquals('2016-09-08', $content->getCreatedAt()->format('Y-m-d')); $this->assertEquals('2016-09-08', $content->getCreatedAt()->format('Y-m-d'));
$this->assertTrue($content->isStarred(), 'Entry is starred');
} }
public function testImportWallabagWithEmptyFile() public function testImportWallabagWithEmptyFile()

2
tests/Wallabag/ImportBundle/fixtures/wallabag-v2.json
View File

File diff suppressed because one or more lines are too long