X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=convert_st.py;h=381239fc3ab45ab38913d3fb46233764a6a87ea2;hb=c88cb7a75e7caf1d67466cfa107981d95115fa0c;hp=89bd8ab2f72cbc61aa41467ee045ae4e49b1158f;hpb=71712390f4edb041609ff7bc9272d12a5c1a9b1d;p=bookmarks_db.git

diff --git a/convert_st.py b/convert_st.py
index 89bd8ab..381239f 100755
--- a/convert_st.py
+++ b/convert_st.py
@@ -5,53 +5,57 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2012 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2017 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import sys
 
 
 def run():
-   from getopt import getopt
-   optlist, args = getopt(sys.argv[1:], "s")
+    from getopt import getopt
+    optlist, args = getopt(sys.argv[1:], "s")
 
-   report_stats = 1
+    report_stats = 1
 
-   for _opt, _arg in optlist:
-      if _opt == '-s':
-         report_stats = 0
-   try:
-      del _opt, _arg
-   except NameError:
-      pass
+    for _opt, _arg in optlist:
+        if _opt == '-s':
+            report_stats = 0
+    try:
+        del _opt, _arg
+    except NameError:
+        pass
 
-   if len(args) <> 1:
-      sys.stderr.write("convert_st: too many or too few arguments\n")
-      sys.stderr.write("Usage: convert_st [-s] new_storage\n")
-      sys.exit(1)
+    if len(args) != 1:
+        sys.stderr.write("convert_st: too many or too few arguments\n")
+        sys.stderr.write("Usage: convert_st [-s] new_storage\n")
+        sys.exit(1)
 
-   from storage import storage, import_storage
-   storage = storage()
+    from bkmk_objects import parse_params, set_params
+    from storage import storage, import_storage
 
-   new_storage = import_storage(args[0])
-   new_storage = new_storage()
+    storage = storage()
 
-   if report_stats:
-      sys.stdout.write("Loading %s: " % storage.filename)
-      sys.stdout.flush()
+    storage_name, storage_params = parse_params(args[0])
+    new_storage = import_storage(storage_name)
+    set_params(new_storage, storage_params)
+    new_storage = new_storage()
 
-   root_folder = storage.load()
+    if report_stats:
+        sys.stdout.write("Loading %s: " % storage.filename)
+        sys.stdout.flush()
 
-   if report_stats:
-      print "Ok"
-      sys.stdout.write("Converting to %s: " % new_storage.filename)
-      sys.stdout.flush()
+    root_folder = storage.load()
 
-   new_storage.store(root_folder)
+    if report_stats:
+        print("Ok")
+        sys.stdout.write("Converting to %s: " % new_storage.filename)
+        sys.stdout.flush()
 
-   if report_stats:
-      print "Ok"
+    new_storage.store(root_folder)
+
+    if report_stats:
+        print("Ok")
 
 
 if __name__ == '__main__':
-   run()
+    run()