X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk-add.py;h=860688e50acdfb520fed0c0ad848494f572f52ac;hb=b65d59b866ec851da9871afe9707f6b1e38866be;hp=921eebe5153700e0f05e4c709f87864333482e4f;hpb=fb5c3b2b91aeeb615d6d6d890491af3fdff69556;p=bookmarks_db.git

diff --git a/bkmk-add.py b/bkmk-add.py
index 921eebe..860688e 100755
--- a/bkmk-add.py
+++ b/bkmk-add.py
@@ -1,17 +1,17 @@
-#! /usr/local/bin/python -O
-"""
-   Add a bookmark to the database.
+#! /usr/bin/env python
+"""Add a bookmark to the database
+
+This file is a part of Bookmarks database and Internet robot.
 
-   Written by BroytMann, Aug 2002. Copyright (C) 2002 PhiloSoft Design
 """
 
+__author__ = "Oleg Broytman <phd@phdru.name>"
+__copyright__ = "Copyright (C) 2002-2017 PhiloSoft Design"
+__license__ = "GNU GPL"
 
-import sys, os, time, urllib
+import sys, os, time
 from bkmk_objects import Bookmark
-from Robots.bkmk_rsimple import robot_simple
-
-import tempfile
-tempfname = "bkmk-add" + tempfile.gettempprefix() + "tmp"
+from robots import robot
 
 
 def run():
@@ -31,12 +31,12 @@ def run():
    except NameError:
       pass
 
-   if len(args) <> 1:
+   if len(args) != 1:
       sys.stderr.write("bkmk-add: too many or too few arguments\n")
       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:
@@ -46,23 +46,25 @@ def run():
    root_folder = storage.load()
 
    if report_stats:
-      print "Ok"
+      print("Ok")
 
    href = args[0]
    now = int(time.time())
    bookmark = Bookmark(href, str(now), '0', '0')
    bookmark.name = ''
+   bookmark.parent = None
 
-   robot = robot_simple(tempfname, None)
-   url_type, url_rest = urllib.splittype(href)
+   global robot
+   robot = robot(None)
 
-   if robot.check_url(bookmark, url_type, url_rest): # get real title and last modified date
+   if robot.check_url(bookmark): # get real title and last modified date
       if title: # forced title
          bookmark.name = title
       elif hasattr(bookmark, "real_title"):
          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:
@@ -72,13 +74,7 @@ def run():
       storage.store(root_folder)
 
       if report_stats:
-         print "Ok"
-
-
-   try:
-      os.unlink(tempfname)
-   except os.error:
-      pass
+         print("Ok")
 
 
 if __name__ == '__main__':