Changeset 3520

Timestamp:

08/11/08 10:22:42 (4 months ago)

Author:

dgollub

Message:

Improve usage of osyncplugin and add plugin list option.
Patch by Patrick Ammann

Files:

• trunk/tools/osyncplugin.c (modified) (33 diffs)

trunk/tools/osyncplugin.c

@@ -40 +40 @@
 char *configfile = NULL;
 char *configdir = NULL;
+osync_bool pluginlist= FALSE;
 GList *sinks = NULL;
 GList *cmdlist = NULL;
@@ -88 +89 @@
  * Argument handling 
  */
-Command *new_command(Cmd cmd, const char *arg) {
+static Command *new_command(Cmd cmd, const char *arg) {
 
         Command *newcommand = malloc(sizeof(Command));
@@ -110 +111 @@
 }
 
-void free_command(Command **cmd) {
+static void free_command(Command **cmd) {
         assert(*cmd);
 
@@ -120 +121 @@
 }
 
-void usage(const char *name)
-{
+static void usage(const char *name)
+{
+        /* TODO: improve usage output */
         fprintf(stderr, "Usage: %s\n", name);
-        /* TODO: write usage output */
+        
+        fprintf (stderr, "Configuration options:\n");
+        fprintf (stderr, "[--config] \tSet config file\n");
+        fprintf (stderr, "[--configdir] \tSet different config directory. Default: ~./opensync\n");
+        
+        fprintf (stderr, "Plugin options:\n");
+        fprintf (stderr, "[--plugin] \tSet plugin\n");
+        fprintf (stderr, "[--pluginpath] \t\n");
+        fprintf (stderr, "[--pluginlist] \tShow list of plugins\n");
+        
+        fprintf (stderr, "Format options:\n");
+        fprintf (stderr, "[--formatpath] \t\n");
+        
+        fprintf (stderr, "Command options:\n");
+        fprintf (stderr, "[--initialize] \t\n");
+        fprintf (stderr, "[--connect] \t\n");
+        fprintf (stderr, "[--disconnect] \t\n");
+        fprintf (stderr, "[--finalize] \t\n");
+        fprintf (stderr, "[--slowsync] \t\n");
+        fprintf (stderr, "[--sync] \t\n");
+        fprintf (stderr, "[--fastsync] \t\n");
+        fprintf (stderr, "[--syncdone] \t\n");
+        fprintf (stderr, "[--committedall] \t\n");
+        fprintf (stderr, "[--commit] \t\n");
+        fprintf (stderr, "[--batchcommit] \t\n");
+        fprintf (stderr, "[--write] \t\n");
+        fprintf (stderr, "[--read] \t\n");
+        fprintf (stderr, "[--empty] \t\n");
 
         exit(1);
 }
 
-void parse_args(int argc, char **argv) {
+static void parse_args(int argc, char **argv) {
 
         int i;
@@ -158 +187 @@
                         if (!pluginpath)
                                 pluginpath = strdup(argv[i+1]);
+
+                        i++;
+                        continue;
+                } else if (!strcmp(arg, "--pluginlist") || !strcmp(arg, "-L")) {
+                        pluginlist= TRUE;
 
                         i++;
@@ -269 +303 @@
                 }
         }
-
+        
+        if (pluginlist)
+                return;
 
         if (!cmdlist)
@@ -288 +324 @@
  */
 
-osync_bool init(OSyncError **error) {
+static osync_bool init(OSyncError **error) {
         assert(!plugin);
         assert(!plugin_env);
@@ -388 +424 @@
 }
 
-void *plugin_initialize(OSyncError **error)
+static void *plugin_initialize(OSyncError **error)
 {
         void *plugin_data = osync_plugin_initialize(plugin, plugin_info, error);
@@ -398 +434 @@
 }
 
-void finalize_plugin(void **plugin_data)
+static void finalize_plugin(void **plugin_data)
 {
 
@@ -409 +445 @@
 
 
-OSyncObjTypeSink *find_sink(const char *objtype, OSyncError **error)
+static OSyncObjTypeSink *find_sink(const char *objtype, OSyncError **error)
 {
         assert(objtype);
@@ -422 +458 @@
 }
 
-OSyncObjTypeSink *get_main_sink()
+static OSyncObjTypeSink *get_main_sink()
 {
         return osync_plugin_info_get_main_sink(plugin_info);
 }
 
-const char *_osyncplugin_changetype_str(OSyncChange *change)
+static const char *_osyncplugin_changetype_str(OSyncChange *change)
 {
         assert(change);
@@ -456 +492 @@
 
 //typedef void (* OSyncContextChangeFn) (OSyncChange *, void *);
-void _osyncplugin_ctx_change_callback(OSyncChange *change, void *user_data)
+static void _osyncplugin_ctx_change_callback(OSyncChange *change, void *user_data)
 {
         Command *cmd = (Command *) user_data;           
@@ -476 +512 @@
 
 //typedef void (* OSyncContextCallbackFn)(void *, OSyncError *);
-void _osyncplugin_ctx_callback_getchanges(void *user_data, OSyncError *error)
+static void _osyncplugin_ctx_callback_getchanges(void *user_data, OSyncError *error)
 {
         Command *cmd = (Command *) user_data;           
@@ -491 +527 @@
 }
 
-osync_bool get_changes_sink(Command *cmd, OSyncObjTypeSink *sink, SyncType type, void *plugin_data, OSyncError **error)
+static osync_bool get_changes_sink(Command *cmd, OSyncObjTypeSink *sink, SyncType type, void *plugin_data, OSyncError **error)
 {
         assert(sink);
@@ -526 +562 @@
 }
 
-osync_bool get_changes(Command *cmd, SyncType type, void *plugin_data, OSyncError **error)
+static osync_bool get_changes(Command *cmd, SyncType type, void *plugin_data, OSyncError **error)
 {
         int num, i;
@@ -565 +601 @@
 }
 
-void _osyncplugin_ctx_callback_connect(void *user_data, OSyncError *error)
+static void _osyncplugin_ctx_callback_connect(void *user_data, OSyncError *error)
 {
         assert(user_data);
@@ -597 +633 @@
 }
 
-osync_bool connect_sink(Command *cmd, OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) {
+static osync_bool connect_sink(Command *cmd, OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) {
 
         assert(sink);
@@ -654 +690 @@
 }
 
-void _osyncplugin_ctx_callback_disconnect(void *user_data, OSyncError *error)
+static void _osyncplugin_ctx_callback_disconnect(void *user_data, OSyncError *error)
 {
         assert(user_data);
@@ -686 +722 @@
 }
 
-osync_bool disconnect_sink(Command *cmd, OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) {
+static osync_bool disconnect_sink(Command *cmd, OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) {
 
         assert(sink);
@@ -709 +745 @@
 }
 
-osync_bool disconnect(Command *cmd, void *plugin_data, OSyncError **error)
+static osync_bool disconnect(Command *cmd, void *plugin_data, OSyncError **error)
 {
         
@@ -768 +804 @@
 }
 
-osync_bool commit_sink(OSyncObjTypeSink *sink, OSyncChange *change, void *plugin_data, OSyncError **error) {
+static osync_bool commit_sink(OSyncObjTypeSink *sink, OSyncChange *change, void *plugin_data, OSyncError **error) {
 
         assert(sink);
@@ -796 +832 @@
 }
 
-osync_bool commit(Command *cmd, OSyncChange *change, void *plugin_data, OSyncError **error)
+static osync_bool commit(Command *cmd, OSyncChange *change, void *plugin_data, OSyncError **error)
 {
         assert(change);
@@ -831 +867 @@
 }
 
-osync_bool empty(Command *cmd, void *plugin_data, OSyncError **error)
+static osync_bool empty(Command *cmd, void *plugin_data, OSyncError **error)
 {
         int i;
@@ -857 +893 @@
 }
 
-void _osyncplugin_ctx_callback_syncdone(void *user_data, OSyncError *error)
+static void _osyncplugin_ctx_callback_syncdone(void *user_data, OSyncError *error)
 {
         assert(user_data);
@@ -881 +917 @@
 }
 
-osync_bool syncdone_sink(OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) {
+static osync_bool syncdone_sink(OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) {
 
         assert(sink);
@@ -903 +939 @@
 }
 
-osync_bool syncdone(Command *cmd, void *plugin_data, OSyncError **error)
+static osync_bool syncdone(Command *cmd, void *plugin_data, OSyncError **error)
 {
         
@@ -937 +973 @@
 }
 
-void _osyncplugin_ctx_callback_committedall(void *user_data, OSyncError *error)
+static void _osyncplugin_ctx_callback_committedall(void *user_data, OSyncError *error)
 {
         assert(user_data);
@@ -960 +996 @@
 }
 
-osync_bool committedall_sink(OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) {
+static osync_bool committedall_sink(OSyncObjTypeSink *sink, void *plugin_data, OSyncError **error) {
 
         assert(sink);
@@ -982 +1018 @@
 }
 
-osync_bool committedall(Command *cmd, void *plugin_data, OSyncError **error)
+static osync_bool committedall(Command *cmd, void *plugin_data, OSyncError **error)
 {
         int i, num;
@@ -1018 +1054 @@
  * Sync Flow
  */
-osync_bool run_command(Command *cmd, void **plugin_data, OSyncError **error) {
+static osync_bool run_command(Command *cmd, void **plugin_data, OSyncError **error) {
 
         assert(cmd);
@@ -1116 +1152 @@
 }
 
+static osync_bool plugin_list(OSyncError **error) {
+        int num;
+        int i;
+        
+        assert(!plugin_env);
+
+        if (!(plugin_env = osync_plugin_env_new(error)))
+                goto error;
+
+        if (!(format_env = osync_format_env_new(error)))
+                goto error_free_pluginenv;
+
+        if (!osync_format_env_load_plugins(format_env, formatpath, error))
+                goto error_free_formatenv;
+
+        if (!osync_plugin_env_load(plugin_env, pluginpath, error))
+                goto error_free_formatenv;
+
+        num= osync_plugin_env_num_plugins(plugin_env);
+        for(i= 0; i < num; i++) {
+                OSyncPlugin* plugin= osync_plugin_env_nth_plugin(plugin_env, i);
+                fprintf (stdout, "Name:        %s\n", osync_plugin_get_name(plugin));
+                fprintf (stdout, "Description: %s\n", osync_plugin_get_description(plugin));            
+        } 
+        return TRUE;
+        
+error_free_formatenv:
+        osync_format_env_free(format_env);
+        format_env = NULL;
+error_free_pluginenv:
+        osync_plugin_env_free(plugin_env);
+        plugin_env = NULL;
+error:  
+        return FALSE;
+}
+
 int main(int argc, char **argv) {
 
@@ -1126 +1198 @@
 
         parse_args(argc, argv);
+        
+        if (pluginlist) {
+                if (!plugin_list(&error))
+                        goto error;
+                        
+                goto success;
+        }
 
         if (!init(&error))
@@ -1136 +1215 @@
 
         /* TODO: free command list - for easier memory leak checking */
-
+success:
         if (plugin_env)
                 osync_plugin_env_free(plugin_env);