From 990adfb34c148e7cd28b9cb784cf2b7388caae8f Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 26 Sep 2016 07:30:02 +0200
Subject: Move prepareEntry to dedicated place

Yeah first try was ugly, now each part are in the dedicated place.
Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them.
---
 src/Wallabag/ImportBundle/Import/BrowserImport.php | 35 ----------------------
 src/Wallabag/ImportBundle/Import/ChromeImport.php  | 21 +++++++++++++
 src/Wallabag/ImportBundle/Import/FirefoxImport.php | 21 +++++++++++++
 3 files changed, 42 insertions(+), 35 deletions(-)

(limited to 'src')

diff --git a/src/Wallabag/ImportBundle/Import/BrowserImport.php b/src/Wallabag/ImportBundle/Import/BrowserImport.php
index 68fa8bf8..e15443c4 100644
--- a/src/Wallabag/ImportBundle/Import/BrowserImport.php
+++ b/src/Wallabag/ImportBundle/Import/BrowserImport.php
@@ -193,41 +193,6 @@ abstract class BrowserImport extends AbstractImport
         return $entry;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function prepareEntry(array $entry = [])
-    {
-        $url = array_key_exists('uri', $entry) ? $entry['uri'] : $entry['url'];
-        $date = array_key_exists('date_added', $entry) ? $entry['date_added'] : $entry['dateAdded'];
-        $title = array_key_exists('name', $entry) ? $entry['name'] : $entry['title'];
-
-        if (16 === strlen($date)) {
-            // firefox ...
-            $date = (int) ceil($date / 1000000);
-        } else if (17 === strlen($date)) {
-            // chrome ...
-            $date = (int) ceil($date / 10000000);
-        } else {
-            $date = '';
-        }
-
-        $data = [
-            'title' => $title,
-            'html' => '',
-            'url' => $url,
-            'is_archived' => $this->markAsRead,
-            'tags' => '',
-            'created_at' => $date,
-        ];
-
-        if (array_key_exists('tags', $entry) && $entry['tags'] != '') {
-            $data['tags'] = $entry['tags'];
-        }
-
-        return $data;
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Wallabag/ImportBundle/Import/ChromeImport.php b/src/Wallabag/ImportBundle/Import/ChromeImport.php
index 60602a1b..d7620bcb 100644
--- a/src/Wallabag/ImportBundle/Import/ChromeImport.php
+++ b/src/Wallabag/ImportBundle/Import/ChromeImport.php
@@ -29,4 +29,25 @@ class ChromeImport extends BrowserImport
     {
         return 'import.chrome.description';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function prepareEntry(array $entry = [])
+    {
+        $data = [
+            'title' => $entry['name'],
+            'html' => '',
+            'url' => $entry['url'],
+            'is_archived' => $this->markAsRead,
+            'tags' => '',
+            'created_at' => substr($entry['date_added'], 0, 10),
+        ];
+
+        if (array_key_exists('tags', $entry) && $entry['tags'] != '') {
+            $data['tags'] = $entry['tags'];
+        }
+
+        return $data;
+    }
 }
diff --git a/src/Wallabag/ImportBundle/Import/FirefoxImport.php b/src/Wallabag/ImportBundle/Import/FirefoxImport.php
index 1a0b1154..e010f5a4 100644
--- a/src/Wallabag/ImportBundle/Import/FirefoxImport.php
+++ b/src/Wallabag/ImportBundle/Import/FirefoxImport.php
@@ -29,4 +29,25 @@ class FirefoxImport extends BrowserImport
     {
         return 'import.firefox.description';
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function prepareEntry(array $entry = [])
+    {
+        $data = [
+            'title' => $entry['title'],
+            'html' => '',
+            'url' => $entry['uri'],
+            'is_archived' => $this->markAsRead,
+            'tags' => '',
+            'created_at' => substr($entry['dateAdded'], 0, 10),
+        ];
+
+        if (array_key_exists('tags', $entry) && $entry['tags'] != '') {
+            $data['tags'] = $entry['tags'];
+        }
+
+        return $data;
+    }
 }
-- 
cgit v1.2.3