Changeset 5821

Timestamp:

May 12, 2008, 5:54:57 PM (14 years ago)

Author:

charles

Message:

add benc-to-json conversion + unit tests.

Location:

trunk/libtransmission

Files:

• bencode-test.c (modified) (4 diffs)
• bencode.c (modified) (4 diffs)
• bencode.h (modified) (1 diff)

trunk/libtransmission/bencode-test.c

@@ -272 +272 @@
 
 static int
-testPHPSnippet( const char * benc_str, const char * expected )
+testJSONSnippet( const char * benc_str, const char * expected )
 {
     tr_benc top;
     char * serialized;
     tr_bencLoad( benc_str, strlen( benc_str ), &top, NULL );
-    serialized = tr_bencSaveAsSerializedPHP( &top, NULL );
+    serialized = tr_bencSaveAsJSON( &top, NULL );
     check( !strcmp( serialized, expected ) );
     tr_free( serialized );
@@ -285 +285 @@
 
 static int
-testPHP( void )
+testJSON( void )
 {
     int val;
@@ -292 +292 @@
 
     benc_str = "i6e";
-    expected = "i:6;";
-    if(( val = testPHPSnippet( benc_str, expected )))
+    expected = "6";
+    if(( val = testJSONSnippet( benc_str, expected )))
         return val;
 
-    benc_str = "d3:cow3:moo4:spam4:eggse";
-    expected = "a:2:{s:3:\"cow\";s:3:\"moo\";s:4:\"spam\";s:4:\"eggs\";}";
-    if(( val = testPHPSnippet( benc_str, expected )))
+    benc_str = "d5:helloi1e5:worldi2ee";
+    expected = "{ \"hello\": 1, \"world\": 2 }"; 
+    if(( val = testJSONSnippet( benc_str, expected )))
         return val;
 
-    benc_str = "l3:cow3:moo4:spam4:eggse";
-    expected = "a:4:{i:0;s:3:\"cow\";i:1;s:3:\"moo\";i:2;s:4:\"spam\";i:3;s:4:\"eggs\";}";
-    if(( val = testPHPSnippet( benc_str, expected )))
+    benc_str = "d5:helloi1e5:worldi2e3:fooli1ei2ei3ee";
+    expected = "{ \"foo\": [ 1, 2, 3 ], \"hello\": 1, \"world\": 2 }";
+    if(( val = testJSONSnippet( benc_str, expected )))
+        return val;
+
+    benc_str = "d5:helloi1e5:worldi2e3:fooli1ei2ei3ed1:ai0eee";
+    expected = "{ \"foo\": [ 1, 2, 3, { \"a\": 0 } ], \"hello\": 1, \"world\": 2 }";
+    if(( val = testJSONSnippet( benc_str, expected )))
         return val;
 
@@ -355 +360 @@
         return i;
 
-    if(( i = testPHP( )))
+    if(( i = testJSON( )))
         return i;
 

trunk/libtransmission/bencode.c

@@ -1013 +1013 @@
 struct ParentState
 {
-    int type;
-    int index;
+    int bencType;
+    int childIndex;
+    int childCount;
 };
  
-struct phpWalk
+struct jsonWalk
 {
     tr_list * parents;
@@ -1024 +1025 @@
 
 static void
-phpChildFunc( struct phpWalk * data )
+jsonChildFunc( struct jsonWalk * data )
 {
     if( data->parents )
@@ -1030 +1031 @@
         struct ParentState * parentState = data->parents->data;
 
-        if( parentState->type == TYPE_LIST )
-            evbuffer_add_printf( data->out, "i:%d;", parentState->index++ );
-    }
-}
-
-static void
-phpPushParent( struct phpWalk * data, int type )
+        switch( parentState->bencType )
+        {
+            case TYPE_DICT: {
+                const int i = parentState->childIndex++;
+                if( ! ( i % 2 ) )
+                    evbuffer_add_printf( data->out, ": " );
+                else if( parentState->childIndex < parentState->childCount )
+                    evbuffer_add_printf( data->out, ", " );
+                else
+                    evbuffer_add_printf( data->out, " }" );
+                break;
+            }
+
+            case TYPE_LIST: {
+                if( ++parentState->childIndex < parentState->childCount )
+                    evbuffer_add_printf( data->out, ", " );
+                else
+                    evbuffer_add_printf( data->out, " ]" );
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+}
+
+static void
+jsonPushParent( struct jsonWalk * data, const tr_benc * benc )
 {
     struct ParentState * parentState = tr_new( struct ParentState, 1 );
-    parentState->type = type;
-    parentState->index = 0;
+    parentState->bencType = benc->type;
+    parentState->childIndex = 0;
+    parentState->childCount = benc->val.l.count;
     tr_list_prepend( &data->parents, parentState );
 }
 
 static void
-phpPopParent( struct phpWalk * data )
+jsonPopParent( struct jsonWalk * data )
 {
     tr_free( tr_list_pop_front( &data->parents ) );
@@ -1051 +1075 @@
 
 static void
-phpIntFunc( const tr_benc * val, void * vdata )
-{
-    struct phpWalk * data = vdata;
-    phpChildFunc( data );
-    evbuffer_add_printf( data->out, "i:%"PRId64";", val->val.i );
-}
-static void
-phpStringFunc( const tr_benc * val, void * vdata )
-{
-    struct phpWalk * data = vdata;
-    phpChildFunc( data );
-    evbuffer_add_printf( data->out, "s:%d:\"%s\";", val->val.s.i, val->val.s.s );
-}
-static void
-phpDictBeginFunc( const tr_benc * val, void * vdata )
-{
-    struct phpWalk * data = vdata;
-    phpChildFunc( data );
-    phpPushParent( data, TYPE_DICT );
-    evbuffer_add_printf( data->out, "a:%d:{", val->val.l.count/2 );
-}
-static void
-phpListBeginFunc( const tr_benc * val, void * vdata )
-{
-    struct phpWalk * data = vdata;
-    phpChildFunc( data );
-    phpPushParent( data, TYPE_LIST );
-    evbuffer_add_printf( data->out, "a:%d:{", val->val.l.count );
-}
-static void
-phpContainerEndFunc( const tr_benc * val UNUSED, void * vdata )
-{
-    struct phpWalk * data = vdata;
-    phpPopParent( data );
-    evbuffer_add_printf( data->out, "}" );
+jsonIntFunc( const tr_benc * val, void * vdata )
+{
+    struct jsonWalk * data = vdata;
+    evbuffer_add_printf( data->out, "%"PRId64, val->val.i );
+    jsonChildFunc( data );
+}
+static void
+jsonStringFunc( const tr_benc * val, void * vdata )
+{
+    struct jsonWalk * data = vdata;
+    const char *it, *end;
+    evbuffer_add_printf( data->out, "\"" );
+    for( it=val->val.s.s, end=it+val->val.s.i; it!=end; ++it )
+    {
+        switch( *it ) {
+            case '"' : evbuffer_add_printf( data->out, "\\\"" ); break;
+            case '/' : evbuffer_add_printf( data->out, "\\/" ); break;
+            case '\b': evbuffer_add_printf( data->out, "\\b" ); break;
+            case '\f': evbuffer_add_printf( data->out, "\\f" ); break;
+            case '\n': evbuffer_add_printf( data->out, "\\n" ); break;
+            case '\r': evbuffer_add_printf( data->out, "\\n" ); break;
+            case '\t': evbuffer_add_printf( data->out, "\\n" ); break;
+            case '\\': evbuffer_add_printf( data->out, "\\\\" ); break;
+            default:   evbuffer_add_printf( data->out, "%c", *it ); break;
+        }
+    }
+    evbuffer_add_printf( data->out, "\"" );
+    jsonChildFunc( data );
+}
+static void
+jsonDictBeginFunc( const tr_benc * val, void * vdata )
+{
+    struct jsonWalk * data = vdata;
+    jsonPushParent( data, val );
+    evbuffer_add_printf( data->out, "{ " );
+}
+static void
+jsonListBeginFunc( const tr_benc * val, void * vdata )
+{
+    struct jsonWalk * data = vdata;
+    jsonPushParent( data, val );
+    evbuffer_add_printf( data->out, "[ " );
+}
+static void
+jsonContainerEndFunc( const tr_benc * val UNUSED, void * vdata )
+{
+    struct jsonWalk * data = vdata;
+    jsonPopParent( data );
+    jsonChildFunc( data );
 }
 char*
-tr_bencSaveAsSerializedPHP( const tr_benc * top, int * len )
+tr_bencSaveAsJSON( const tr_benc * top, int * len )
 {
     char * ret;
     struct WalkFuncs walkFuncs;
-    struct phpWalk data;
+    struct jsonWalk data;
 
     data.out = evbuffer_new( );
     data.parents = NULL;
 
-    walkFuncs.intFunc = phpIntFunc;
-    walkFuncs.stringFunc = phpStringFunc;
-    walkFuncs.dictBeginFunc = phpDictBeginFunc;
-    walkFuncs.listBeginFunc = phpListBeginFunc;
-    walkFuncs.containerEndFunc = phpContainerEndFunc;
+    walkFuncs.intFunc = jsonIntFunc;
+    walkFuncs.stringFunc = jsonStringFunc;
+    walkFuncs.dictBeginFunc = jsonDictBeginFunc;
+    walkFuncs.listBeginFunc = jsonListBeginFunc;
+    walkFuncs.containerEndFunc = jsonContainerEndFunc;
 
     bencWalk( top, &walkFuncs, &data );

trunk/libtransmission/bencode.h

@@ -117 +117 @@
 
 char*  tr_bencSave( const tr_benc * val, int * len );
-char*  tr_bencSaveAsSerializedPHP( const tr_benc * top, int * len );
+char*  tr_bencSaveAsJSON( const tr_benc * top, int * len );
 int    tr_bencSaveFile( const char * filename, const tr_benc * );
 int    tr_bencLoadFile( const char * filename, tr_benc * );