Added package signing

source/ubl-settings-repomanager.c

@@ -95,6 +95,7 @@ file_chooser_window *yon_file_chooser_window_new(){
     file_chooser_window *window = malloc(sizeof(file_chooser_window));
     GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_filechooser_config);
     window->Window = yon_gtk_builder_get_widget(builder,"Window");
+    window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
     window->ChooseButton = yon_gtk_builder_get_widget(builder,"ChooseButton");
     window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton");
     window->NameEntry = yon_gtk_builder_get_widget(builder,"NameEntry");
@@ -434,25 +435,10 @@ void on_add_target_arch_selection_changed(GtkWidget *target,repo_add_window *win
 
 void on_add_target_package_selection_changed(GtkWidget *target,repo_add_window *window){
     gtk_list_store_clear(GTK_LIST_STORE(window->PackagesList));
-    char *path_str = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->ArchitectureCombo));
+    if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->ArchitectureCombo))==-1){
-     if (!yon_char_is_empty(path_str)){
+        gtk_widget_set_sensitive(window->AddPackageButton,0);
-        GtkTreeIter iter, itar;
+    } else {
-        GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
+        gtk_widget_set_sensitive(window->AddPackageButton,1);
-        if (gtk_tree_model_get_iter(GTK_TREE_MODEL(window->tree_copy),&iter,path)){
-            char *curpath;
-            gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&iter,3,&curpath,-1);
-                int size;
-                config_str parsed = yon_file_ls(curpath,&size);
-                for (int i=0;i<size;i++){
-                    if (strstr(parsed[i],".tar.")&&!strstr(parsed[i],".files.")&&!strstr(parsed[i],".db.")&&!strstr(parsed[i],".sig")){
-                        char *full_path_package = yon_char_unite(curpath,"/",parsed[i],NULL);
-                        char *name = yon_char_new(parsed[i]);
-                        gtk_list_store_append(window->PackagesList,&iter);
-                        gtk_list_store_set(window->PackagesList,&iter,1,parsed[i],2,full_path_package,3,0,-1);
-                        free(full_path_package);
-                    }
-                }
-        }
     }
 }
 
@@ -535,26 +521,25 @@ void on_add_accept(GtkWidget *self, dictionary *dict){
     GSList *list = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog->FileChooserWidget));
     for (int i=0;i<g_slist_length(list);i++){
         char *current = g_slist_nth_data(list,i);
-        char *name = yon_char_new(current);
-        free(yon_char_divide(name,yon_char_find_last(name,'/')));
         if (yon_char_parsed_check_exist(parsed,size,current)==-1){
-                char *repo_store_path = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepositoryCombo));
+            int name_size;
-                gtk_tree_model_get_iter_from_string(GTK_TREE_MODEL(window->tree_copy),&itor,repo_store_path);
+            config_str name = yon_config_load(yon_get_package_name_from_filename(current),&name_size);
-            char *repo_name;
+            yon_char_remove_last_symbol(name[0],'\n');
-            gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&itor,3,&repo_name,-1);
+            if (name_size<=0){
-            char *repo_pack = yon_char_divide(repo_name,yon_char_find_last(repo_name,'/'));
+                yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),PACKAGE_NAME_ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
-            char *command = add_packages_command(repo_pack,arch_name,repo_name,current);
+                return;
-            yon_debug_output("%s\n",command);
-            if (!system(command)){
-                gtk_list_store_append(window->PackagesList,&itar);
-                gtk_list_store_set(window->PackagesList,&itar,1,name,2,current,3,1,-1);
-                yon_char_parsed_add_or_create_if_exists(parsed,&size,name);
-                yon_window_config_add_instant_parameter(path,"package_info",yon_char_parsed_to_string(parsed,size,","),YON_TYPE_STRING);
-
             }
+                gtk_list_store_append(window->PackagesList,&itar);
+                gtk_list_store_set(window->PackagesList,&itar,1,name[0],2,current,3,1,-1);
+                yon_char_parsed_free(name,name_size);
         }
     }
     gtk_widget_destroy(dialog->Window);
+    if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->tree_copy),&iter)){
+        gtk_widget_set_sensitive(window->StorageCombo,0);
+        gtk_widget_set_sensitive(window->RepositoryCombo,0);
+        gtk_widget_set_sensitive(window->ArchitectureCombo,0);
+    }
 }
 
 void on_add_package(GtkWidget *self, repo_add_window *window){
@@ -596,6 +581,11 @@ void on_remove_package(GtkWidget *self, repo_add_window *window){
             yon_launch(command);
             on_add_target_package_selection_changed(window->ArchitectureCombo,window);
         }
+        if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(window->tree_copy),&iter)){
+            gtk_widget_set_sensitive(window->StorageCombo,1);
+            gtk_widget_set_sensitive(window->RepositoryCombo,1);
+            gtk_widget_set_sensitive(window->ArchitectureCombo,1);
+        }
 }
 
 void on_add_window_tree_changed(GtkWidget *self, repo_add_window *window){
@@ -608,6 +598,53 @@ void on_add_window_tree_changed(GtkWidget *self, repo_add_window *window){
     }
 }
 
