Commit: d92a9b5e33476e743dfb1a63b37c20f43131ff38 - todocmd (git)

*NIXコンソール用Google ToDo(Tasks) クライアント

Commit MetaInfo

• Revision: d92a9b5e33476e743dfb1a63b37c20f43131ff38 (tree)
• Zeit: 2020-02-17 22:04:20
• Autor: Koine Yuusuke(koinec) <koinec@user...>
• Commiter: Koine Yuusuke(koinec)

Log Message

• WorkBackup
  

Ändern Zusammenfassung

• modified: src/libtodo_define.h
• modified: src/libtodo_glapi_list.c
• modified: src/libtodo_glapi_task.c

Diff

--- a/src/libtodo_define.h
+++ b/src/libtodo_define.h
@@ -36,6 +36,24 @@ TODOCMDTODOCMDTODOCMDTODOCMDTODOCMDTODOCMDTODOCMDTODOCMDTODOCMDTODOCMDTODO*/
 #define	GLAPI_JSON_KEY_ACCESS_TOKEN		"access_token"
 #define	GLAPI_JSON_KEY_REFRESH_TOKEN	"refresh_token"
 #define GLAPI_JSON_KEY_TOKEN_TYPE		"token_type"
+
+#define	JSON_KEY_LISTS_KIND				"\"tasks#taskLists\""
+#define	JSON_KEY_LISTS_ITEMS			"items"
+
+#define	JSON_KEY_LIST_KIND				"\"tasks#taskList\""
+#define	JSON_KEY_LIST_ID				"id"
+#define	JSON_KEY_LIST_TITLE				"title"
+#define	JSON_KEY_LIST_UPDATED			"updated"
+
+#define	JSON_KEY_TASKS_KIND				"\"tasks#tasks\""
+#define	JSON_KEY_TASKS_NEXTPAGETOKEN	"nextPageToken"
+#define	JSON_KEY_TASKS_ITEMS			"items"				
+
+#define	JSON_KEY_TASK_PARENT			"parent"			
+#define	JSON_KEY_TASK_POSITION			"position"				
+#define	JSON_KEY_TASK_ID				"id"				
+#define	JSON_KEY_TASK_TITLE				"title"				
+#define	JSON_KEY_TASK_UPDATED			"updated"				
 	
 #endif
 

--- a/src/libtodo_glapi_list.c
+++ b/src/libtodo_glapi_list.c
@@ -65,12 +65,12 @@ int
 	// Parse & Inset ListData ---
 	p_json	= json_tokener_parse( (const char *)t_glresult.pb_result );
 
