Add fcploadplugin

fcp/__init__.py

@@ -12,7 +12,7 @@
 #from invertkey import main as invertkey
 #from redirect import main as redirect
 #from names import main as names
-import upload, put, get, genkey, invertkey, redirect, names
+import upload, put, get, genkey, invertkey, redirect, names, loadplugin
 import fproxyproxy
 #import fproxyaddref
 import pseudopythonparser
@@ -28,7 +28,7 @@
            'ConnectionRefused', 'FCPException', 'FCPPutFailed',
            'FCPProtocolError',
            'get', 'put', 'genkey', 'invertkey', 'redirect', 'names',
-           'fproxyproxy', "fproxyaddref",
+           'fproxyproxy', "fproxyaddref", "loadplugin",
            ]
 
 if not isDoze:

fcp/loadplugin.py

@@ -0,0 +1,100 @@
+"""
+load a freenet plugin
+
+This is the guts of the command-line front-end app fcploadplugin
+"""
+
+#@+others
+#@+node:imports
+import argparse
+import sys
+import traceback
+import os.path
+from urlparse import urlparse
+
+from . import node
+from .arguments import add_default_arguments
+
+#@-node:imports
+#@+node:globals
+
+#@-node:globals
+#@+node:usage
+def create_parser():
+    '''
+    Creates an argparse parser.
+    '''
+    parser = argparse.ArgumentParser(
+        prog='fcploadplugin',
+        description='''
+            A simple command-line freenet load plugin command.
+
+            Loads a plugin to the running node.
+        ''',
+    )
+    add_default_arguments(parser)
+
+    parser.add_argument(
+        'plugin_uri',
+        help='''
+            A URI that points to the plugin location. 
+        ''',
+    )
+
+    return parser
+
+#@-node:help
+#@+node:main
+def main(argv=sys.argv[1:]):
+    """
+    Front end for fcploadplugin utility
+    """
+
+    # default job options
+    verbosity = node.ERROR
+    verbose = False
+
+    parser = create_parser()
+    args = parser.parse_args(argv)
+    uri = args.plugin_uri
+
+    keytypes = ["USK", "KSK", "SSK", "CHK"]
+
+    if os.path.isfile(uri) \
+    or os.path.islink(uri) and os.path.isfile(os.path.realpath(uri)):
+        if uri.endswith(".jar"):
+            plugin_uri = uri
+    elif urlparse(uri).scheme != "":
+        plugin_uri = uri
+    else:
+        if not uri.startswith("freenet:"):
+            uri = "freenet:" + uri
+        if uri[len("freenet:"):len("freenet:")+3] in keytypes:
+            plugin_uri = uri
+
+    try:
+        plugin_uri
+    except NameError:
+        sys.stderr.write("The given plugin uri is not valid.\n")
+        sys.exit(1)
+
+    # try to create the node
+    try:
+        fcp_node = node.FCPNode(host=args.fcphost, port=args.fcpport, verbosity=verbosity,
+                         logfile=sys.stderr)
+    except:
+        if verbose:
+            traceback.print_exc(file=sys.stderr)
+        sys.stderr.write("Failed to connect to FCP service at %s:%d\n" % (args.fcphost, args.fcpport))
+        sys.exit(2)
+
+    # send the LoadPlugin request
+    fcp_node.fcpLoadPlugin(plugin_uri)
+
+    fcp_node.shutdown()
+
+    # successful
+    print "Plugin successfully loaded."
+
+    # all done
+    sys.exit(0)

fcp/node.py

@@ -418,6 +418,27 @@ def fcpPluginMessage(self, **kw):
             params.update({'Param.%s' % str(key) : val})
 
         return self._submitCmd(id, "FCPPluginMessage", **params)
+
+    def fcpLoadPlugin(self, plugin_uri, **kw):
+        """
+        Sends an LoadPlugin message
+
+        Keywords:
+            - PluginURL - An URI that point to the plugin location
+            - URLType - Type of plugin source. (currently autodection does not work if
+              the local file does not exist or type is 'url'), default Attempts autodetect
+            - Store - If true, the plugin url is written to config, default false
+            - OfficialSource - Means of obtaining an official plugin: freenet or HTTPS
+        """
+
+        id = kw.pop("id", None)
+        if not id:
+            id = self._getUniqueId()
+
+        params = dict(Identifier = id,
+                      PluginURL  = plugin_uri)
+
+        return self._submitCmd(id, "LoadPlugin", **params)
 
     #@+node:get
     def get(self, uri, **kw):
@@ -2409,6 +2430,15 @@ def _on_rxMsg(self, msg):
             job.callback('successful', job.msgs)
             job._putResult(job.msgs)
             return   
+
+        # -----------------------------
+        # handle LoadPlugin replies
+
+        if hdr == 'PluginInfo':
+            job._appendMsg(msg)
+            job.callback('successful', job.msgs)
+            job._putResult(job.msgs)
+            return
 
         # -----------------------------
         # handle peer management messages

fcploadplugin

@@ -0,0 +1,3 @@
+#!/usr/bin/env python2
+import fcp
+fcp.loadplugin.main()

setup.py

@@ -7,7 +7,7 @@
 
 scripts = ["freesitemgr", "pyNodeConfig", 
            "fcpget", "fcpput", "fcpupload", "fcpgenkey", "fcpinvertkey", "fcpredirect", "fcpnames", 
-           "fproxyproxy"# , "freedisk"  # <- not yet reviewed
+           "fproxyproxy", "loadplugin"# , "freedisk"  # <- not yet reviewed
            ]
 if doze:
     for i in range(len(scripts)):