+
+void on_add_packages_accept(GtkWidget *self, dictionary *dict){
+    main_window *widgets = yon_dictionary_get_data(dict->first,main_window*);
+    repo_add_window *window = yon_dictionary_get_data(dict->first->next,repo_add_window*);
+
+    GtkTreeIter iter, itar;
+    char *storage;
+    yon_gtk_tree_iter_get_from_combo_box_id(GTK_COMBO_BOX(window->StorageCombo),GTK_TREE_MODEL(window->tree_copy),&itar);
+    gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&itar,3,&storage,-1);
+    const char *repo = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->RepositoryCombo));
+    const char *arch = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->ArchitectureCombo));
+    GtkTreeModel *model = GTK_TREE_MODEL(window->PackagesList);
+    int size=0;
+    config_str packages=NULL;
+    int valid = gtk_tree_model_get_iter_first(model,&iter);
+    for (;valid;valid=gtk_tree_model_iter_next(model,&iter)){
+        char *target;
+        gtk_tree_model_get(model,&iter,2,&target,-1);
+        yon_char_parsed_add_or_create_if_exists(packages,&size,target);
+        free(target);
+    }
+    if (size>0){
+        char *command = NULL;
+        int repo_sign = gtk_combo_box_get_active(GTK_COMBO_BOX(window->RepoSignCombo));
+        int pack_sign = gtk_combo_box_get_active(GTK_COMBO_BOX(window->PackageSignCombo));
+        if (repo_sign&&pack_sign){
+            command = add_packages_sign_command(storage,arch,repo,gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepoSignCombo)),gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->PackageSignCombo)),yon_char_parsed_to_string(packages,size," "));
+        } else if (repo_sign){
+            command = add_packages_repo_sign_command(storage,arch,repo,gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepoSignCombo)),yon_char_parsed_to_string(packages,size," "));
+        } else if (pack_sign){
+            command = add_packages_package_sign_command(storage,arch,repo,gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->PackageSignCombo)),yon_char_parsed_to_string(packages,size," "));
+        } else {
+            command = add_packages_command(storage,arch,repo,yon_char_parsed_to_string(packages,size," "));
+        }
+        yon_debug_output("%s\n",command);
+        if (!system(command)){
+            gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),NULL);
+            gtk_tree_store_clear(widgets->RepoList);
+            yon_gtk_tree_store_copy_full(window->tree_copy,widgets->RepoList);
+            gtk_tree_view_set_model(GTK_TREE_VIEW(widgets->ReposTree),GTK_TREE_MODEL(widgets->RepoList));
+            gtk_widget_destroy(window->MainWindow);
+        } else {
+
+        }
+    }
+}
+
 repo_add_window *yon_repo_add_window_new(){
     repo_add_window *window = malloc(sizeof(repo_add_window));
     GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_repo_add);
@@ -666,10 +703,14 @@ void on_add_clicked(GtkWidget *self, main_window *widgets){
     yon_combo_box_text_set_signs(GTK_COMBO_BOX_TEXT(window->RepoSignCombo));
     yon_combo_box_text_set_signs(GTK_COMBO_BOX_TEXT(window->PackageSignCombo));
 
+    dictionary *dict = NULL;
+    yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
+    yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
+
     g_signal_connect(G_OBJECT(window->StorageCombo),"changed",G_CALLBACK(on_add_target_repo_selection_changed),window);
     g_signal_connect(G_OBJECT(window->RepositoryCombo),"changed",G_CALLBACK(on_add_target_arch_selection_changed),window);
     g_signal_connect(G_OBJECT(window->ArchitectureCombo),"changed",G_CALLBACK(on_add_target_package_selection_changed),window);
-    g_signal_connect(G_OBJECT(window->AddButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
+    g_signal_connect(G_OBJECT(window->AddButton),"clicked",G_CALLBACK(on_add_packages_accept),dict);
     g_signal_connect(G_OBJECT(window->AddPackageButton),"clicked",G_CALLBACK(on_add_package),window);
     g_signal_connect(G_OBJECT(window->RemoveButton),"clicked",G_CALLBACK(on_remove_package),window);
     gtk_widget_show(window->MainWindow);
@@ -705,6 +746,10 @@ void on_move_add_accept(GtkWidget *self, dictionary *dict){
             GtkTreeIter iter;
             int temp_size;
             config_str name = yon_config_load(yon_get_package_name_from_filename(path),&temp_size);
+            if (temp_size<=0){
+                yon_ubl_status_box_spawn(GTK_CONTAINER(dialog->StatusBox),PACKAGE_NAME_ERROR_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+                return;
+            }
             yon_char_remove_last_symbol(name[0],'\n');
             gtk_list_store_append(window->PackagesList,&iter);
             gtk_list_store_set(window->PackagesList,&iter,1,name[0],2,path,-1);
@@ -721,6 +766,12 @@ void on_move_add_accept(GtkWidget *self, dictionary *dict){
 
         gtk_widget_set_sensitive(window->MoveTargetRepoEntry,0);
         gtk_widget_set_sensitive(window->MoveTargetArchEntry,0);
+
+        if (window->StorageCombo&&window->RepositoryCombo&&window->ArchitectureCombo){
+            gtk_widget_set_sensitive(window->StorageCombo,0);
+            gtk_widget_set_sensitive(window->RepositoryCombo,0);
+            gtk_widget_set_sensitive(window->ArchitectureCombo,0);
+        }
     }
 }
 
@@ -735,9 +786,7 @@ void on_move_add_package(GtkWidget *self, repo_add_window *window){
         GtkTreeIter iter,itar;
         yon_gtk_tree_iter_get_from_combo_box_id(GTK_COMBO_BOX(window->MoveSourceArchEntry),GTK_TREE_MODEL(window->tree_copy),&iter);
         char *target;
-        gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&iter,3,&target,-1);
+        gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&iter,3,&target,3,&dialog->root_path,-1);
-        yon_gtk_tree_iter_get_from_combo_box_id(GTK_COMBO_BOX(window->ArchitectureCombo),GTK_TREE_MODEL(window->tree_copy),&itar);
-        gtk_tree_model_get(GTK_TREE_MODEL(window->tree_copy),&itar,3,&dialog->root_path,-1);
         gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog->FileChooserWidget),target);
 
         dictionary *dict = NULL;
@@ -763,6 +812,11 @@ void on_move_remove_package(GtkWidget *self, repo_add_window *window){
         gtk_widget_set_sensitive(window->MoveSourceArchEntry,1);
 
         gtk_widget_set_sensitive(window->MoveTargetRepoEntry,1);
+        if (window->StorageCombo&&window->RepositoryCombo&&window->ArchitectureCombo){
+            gtk_widget_set_sensitive(window->StorageCombo,1);
+            gtk_widget_set_sensitive(window->RepositoryCombo,1);
+            gtk_widget_set_sensitive(window->ArchitectureCombo,1);
+        }
     }
 }
 
