}
static u32 addon_match( addon_alias *alias ){
- u32 foldername_djb2 = vg_strdjb2( alias->foldername );
+ if( alias->type == k_addon_type_none ) return 0xffffffff;
+
+ u32 foldername_djb2 = 0;
+ if( !alias->workshop_id )
+ foldername_djb2 = vg_strdjb2( alias->foldername );
u32 count = 0;
for( u32 i=0; count<addon_system.registry_type_counts[alias->type]; i++ ){
}
}
+/*
+ * equality check
+ */
+static int addon_alias_eq( addon_alias *a, addon_alias *b ){
+ if( a->type == b->type ){
+ if( a->workshop_id == b->workshop_id ){
+ if( a->workshop_id )
+ return 1;
+ else
+ return !strcmp( a->foldername, b->foldername );
+ }
+ else
+ return 0;
+ }
+ else return 0;
+}
+
+/*
+ * make alias represent NULL.
+ */
+static void invalidate_addon_alias( addon_alias *alias ){
+ alias->type = k_addon_type_none;
+ alias->workshop_id = 0;
+ alias->foldername[0] = '\0';
+}
+
/*
* parse uid to alias. returns 1 if successful
*/
* |
* location
*/
- if( strlen(uid) < 13 ) return 0;
- if( !((uid[0] == 's') && (uid[1] == 'r')) ) return 0;
+ if( strlen(uid) < 13 ){
+ invalidate_addon_alias( alias );
+ return 0;
+ }
+ if( !((uid[0] == 's') && (uid[1] == 'r')) ){
+ invalidate_addon_alias( alias );
+ return 0;
+ }
char type[4];
memcpy( type, uid+2, 3 );
alias->workshop_id = 0;
vg_strncpy( uid+12, alias->foldername, 64, k_strncpy_always_add_null );
}
- else
+ else{
+ invalidate_addon_alias( alias );
return 0;
+ }
return 1;
}
}
enum addon_type type = k_addon_type_none;
- vg_msg root = {0};
- root.buf = reg->metadata;
- root.len = reg->metadata_len;
- root.max = sizeof(reg->metadata);
+ vg_msg msg;
+ vg_msg_init( &msg, reg->metadata, reg->metadata_len );
- vg_msg workshop = root;
- if( vg_msg_seekframe( &workshop, "workshop", k_vg_msg_first )){
- type = vg_msg_seekkvu32( &workshop, "type", k_vg_msg_first );
+ if( vg_msg_seekframe( &msg, "workshop" )){
+ type = vg_msg_getkvu32( &msg, "type", 0 );
}
if( type == k_addon_type_none ){
if( reg->metadata_len == 0 ){
/* create our own content commands */
- vg_msg msg = {0};
- msg.buf = reg->metadata;
- msg.len = 0;
- msg.max = sizeof(reg->metadata);
+ vg_msg msg;
+ vg_msg_init( &msg, reg->metadata, sizeof(reg->metadata) );
u32 content_count = 0;
if( !content_count ) return NULL;
if( msg.error == k_vg_msg_error_OK )
- reg->metadata_len = msg.cur;
+ reg->metadata_len = msg.cur.co;
else{
vg_error( "Error creating metadata: %d\n", msg.error );
return NULL;
* --------------------------------- */
vg_str content_path = folder;
- vg_msg root = {0};
- root.buf = reg->metadata;
- root.len = reg->metadata_len;
- root.max = sizeof(reg->metadata);
+ vg_msg msg;
+ vg_msg_init( &msg, reg->metadata, reg->metadata_len );
- const char *kv_content = vg_msg_seekkvstr( &root, "content", 0 );
+ const char *kv_content = vg_msg_getkvstr( &msg, "content" );
if( kv_content ){
vg_strcat( &content_path, "/" );
vg_strcat( &content_path, kv_content );