Pass subproc parameter to the subprocess to allow different robots

diff --git a/Robots/bkmk_rforking.py b/Robots/bkmk_rforking.py
index 6ca35efd8231f9448761bc707bed77c75e3a6f3f..e1b4ee24a74d3717317855e8cb9eede270f9f423 100644 (file)
--- a/Robots/bkmk_rforking.py
+++ b/Robots/bkmk_rforking.py
@@ -44,8 +44,17 @@ def restart_subp(log):
    subp_pipe = RecordFile(check_subp)
 
 
+_set_subproc = True
+
 class robot_forking(Robot):
+   subproc = 'urllib' # Default subprocess
+
    def check_url(self, bookmark):
+      global _set_subproc
+      if _set_subproc:
+         _set_subproc = False
+         os.environ['BKMK_ROBOT'] = self.subproc
+
       if not check_subp:
          restart_subp(self.log) # Not restart, just start afresh
 

diff --git a/Robots/bkmk_rforking_sub.py b/Robots/bkmk_rforking_sub.py
index 73956e246d6b02342e3256248bc7e90639c8b501..7dd1f5fa7b7da797bff902338afe0507665e4335 100755 (executable)
--- a/Robots/bkmk_rforking_sub.py
+++ b/Robots/bkmk_rforking_sub.py
@@ -14,7 +14,7 @@ __all__ = []
 
 import sys, os
 
-lib_dir = os.path.normpath(os.path.dirname(sys.argv[0]) + os.sep + os.pardir)
+lib_dir = os.path.normpath(os.path.join(os.path.dirname(sys.argv[0]), os.pardir))
 sys.path.append(lib_dir) # for bkmk_objects.py
 
 try:
@@ -32,8 +32,8 @@ def run():
 
    from m_lib.flog import openlog
    log = openlog("check2.log")
-   from bkmk_rurllib import robot_urllib
-   robot = robot_urllib(log)
+   from robots import robot
+   robot = robot(log)
 
    while 1:
       bookmark = pickle.loads(bkmk_in.read_record())

diff --git a/doc/ANNOUNCE b/doc/ANNOUNCE
index 8e06cdd97ee505a425207ce1277d08f0711a95e0..76f6f428222e79e3f3fbeae4e5cbb58969fa10ed 100644 (file)
--- a/doc/ANNOUNCE
+++ b/doc/ANNOUNCE
@@ -23,6 +23,8 @@ WHAT'S NEW in version 4.6.0 (2014-06-??)
    BKMK_ROBOT=forking:subproc=urllib or
    BKMK_STORAGE=json:filename=bookmarks_db.json.
 
+   Pass subproc parameter to the subprocess to allow different robots.
+
 
 WHERE TO GET
    Home page:  http://phdru.name/Software/Python/#bookmarks_db
@@ -31,6 +33,7 @@ WHERE TO GET
 
    Requires: Python 2.5+, m_lib 2.0+.
 
+
 AUTHOR
    Oleg Broytman <phd@phdru.name>
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8919e53a2ef8673af79965db052e7b3f16d9b646..cc441e75c78f0bdcacdca8616d00e696aa942271 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -15,6 +15,8 @@ WHAT'S NEW in version 4.6.0 (2014-06-??)
    BKMK_ROBOT=forking:subproc=urllib or
    BKMK_STORAGE=json:filename=bookmarks_db.json.
 
+   Pass subproc parameter to the subprocess to allow different robots.
+
 
 WHAT'S NEW in version 4.5.6 (2014-01-14)