Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #635 from virtualtam/fix/import/ie

Browse source 
Fix: ensure Internet Explorer bookmark dumps can be imported
This commit is contained in:
VirtualTam 2016-08-13 13:59:12 +02:00 committed by GitHub
commit f396134bf1
3 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
application/NetscapeBookmarkUtils.php
View file

@ -98,8 +98,7 @@ public static function import($post, $files, $linkDb, $pagecache)
$filesize = $files['filetoupload']['size'];
$data = file_get_contents($files['filetoupload']['tmp_name']);
// Sniff file type
if (! startsWith($data, '<!DOCTYPE NETSCAPE-Bookmark-file-1>')) {
if (strpos($data, '<!DOCTYPE NETSCAPE-Bookmark-file-1>') === false) {
return self::importStatus($filename, $filesize);
}

28
tests/NetscapeBookmarkUtils/BookmarkImportTest.php
View file

@ -82,6 +82,34 @@ public function testImportNoDoctype()
$this->assertEquals(0, count($this->linkDb));
}
/**
* Ensure IE dumps are supported
*/
public function testImportInternetExplorerEncoding()
{
$files = file2array('internet_explorer_encoding.htm');
$this->assertEquals(
'File internet_explorer_encoding.htm (356 bytes) was successfully processed:'
.' 1 links imported, 0 links overwritten, 0 links skipped.',
NetscapeBookmarkUtils::import(array(), $files, $this->linkDb, $this->pagecache)
);
$this->assertEquals(1, count($this->linkDb));
$this->assertEquals(0, count_private($this->linkDb));
$this->assertEquals(
array(
'linkdate' => '20160618_173944',
'title' => 'Hg Init a Mercurial tutorial by Joel Spolsky',
'url' => 'http://hginit.com/',
'description' => '',
'private' => 0,
'tags' => ''
),
$this->linkDb->getLinkFromUrl('http://hginit.com/')
);
}
/**
* Import bookmarks nested in a folder hierarchy
*/

9
tests/NetscapeBookmarkUtils/input/internet_explorer_encoding.htm Normal file
View file

@ -0,0 +1,9 @@
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<!-- This is an automatically generated file.
It will be read and overwritten.
Do Not Edit! -->
<TITLE>Bookmarks</TITLE>
<H1>Bookmarks</H1>
<DL><p>
<DT><A HREF="http://hginit.com/" ADD_DATE="1466271584" LAST_VISIT="1466271584" LAST_MODIFIED="1466271584" >Hg Init a Mercurial tutorial by Joel Spolsky</A>
</DL><p>