descriptor_str[descriptor.cur*2] = '\0';
vg_info( "binstr: %s\n", descriptor_str );
- DIR *dir = opendir( folder.buffer );
- if( !dir ){
+ vg_dir dir;
+ if( !vg_dir_open( &dir, folder.buffer ) ){
vg_error( "could not open addon folder '%s'\n", folder.buffer );
vg_async_call( workshop_async_any_complete, NULL, 0 );
return;
}
- struct dirent *entry;
- while( (entry = readdir(dir)) ){
- if( entry->d_type == DT_REG ){
- if( entry->d_name[0] == '.' ) continue;
+ while( vg_dir_next_entry(&dir) ){
+ if( vg_dir_entry_type(&dir) == k_vg_entry_type_file ){
+ const char *d_name = vg_dir_entry_name(&dir);
+ if( d_name[0] == '.' ) continue;
vg_str file = folder;
vg_strcat( &file, "/" );
- vg_strcat( &file, entry->d_name );
+ vg_strcat( &file, d_name );
if( !vg_strgood( &file ) ) continue;
char *ext = vg_strch( &file, '.' );
if( !ext ) continue;
if( strcmp(ext,".mdl") ) continue;
- vg_msg_wkvstr( &descriptor, "content", entry->d_name );
+ vg_msg_wkvstr( &descriptor, "content", d_name );
break;
}
}
- closedir(dir);
+ vg_dir_close(&dir);
vg_str descriptor_file = folder;
vg_strcat( &descriptor_file, "/addon.inf" );
return;
}
- DIR *dir = opendir( folder.buffer );
- if( !dir ){
+ vg_dir dir;
+ if( !vg_dir_open( &dir, folder.buffer ) ){
vg_error( "workshop async load failed: could not open folder\n" );
vg_async_call( workshop_form_loadmodel_async_error, NULL, 0 );
return;
vg_info( "Searching %s for model files\n", folder.buffer );
int found_mdl = 0;
- struct dirent *entry;
- while( (entry = readdir(dir)) ){
- if( entry->d_type == DT_REG ){
- if( entry->d_name[0] == '.' ) continue;
+ while( vg_dir_next_entry(&dir) ){
+ if( vg_dir_entry_type(&dir) == k_vg_entry_type_file ){
+ const char *d_name = vg_dir_entry_name(&dir);
+ if( d_name[0] == '.' ) continue;
vg_str file = folder;
vg_strcat( &file, "/" );
- vg_strcat( &file, entry->d_name );
+ vg_strcat( &file, d_name );
if( !vg_strgood( &file ) ) continue;
char *ext = vg_strch( &file, '.' );
break;
}
}
- closedir(dir);
+ vg_dir_close(&dir);
if( !found_mdl ){
vg_error( "workshop async load failed: no model files found\n" );
snprintf( workshop_form.addon_folder,
vg_list_size( workshop_form.addon_folder ),
- "Steam Cloud (%lu)", details.m_nPublishedFileId );
+ "Steam Cloud ("PRINTF_U64")", details.m_nPublishedFileId );
workshop_form.submission.file_id = details.m_nPublishedFileId;
workshop_form.file_intent = k_workshop_form_file_intent_keep_old;
u32 len = strlen(metadata_str);
vg_info( "Metadata: %s\n", metadata_str );
vg_str_bin( metadata_str, metadata_buf, len );
- vg_msg msg;
- vg_msg_init( &msg, metadata_buf, len/2 );
+ vg_msg root;
+ vg_msg_init( &root, metadata_buf, len/2 );
- vg_msg_cmd cmd;
- while( vg_msg_next( &msg, &cmd ) ){
- if( (msg.depth == 1) && (cmd.code == k_vg_msg_code_frame) ){
- if( VG_STRDJB2_EQ( "workshop", cmd.key, cmd.key_djb2 ) ){
- u32 depth = msg.depth;
- while( (msg.depth == depth) && vg_msg_next( &msg, &cmd ) ){
- if( cmd.code & k_vg_msg_code_unsigned ){
- if( VG_STRDJB2_EQ( "type", cmd.key, cmd.key_djb2 ) ){
- workshop_form.submission.type = cmd.value._u32;
- workshop_form.submission.submission_type_selection.value = cmd.value._u32;
- }
- }
- else if( cmd.code == k_vg_msg_code_kvstring ){
- if( VG_STRDJB2_EQ( "folder", cmd.key, cmd.key_djb2 ) ){
- vg_strncpy( cmd.value._buf,
- workshop_form.addon_folder,
- sizeof(workshop_form.addon_folder),
- k_strncpy_always_add_null );
- }
- }
- }
- }
+ vg_msg workshop;
+ if( vg_msg_seekframe( &workshop, "workshop", k_vg_msg_first )){
+ vg_msg_cmd kv_type = vg_msg_seekkv( &workshop, "type",
+ k_vg_msg_first );
+ if( kv_type.code & k_vg_msg_code_integer ){
+ u32 u = kv_type.value._u32;
+ workshop_form.submission.type = u;
+ workshop_form.submission.submission_type_selection.value = u;
+ }
+
+ const char *kv_folder = vg_msg_seekkvstr( &workshop, "folder",
+ k_vg_msg_first );
+ if( kv_folder ){
+ vg_strncpy( kv_folder, workshop_form.addon_folder,
+ sizeof(workshop_form.addon_folder),
+ k_strncpy_always_add_null );
}
}
}