Добавил обновление устройств

pull/24/head
Igor Belitskiy 2 years ago
parent 41bbe79d6f
commit 28cb977316

@ -11,6 +11,7 @@ void load_template_load_cfg(config_all* _all_config, char* cmd) {
load_free_vector(_all_config, &_all_config->v_project); load_free_vector(_all_config, &_all_config->v_project);
free_remove_vector(_all_config, &_all_config->v_remove); free_remove_vector(_all_config, &_all_config->v_remove);
model_free_vector_string(&_all_config->v_disk_remove); model_free_vector_string(&_all_config->v_disk_remove);
device_disk_parsed();
vector_init(&_all_config->v_user); vector_init(&_all_config->v_user);
vector_init(&_all_config->v_group); vector_init(&_all_config->v_group);
vector_init(&_all_config->v_project); vector_init(&_all_config->v_project);

@ -9,7 +9,8 @@ vector *get_device_vec()
void device_disk_parsed() { void device_disk_parsed() {
char *cmd = "findmnt -lo source,target,fstype,label,size -t ext4"; char *cmd = "findmnt -lo source,target,fstype,label,size -t ext4";
vector_init(&vec_disk); device_device_config_free(get_device_vec());
vector_init(get_device_vec());
int size = 0; int size = 0;
char **responce = yon_config_load(cmd, &size); char **responce = yon_config_load(cmd, &size);
char *split_simvol = " "; char *split_simvol = " ";
@ -48,7 +49,7 @@ void device_disk_parsed() {
obj_device_config->mounted, obj_device_config->mounted,
split_simvol, split_simvol,
obj_device_config->type_dick, NULL); obj_device_config->type_dick, NULL);
vec_disk.pfVectorAdd(&vec_disk, obj_device_config); get_device_vec()->pfVectorAdd(get_device_vec(), obj_device_config);
philos_free_string_array(&name_disk, size_str); philos_free_string_array(&name_disk, size_str);
} }
free(disk); free(disk);
@ -61,7 +62,7 @@ void device_fill_disk(GtkWidget *combo_box_text, vector* vec_filt)
{ {
vector vec; vector vec;
vector_init(&vec); vector_init(&vec);
vec.pfVectorCopy(&vec, &vec_disk); vec.pfVectorCopy(&vec, get_device_vec());
for (int i = 0; i < vec_filt->vectorList.total; i++) { for (int i = 0; i < vec_filt->vectorList.total; i++) {
disk_status* _config_disk_remove = (disk_status*)vec_filt->pfVectorGet(vec_filt, i); disk_status* _config_disk_remove = (disk_status*)vec_filt->pfVectorGet(vec_filt, i);
for (int index = 0; index < vec.vectorList.total; index++) { for (int index = 0; index < vec.vectorList.total; index++) {
@ -81,3 +82,18 @@ void device_fill_disk(GtkWidget *combo_box_text, vector* vec_filt)
} }
} }
} }
void device_device_config_free() {
if (get_device_vec()) {
for (int i = 0; i < get_device_vec()->vectorList.total; i++) {
device_config* _config_disk_remove = (device_config*)get_device_vec()->pfVectorGet(get_device_vec(), i);
free(_config_disk_remove->description_disk);
free(_config_disk_remove->type_dick);
free(_config_disk_remove->mounted);
free(_config_disk_remove->file_system);
free(_config_disk_remove->name_disk);
get_device_vec()->pfVectorDelete(get_device_vec(), i);
}
}
}

@ -21,5 +21,6 @@ void device_fill_disk(GtkWidget* combo_box_text, vector* vec_filt);
size_t get_mem_total(); size_t get_mem_total();
float get_size_pow_memory(size_t size_memory, int size); float get_size_pow_memory(size_t size_memory, int size);
size_t get_resurs_total(char* cmd); size_t get_resurs_total(char* cmd);
void device_device_config_free();
#endif #endif
Loading…
Cancel
Save