Merge pull request #54 from shaarli/fix/keep-tab-characters

Do not replace tab characters

Author: ArthurHoaro

NetscapeBookmarkParser.php

@@ -321,15 +321,15 @@ public static function sanitizeString($bookmarkString)
         // trim whitespace
         $sanitized = trim($sanitized);
 
-        // trim carriage returns, replace tabs by a single space
-        $sanitized = str_replace(array("\r", "\t"), array('',' '), $sanitized);
+        // trim carriage returns
+        $sanitized = str_replace("\r", '', $sanitized);
 
         // convert multiline descriptions to one-line descriptions
         // line feeds are converted to <br>
         $sanitized = preg_replace_callback(
             '@<DD>(.*?)(</?(:?DT|DD|DL))@mis',
             function($match) {
-                return '<DD>'.str_replace("\n", '<br>', trim($match[1])).PHP_EOL. $match[2];
+        		return '<DD>'.str_replace("\n", '<br>', trim($match[1])).PHP_EOL. $match[2];
             },
             $sanitized
         );

tests/ParseShaarliWithTabsAndSpacesTest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Shaarli\NetscapeBookmarkParser;
+
+class ParseShaarliWithTabsAndSpacesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Delete log file.
+     */
+    public function tearDown()
+    {
+        @unlink(LoggerTestsUtils::getLogFile());
+    }
+
+    /**
+     * Parse flat Chromium bookmarks (no directories)
+     */
+    public function testParseFlat()
+    {
+        $parser = new NetscapeBookmarkParser(false, null, '1');
+        $bkm = $parser->parseFile('tests/input/shaarli_with_tabs_and_spaces.htm');
+
+        static::assertSame(
+            trim(file_get_contents('tests/output/shaarli_with_tabs_and_spaces.txt')),
+            $bkm[0]['note']
+        );
+    }
+}

tests/input/shaarli_with_tabs_and_spaces.htm

@@ -0,0 +1,18 @@
+I will write some formating using spaces:
+
+  * For example,
+  * lists,
+    + but also
+    + sublists
+  * use spaces.
+
+Also code:
+
+```
+foreach ($data['linksToDisplay'] as $key => $bookmark) {
+    $length = strlen($bookmark['title']) + (342 * strlen($bookmark['description'])) / 836;
+    if (! empty($bookmark['thumbnail'])) {
+		$length += 100; // 1 thumbnails roughly takes 100 pixels height.
+    }
+}
+```