Changeset 18e317ff4b60adafc6bf135aa876f78589a4a6f7

Timestamp:

11/18/10 04:34:47 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

dba04d196e2e2a298a7d867d70862d3d4496bace

Parents:

86ec7c7fbd6bbaef02a2bc380d46a2610b7c1d9e

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-18T04:34:47Z+0200

Message:

ladishd: expose project description and notes over D-Bus

Location:

daemon

Files:

• room.c (modified) (7 diffs)
• room_internal.h (modified) (1 diff)

daemon/room.c

@@ -287 +287 @@
   room_ptr->project_name = NULL;
   room_ptr->project_dir = NULL;
+  room_ptr->project_description = NULL;
+  room_ptr->project_notes = NULL;
   room_ptr->project_state = ROOM_PROJECT_STATE_UNLOADED;
 
@@ -378 +380 @@
   /* project has either both name and dir no none of them */
   ASSERT((room_ptr->project_dir == NULL && room_ptr->project_name == NULL) || (room_ptr->project_dir != NULL && room_ptr->project_name != NULL));
-  if (room_ptr->project_dir != NULL)
-  {
-    free(room_ptr->project_dir);
-  }
-  if (room_ptr->project_name != NULL)
-  {
-    free(room_ptr->project_name);
-  }
+  free(room_ptr->project_dir);
+  free(room_ptr->project_name);
+  free(room_ptr->project_description);
+  free(room_ptr->project_notes);
 
   if (!room_ptr->template)
@@ -840 +838 @@
   }
 
+  if (!dbus_maybe_add_dict_entry_string(&dict_iter, "description", room_ptr->project_description))
+  {
+    log_error("dbus_maybe_add_dict_entry_string() failed.");
+    return false;
+  }
+
+  if (!dbus_maybe_add_dict_entry_string(&dict_iter, "notes", room_ptr->project_notes))
+  {
+    log_error("dbus_maybe_add_dict_entry_string() failed.");
+    return false;
+  }
+
   if (!dbus_message_iter_close_container(iter_ptr, &dict_iter))
   {
@@ -884 +894 @@
   ladish_graph_remove_hidden_objects(room_ptr->graph);
 
-  if (room_ptr->project_name != NULL)
-  {
-    free(room_ptr->project_name);
-    room_ptr->project_name = NULL;
-  }
-  if (room_ptr->project_dir != NULL)
-  {
-    free(room_ptr->project_dir);
-    room_ptr->project_dir = NULL;
-  }
+  free(room_ptr->project_name);
+  room_ptr->project_name = NULL;
+
+  free(room_ptr->project_dir);
+  room_ptr->project_dir = NULL;
+
+  free(room_ptr->project_description);
+  room_ptr->project_description = NULL;
+
+  free(room_ptr->project_notes);
+  room_ptr->project_notes = NULL;
 
   room_ptr->project_state = ROOM_PROJECT_STATE_UNLOADED;
@@ -984 +995 @@
 fail:
   log_error("Ran out of memory trying to construct method return");
+}
+
+static void ladish_room_dbus_set_project_description(struct dbus_method_call * call_ptr)
+{
+  const char * str;
+  char * dup;
+
+  if (!dbus_message_get_args(call_ptr->message, &g_dbus_error, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
+    dbus_error_free(&g_dbus_error);
+    return;
+  }
+
+  if ((strlen(str) == 0 && (room_ptr->project_description == NULL || strlen(room_ptr->project_description) == 0)) ||
+      (room_ptr->project_description != NULL && strcmp(str, room_ptr->project_description) == 0))
+  {
+    method_return_new_single(call_ptr, DBUS_TYPE_UINT64, &room_ptr->name);
+    return;
+  }
+
+  dup = strdup(str);
+  if (dup == NULL)
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "strdup() failed");
+    return;
+  }
+
+  free(room_ptr->project_description);
+  room_ptr->project_description = dup;
+
+  ladish_room_emit_project_properties_changed(room_ptr); /* increments the version number */
+  method_return_new_single(call_ptr, DBUS_TYPE_UINT64, &room_ptr->version);
+}
+
+static void ladish_room_dbus_set_project_notes(struct dbus_method_call * call_ptr)
+{
+  const char * str;
+  char * dup;
+
+  if (!dbus_message_get_args(call_ptr->message, &g_dbus_error, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID))
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_INVALID_ARGS, "Invalid arguments to method \"%s\": %s",  call_ptr->method_name, g_dbus_error.message);
+    dbus_error_free(&g_dbus_error);
+    return;
+  }
+
+  if ((strlen(str) == 0 && (room_ptr->project_notes == NULL || strlen(room_ptr->project_notes) == 0)) ||
+      (room_ptr->project_notes != NULL && strcmp(str, room_ptr->project_notes) == 0))
+  {
+    method_return_new_single(call_ptr, DBUS_TYPE_UINT64, &room_ptr->name);
+    return;
+  }
+
+  dup = strdup(str);
+  if (dup == NULL)
+  {
+    lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "strdup() failed");
+    return;
+  }
+
+  free(room_ptr->project_notes);
+  room_ptr->project_notes = dup;
+
+  ladish_room_emit_project_properties_changed(room_ptr); /* increments the version number */
+  method_return_new_single(call_ptr, DBUS_TYPE_UINT64, &room_ptr->version);
 }
 
@@ -1007 +1084 @@
   METHOD_ARG_DESCRIBE_OUT("new_version", DBUS_TYPE_UINT64_AS_STRING, "New version of the project properties")
   METHOD_ARG_DESCRIBE_OUT("properties", "a{sv}", "project properties")
+METHOD_ARGS_END
+
+METHOD_ARGS_BEGIN(SetProjectDescription, "Set project description")
+  METHOD_ARG_DESCRIBE_IN("description", "s", "Project description")
+  METHOD_ARG_DESCRIBE_OUT("new_version", DBUS_TYPE_UINT64_AS_STRING, "New version of the project properties")
+METHOD_ARGS_END
+
+METHOD_ARGS_BEGIN(SetProjectNotes, "Set project notes")
+  METHOD_ARG_DESCRIBE_IN("notes", "s", "Project notes")
+  METHOD_ARG_DESCRIBE_OUT("new_version", DBUS_TYPE_UINT64_AS_STRING, "New version of the project properties")
 METHOD_ARGS_END
 
@@ -1015 +1102 @@
   METHOD_DESCRIBE(LoadProject, ladish_room_dbus_load_project) /* async */
   METHOD_DESCRIBE(GetProjectProperties, ladish_room_dbus_get_project_properties) /* sync */
+  METHOD_DESCRIBE(SetProjectDescription, ladish_room_dbus_set_project_description) /* sync */
+  METHOD_DESCRIBE(SetProjectNotes, ladish_room_dbus_set_project_notes) /* sync */
 METHODS_END
 

daemon/room_internal.h

@@ -60 +60 @@
   char * project_dir;
   char * project_name;
+  char * project_description;
+  char * project_notes;
 };