Changeset f15553d

Timestamp:

2015-04-12T15:04:55Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

531eabd

Parents:

c5a7b8d

Message:

Common set evaluator that sends updates to the RPC server if online.

Files:

• protocols/rpc/rpc.c (modified) (3 diffs)
• python/implugin.py (modified) (2 diffs)

protocols/rpc/rpc.c

@@ -155 +155 @@
 }
 
+static char *rpc_set_evaluator(set_t *set, char *value);
+
 static void rpc_init(account_t *acc) {
         struct rpc_plugin *pd = acc->prpl->data;
@@ -164 +166 @@
                  * terrible idea. As was JSON, but hey. */
                 set->flags |= (int) json_object_get_number(o, "flags");
-                const char *eval = json_object_get_string(o, "type");
-                if (eval == NULL) {
-                } else if (strcmp(eval, "int") == 0) {
-                        set->eval = set_eval_int;
-                } else if (strcmp(eval, "bool") == 0) {
-                        set->eval = set_eval_bool;
-                } else {
-                        /* Default is string which means no evaluator. */
-                }
+                set->eval = rpc_set_evaluator;
+                set->eval_data = o;
                 /* eval_list turns out to be a memory leak so don't implement it
                  * for now.
@@ -184 +179 @@
 
         acc->flags |= pd->account_flags;
+}
+
+static char *rpc_set_evaluator(set_t *set, char *value) {
+        JSON_Object *o = set->eval_data;
+        const char *type = json_object_get_string(o, "type");
+
+        /* Just allow two simple int/bool evaluators with no protocol awareness. */
+        set_eval type_eval = NULL;
+        if (type == NULL) {
+        } else if (strncmp(type, "int", 3) == 0) {
+                type_eval = set_eval_int;
+        } else if (strncmp(type, "bool", 4) == 0) {
+                type_eval = set_eval_bool;
+        }
+
+        if (type_eval) {
+                char *new = type_eval(set, value);
+                if (new == SET_INVALID) {
+                        return SET_INVALID;
+                }
+        }
+
+        account_t *acc = set->data;
+        if (acc->ic) {
+                /* But do send RPCs to the plugin for each changed setting so
+                 * it always has up-to-date values. */
+                RPC_OUT_INIT("set_set");
+                json_array_append_string(params, set->key);
+                if (type_eval == set_eval_int) {
+                        int num = 0;
+                        /* Evaluator already did validation so ignore retval. */
+                        sscanf(value, "%d", &num);
+                        json_array_append_number(params, num);
+                } else if (type_eval == set_eval_bool) {
+                        json_array_append_boolean(params, bool2int(value));
+                } else {
+                        json_array_append_string(params, value);
+                }
+                rpc_send(acc->ic, rpc);
+        }
+
+        return value;
 }
 

python/implugin.py

@@ -77 +77 @@
                                 "oauth": {
                                         "default": "off",
+                                        "type": "bool",
                                 },
                                 "test": {
                                         "default": "123",
+                                        "type": "int",
                                 },
+                                "stringetje": {
+                                        "default": "testje",
+                                        "flags": 0x04,
+                                }
                         },
                 }
@@ -104 +110 @@
         def set_away(self, state, message):
                 print "You're a slacker: %s (%r)" % (state, message)
+        
+        def set_set(self, setting, value):
+                print "Setting %s changed to %r" % (setting, value)
 
 def RunPlugin(plugin, debug=True):