From 56875318489b11c96d0360f7458bb3c6f1a25dc9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 31 Dec 2010 12:09:15 -0800
Subject: [PATCH] Bookmark plugin: graceful error out for failure to import a
 delicious bookmark due to it being already bookmarked

---
 .../Bookmark/deliciousbookmarkimporter.php    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/Bookmark/deliciousbookmarkimporter.php b/plugins/Bookmark/deliciousbookmarkimporter.php
index 297ef81246..545c336860 100644
--- a/plugins/Bookmark/deliciousbookmarkimporter.php
+++ b/plugins/Bookmark/deliciousbookmarkimporter.php
@@ -96,13 +96,19 @@ class DeliciousBookmarkImporter extends QueueHandler
         $addDate = $a->getAttribute('add_date');
         $created = common_sql_date(intval($addDate));
 
-        $saved = Bookmark::saveNew($user->getProfile(),
-                                   $title,
-                                   $url,
-                                   $tags,
-                                   $description,
-                                   array('created' => $created,
-                                         'distribute' => false));
+        try {
+            $saved = Bookmark::saveNew($user->getProfile(),
+                                       $title,
+                                       $url,
+                                       $tags,
+                                       $description,
+                                       array('created' => $created,
+                                             'distribute' => false));
+        } catch (ClientException $e) {
+            // Most likely a duplicate -- continue on with the rest!
+            common_log(LOG_ERR, "Error importing delicious bookmark to $url: " . $e->getMessage());
+            return true;
+        }
 
         return true;
     }