-	if( 0x00 != ProcJson_CheckKind( p_json, "\"tasks#taskLists\"" ) )	{
+	if( 0x00 != ProcJson_CheckKind( p_json, JSON_KEY_LISTS_KIND ) )	{
 		i_result	= -0x02;
 		goto	goto_GLAPI_List_GetTaskList_putjson;
 	}
 
-	p_jitems	= ProcJson_GetJsonChildArray( p_json, "items" );
+	p_jitems	= ProcJson_GetJsonChildArray( p_json, JSON_KEY_LISTS_ITEMS );
 	if( NULL == p_jitems )	{
 		i_result	= -0x03;
 		goto	goto_GLAPI_List_GetTaskList_putjson;
@@ -90,20 +90,20 @@ int
 		assert( NULL != p_tdata );
 
 		// kind
-		if( 0x00 != ProcJson_CheckKind( p_jlist, "\"tasks#taskList\"" ) )	{
+		if( 0x00 != ProcJson_CheckKind( p_jlist, JSON_KEY_LIST_KIND ) )	{
 			i_result	= -0x05;
 			goto	goto_GLAPI_List_GetTaskList_putjson;
 		}
 	
 		// id
-		ProcJson_GetJsonChildString( p_tdata->str_id, p_jlist, "id", 64 );
+		ProcJson_GetJsonChildString( p_tdata->str_id, p_jlist, JSON_KEY_LIST_ID, 64 );
 		strncpy( p_tdata->t_data.str_id, p_tdata->str_id, 64 );		// copy.
 		p_tdata->dw_hash	= Common_CalcDJBhash( p_tdata->str_id );
 		// etag: NOT USE.
 		// title
-		ProcJson_GetJsonChildString( p_tdata->t_data.str_item, p_jlist, "title", 512 );
+		ProcJson_GetJsonChildString( p_tdata->t_data.str_item, p_jlist, JSON_KEY_LIST_TITLE, 512 );
 		// updated
-		ProcJson_GetJsonChildString( p_tdata->t_data.str_update, p_jlist, "updated", 32 );
+		ProcJson_GetJsonChildString( p_tdata->t_data.str_update, p_jlist, JSON_KEY_LIST_UPDATED, 32 );
 		// selflink: NOT USE.
 
 		// level

--- a/src/libtodo_glapi_task.c
+++ b/src/libtodo_glapi_task.c
@@ -59,31 +59,32 @@ int
 	json_object		*p_jtask;
 	ToDo_Data		*p_tdata;
 
-	if( 0x00 != ProcJson_CheckKind( p_json, "\"tasks#tasks\"" ) )	{
+	if( 0x00 != ProcJson_CheckKind( p_json, JSON_KEY_TASKS_KIND ) )	{
 		i_result	= -0x01;
 		goto	goto_GLAPI_Tasks_GetTask_RegistTaskfromJson_post;
 	}
 
-	ProcJson_GetJsonChildString( pstr_nexttoken, p_json, "nextPageToken", 255 );
+	ProcJson_GetJsonChildString( pstr_nexttoken, p_json, JSON_KEY_TASKS_NEXTPAGETOKEN, 255 );
 
-	p_jitems	= ProcJson_GetJsonChildArray( p_json, "items" );
+	p_jitems	= ProcJson_GetJsonChildArray( p_json, JSON_KEY_TASKS_ITEMS );
 	if( NULL == p_jitems )	{
 		i_result	= -0x02;
 		goto	goto_GLAPI_Tasks_GetTask_RegistTaskfromJson_post;
 	}
+
 	for( i_cnt = 0; i_cnt < json_object_array_length( p_jitems ); i_cnt++ )	{
 		str_parentid[0]	= '\0';
 		p_jtask	= json_object_array_get_idx( p_jitems, i_cnt );
 		assert( NULL != p_jtask );
 
 		// parent:
-		ProcJson_GetJsonChildString( str_parentid, p_jtask, "parent", 64 );
+		ProcJson_GetJsonChildString( str_parentid, p_jtask, JSON_KEY_TASK_PARENT, 64 );
 		if( '\0' != str_parentid[0] )	{ b_type	= TODODATA_TYPE_SUB; }
 		else							{ b_type	= TODODATA_TYPE_TASK; }
 		i_tparent	= p_tlist->i_id;
 
 		// position:
-		ProcJson_GetJsonChildString( str_position, p_jtask, "position", 32 );
+		ProcJson_GetJsonChildString( str_position, p_jtask, JSON_KEY_TASK_POSITION, 32 );
 		qw_position	= Common_ConvStr2QWord( str_position );
 
 		// Alloc ToDo Data ---
@@ -104,14 +105,14 @@ int
 		}
 		*/
 		// id
-		ProcJson_GetJsonChildString( p_tdata->str_id, p_jtask, "id", 64 );
+		ProcJson_GetJsonChildString( p_tdata->str_id, p_jtask, JSON_KEY_TASK_ID, 64 );
 		strncpy( p_tdata->t_data.str_id, p_tdata->str_id, 64 );		// Copy.
 		p_tdata->dw_hash	= Common_CalcDJBhash( p_tdata->str_id );
 		// etag: NOT USE.
 		// title
-		ProcJson_GetJsonChildString( p_tdata->t_data.str_item, p_jtask, "title", 512 );
+		ProcJson_GetJsonChildString( p_tdata->t_data.str_item, p_jtask, JSON_KEY_TASK_TITLE, 512 );
 		// updated
-		ProcJson_GetJsonChildString( p_tdata->t_data.str_update, p_jtask, "updated", 32 );
+		ProcJson_GetJsonChildString( p_tdata->t_data.str_update, p_jtask, JSON_KEY_TASK_UPDATED, 32 );
 		// parentid
 		strncpy( p_tdata->str_parent, str_parentid, 64 );
 		// selflink: NOT USE.