Config file description was added

pull/90/head
parent e139a3e0fb
commit 9607f59ffb

@ -7,6 +7,9 @@
<gresource prefix="/com/ublinux/css"> <gresource prefix="/com/ublinux/css">
<file>ubl-settings-services.css</file> <file>ubl-settings-services.css</file>
</gresource> </gresource>
<gresource prefix="/com/ublinux/csv">
<file>systemd_conf.csv</file>
</gresource>
<gresource prefix="/com/ublinux/images"> <gresource prefix="/com/ublinux/images">
<file>ubl-settings-services-banner.png</file> <file>ubl-settings-services-banner.png</file>
</gresource> </gresource>

@ -36,6 +36,7 @@ add_custom_target(GLADE ubl-settings-services.glade)
set(DEPENDFILES set(DEPENDFILES
../ubl-settings-services.glade ../ubl-settings-services.glade
../systemd_conf.csv
../ubl-settings-services-terminal.glade ../ubl-settings-services-terminal.glade
../gresource.xml ../gresource.xml
../ubl-settings-services-banner.png ../ubl-settings-services-banner.png

@ -1143,6 +1143,8 @@ gboolean yon_interface_update(main_window *widgets){
} }
} }
int descr_size;
config_str config_descr = yon_resource_open_file(systemd_config_path,&descr_size);
for (int i=0; i<config_size;i++){ for (int i=0; i<config_size;i++){
int size; int size;
if (config_files[i][strlen(config_files[i])-1]=='\n') config_files[i][strlen(config_files[i])-1] = '\0'; if (config_files[i][strlen(config_files[i])-1]=='\n') config_files[i][strlen(config_files[i])-1] = '\0';
@ -1150,6 +1152,28 @@ gboolean yon_interface_update(main_window *widgets){
if (parsed&&size>2){ if (parsed&&size>2){
GtkTreeIter iter; GtkTreeIter iter;
char *description = ""; char *description = "";
{
for (int k=0;k<descr_size;k++){
int parsed_size;
config_str parsed_descr = yon_char_parse(config_descr[k],&parsed_size,";");
if (parsed_size){
for (int j=1;j<parsed_size;j++){
GRegex *regex = g_regex_new(parsed_descr[0],0,0,NULL);
GMatchInfo *match = NULL;
g_regex_match(regex,parsed[2],0,&match);
g_regex_unref(regex);
if (g_match_info_matches(match)){
yon_char_remove_last_symbol(parsed_descr[1],'\n');
description = yon_char_new(parsed_descr[1]);
break;
}
g_match_info_unref(match);
}
yon_char_parsed_free(parsed_descr,parsed_size);
}
}
}
gtk_list_store_append(widgets->ConfigList,&iter); gtk_list_store_append(widgets->ConfigList,&iter);
gtk_list_store_set(widgets->ConfigList,&iter,0,parsed[2],1,parsed[1],2,description,-1); gtk_list_store_set(widgets->ConfigList,&iter,0,parsed[2],1,parsed[1],2,description,-1);
} }

@ -33,6 +33,8 @@
#define LocalePath "/usr/share/locale" #define LocalePath "/usr/share/locale"
#define LocaleName "ubl-settings-services" #define LocaleName "ubl-settings-services"
#define systemd_config_path "resource:///com/ublinux/csv/systemd_conf.csv"
#define load_services_command "systemctl list-units --no-pager --all --plain --no-legend |sed -E 's/(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.*)/\\1;\\2;\\3;\\4;\\5/'" #define load_services_command "systemctl list-units --no-pager --all --plain --no-legend |sed -E 's/(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.*)/\\1;\\2;\\3;\\4;\\5/'"
#define load_user_services_command yon_char_unite("systemctl --user --machine=",yon_ubl_root_user_get(),"@ list-units --no-pager --all --plain --no-legend |sed -E 's/(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.*)/\\1;\\2;\\3;\\4;\\5/'",NULL) #define load_user_services_command yon_char_unite("systemctl --user --machine=",yon_ubl_root_user_get(),"@ list-units --no-pager --all --plain --no-legend |sed -E 's/(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.*)/\\1;\\2;\\3;\\4;\\5/'",NULL)
#define load_system_services_command "systemctl --system list-units --no-pager --all |grep -E \"^ \" |grep -v \"UNIT\" |sed -e 's/ */;/g' -e 's/^;//g' |cut -f1 -d';'" #define load_system_services_command "systemctl --system list-units --no-pager --all |grep -E \"^ \" |grep -v \"UNIT\" |sed -e 's/ */;/g' -e 's/^;//g' |cut -f1 -d';'"

Loading…
Cancel
Save