Validate imported entry to avoid error on import

[github/wallabag/wallabag.git] / src / Wallabag / ImportBundle / Import / FirefoxImport.php

diff --git a/src/Wallabag/ImportBundle/Import/FirefoxImport.php b/src/Wallabag/ImportBundle/Import/FirefoxImport.php
index cbf10b87c0401a3b8b8a9d1a6b92c78713b6a3ab..8999e3f3932240accb4096b519af13a31230bdbc 100644 (file)
--- a/src/Wallabag/ImportBundle/Import/FirefoxImport.php
+++ b/src/Wallabag/ImportBundle/Import/FirefoxImport.php
@@ -2,13 +2,6 @@
 
 namespace Wallabag\ImportBundle\Import;
 
-use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
-use Doctrine\ORM\EntityManager;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\UserBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-
 class FirefoxImport extends BrowserImport
 {
     protected $filepath;
@@ -40,32 +33,34 @@ class FirefoxImport extends BrowserImport
     /**
      * {@inheritdoc}
      */
-    protected function prepareEntry($entry = [])
+    public function validateEntry(array $importedEntry)
     {
-      $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;
-  }
+        if (empty($importedEntry['uri'])) {
+            return false;
+        }
 
+        return true;
+    }
 
     /**
      * {@inheritdoc}
      */
-    protected function setEntryAsRead(array $importedEntry)
+    protected function prepareEntry(array $entry = [])
     {
-        $importedEntry['is_archived'] = 1;
+        $data = [
+            'title' => $entry['title'],
+            'html' => false,
+            'url' => $entry['uri'],
+            'is_archived' => (int) $this->markAsRead,
+            'is_starred' => false,
+            'tags' => '',
+            'created_at' => substr($entry['dateAdded'], 0, 10),
+        ];
+
+        if (array_key_exists('tags', $entry) && '' !== $entry['tags']) {
+            $data['tags'] = $entry['tags'];
+        }
 
-        return $importedEntry;
+        return $data;
     }
 }