@@ -884,7 +938,7 @@ void on_remove_accept(GtkWidget *self, repo_add_window *window){
             yon_char_parsed_add_or_create_if_exists(packages,&size,target);
         }
         if (size){
-            char *sign = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepoSignCombo));
+            char *sign = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->RepoSignCombo));
             char *command;
             if (yon_char_is_empty(sign)){
                 command = yon_delete_packages_command(storage_path,arch,repo,yon_char_parsed_to_string(packages,size," "));

source/ubl-settings-repomanager.h

@@ -47,6 +47,9 @@ typedef char* string;
 
 #define create_storage_command(path,name) yon_char_unite("repo-manager add -r '",name,"' -d '", path,"'",NULL)
 #define add_packages_command(path,arch,name,packages_path) yon_char_unite("repo-manager add -r '",name,"' -a '",arch,"' -d '", path,"' ",packages_path,NULL)
+#define add_packages_sign_command(path,arch,name,repo_sign,pack_sign,packages_path) yon_char_unite("repo-manager add -r '",name,"' -a '",arch,"' -d '", path,"' -S '",repo_sign,"' -s '",pack_sign,"' ",packages_path,NULL)
+#define add_packages_package_sign_command(path,arch,name,sign,packages_path) yon_char_unite("repo-manager add -r '",name,"' -a '",arch,"' -d '", path,"' -S '",sign,"' ",packages_path,NULL)
+#define add_packages_repo_sign_command(path,arch,name,sign,packages_path) yon_char_unite("repo-manager add -r '",name,"' -a '",arch,"' -d '", path,"' -S '",sign,"' ",packages_path,NULL)
 #define remove_packages_command(path,arch,name,packages_path) yon_char_unite("repo-manager remove -r '",name,"' -a '",arch,"' -d '", path,"' ",packages_path,NULL)
 
 #define yon_move_packages_command(storage,arch, source_repo, target_repo, packages) yon_char_unite("repo-manager move -d '",storage,"' -a '",arch,"' -R '",source_repo,"' -r '",target_repo,"' ", packages,NULL)
@@ -149,6 +152,7 @@ typedef struct {
 
 typedef struct {
     GtkWidget *Window;
+    GtkWidget *StatusBox;
     GtkWidget *CancelButton;
     GtkWidget *ChooseButton;
     GtkWidget *NameEntry;
@@ -169,3 +173,5 @@ void yon_combo_box_text_set_signs(GtkComboBoxText *target);
 void on_storage_changed(GtkWidget *self, storage_config_window *window);
 
 config_str yon_tree_store_get_all_at_level(GtkTreeStore *target,GtkTreeIter *parent, int *size, int column, int level);
+
+void on_remove_arch_selection_changed(GtkWidget *self, repo_add_window *window);

source/ubl-strings.h

@@ -72,3 +72,5 @@
 #define REMOVE_CONFIRMATION_LABEL _("Are you sure want to remove?")
 
 #define DO_NOT_SIGN_LABEL _("Do not sign")
+
+#define PACKAGE_NAME_ERROR_LABEL _("Package name error - package has incorrect name pattern")