Minor refactoring

[bookmarks_db.git] / bkmk-add.py

diff --git a/bkmk-add.py b/bkmk-add.py
index fd9723b4a3dd3b686781b5f07beb22d8ddb23fcf..b882cf9082e22e7b0a807e0bba81c8b4f9decc3c 100755 (executable)
--- a/bkmk-add.py
+++ b/bkmk-add.py
@@ -2,15 +2,16 @@
 """Add a bookmark to the database
 
 This file is a part of Bookmarks database and Internet robot.
+
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2002-2012 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2002-2014 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import sys, os, time
 from bkmk_objects import Bookmark
-from Robots.bkmk_rsimple import robot_simple
+from robots import robot
 
 
 def run():
@@ -35,7 +36,7 @@ def run():
       sys.stderr.write("Usage: bkmk-add [-s] [-t title] url\n")
       sys.exit(1)
 
-   from storage import storage, import_storage
+   from storage import storage
    storage = storage()
 
    if report_stats:
@@ -51,8 +52,10 @@ def run():
    now = int(time.time())
    bookmark = Bookmark(href, str(now), '0', '0')
    bookmark.name = ''
+   bookmark.parent = None
 
-   robot = robot_simple(None)
+   global robot
+   robot = robot(None)
 
    if robot.check_url(bookmark): # get real title and last modified date
       if title: # forced title
@@ -61,6 +64,7 @@ def run():
          bookmark.name = bookmark.real_title
       if report_stats:
          sys.stdout.write("Adding %s with title '%s'\n" % (href, bookmark.name))
+      del bookmark.parent
       root_folder.append(bookmark)
 
       if report_stats: