New interface of repomd module

diff --git a/src/createrepo_c.c b/src/createrepo_c.c
index dd69a87..f322fbe 100644 (file)
--- a/src/createrepo_c.c
+++ b/src/createrepo_c.c
@@ -878,6 +878,8 @@ main(int argc, char **argv)
 
     g_debug("Generating repomd.xml");
 
+    cr_Repomd repomd_obj = cr_new_repomd();
+
     cr_RepomdRecord pri_xml_rec = cr_new_repomdrecord("repodata/primary.xml.gz");
     cr_RepomdRecord fil_xml_rec = cr_new_repomdrecord("repodata/filelists.xml.gz");
     cr_RepomdRecord oth_xml_rec = cr_new_repomdrecord("repodata/other.xml.gz");
@@ -1010,21 +1012,24 @@ main(int argc, char **argv)
 
     // Gen xml
 
-    char *repomd_xml = cr_generate_repomd_xml(out_dir,
-                                              pri_xml_rec,
-                                              fil_xml_rec,
-                                              oth_xml_rec,
-                                              pri_db_rec,
-                                              fil_db_rec,
-                                              oth_db_rec,
-                                              groupfile_rec,
-                                              compressed_groupfile_rec,
-                                              updateinfo_rec);
-    gchar *repomd_path = g_strconcat(out_repo, "repomd.xml", NULL);
+    cr_repomd_set_record(repomd_obj, pri_xml_rec,    CR_MD_PRIMARY_XML);
+    cr_repomd_set_record(repomd_obj, fil_xml_rec,    CR_MD_FILELISTS_XML);
+    cr_repomd_set_record(repomd_obj, oth_xml_rec,    CR_MD_OTHER_XML);
+    cr_repomd_set_record(repomd_obj, pri_db_rec,     CR_MD_PRIMARY_SQLITE);
+    cr_repomd_set_record(repomd_obj, fil_db_rec,     CR_MD_FILELISTS_SQLITE);
+    cr_repomd_set_record(repomd_obj, oth_db_rec,     CR_MD_OTHER_SQLITE);
+    cr_repomd_set_record(repomd_obj, groupfile_rec,  CR_MD_GROUPFILE);
+    cr_repomd_set_record(repomd_obj, compressed_groupfile_rec,
+                         CR_MD_COMPRESSED_GROUPFILE);
+    cr_repomd_set_record(repomd_obj, updateinfo_rec, CR_MD_UPDATEINFO);
+
+    char *repomd_xml = cr_generate_repomd_xml(repomd_obj);
 
+    cr_free_repomd(repomd_obj);
 
     // Write repomd.xml
 
+    gchar *repomd_path = g_strconcat(out_repo, "repomd.xml", NULL);
     FILE *frepomd = fopen(repomd_path, "w");
     if (!frepomd || !repomd_xml) {
         g_critical("Generate of repomd.xml failed");
@@ -1035,16 +1040,6 @@ main(int argc, char **argv)
     g_free(repomd_xml);
     g_free(repomd_path);
 
-    cr_free_repomdrecord(pri_xml_rec);
-    cr_free_repomdrecord(fil_xml_rec);
-    cr_free_repomdrecord(oth_xml_rec);
-    cr_free_repomdrecord(pri_db_rec);
-    cr_free_repomdrecord(fil_db_rec);
-    cr_free_repomdrecord(oth_db_rec);
-    cr_free_repomdrecord(groupfile_rec);
-    cr_free_repomdrecord(compressed_groupfile_rec);
-    cr_free_repomdrecord(updateinfo_rec);
-
 
     // Clean up
 

diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c
index 392bf68..49ab3bf 100644 (file)
--- a/src/mergerepo_c.c
+++ b/src/mergerepo_c.c
@@ -796,16 +796,21 @@ dump_merged_metadata(GHashTable *merged_hashtable,
 
     // Gen repomd.xml content
 
-    char *repomd_xml = cr_generate_repomd_xml(out_dir,
-                                              pri_xml_rec,
-                                              fil_xml_rec,
-                                              oth_xml_rec,
-                                              pri_db_rec,
-                                              fil_db_rec,
-                                              oth_db_rec,
-                                              groupfile_rec,
-                                              compressed_groupfile_rec,
-                                              update_info_rec);
+    cr_Repomd repomd_obj = cr_new_repomd();
+    cr_repomd_set_record(repomd_obj, pri_xml_rec,   CR_MD_PRIMARY_XML);
+    cr_repomd_set_record(repomd_obj, fil_xml_rec,   CR_MD_FILELISTS_XML);
+    cr_repomd_set_record(repomd_obj, oth_xml_rec,   CR_MD_OTHER_XML);
+    cr_repomd_set_record(repomd_obj, pri_db_rec,    CR_MD_PRIMARY_SQLITE);
+    cr_repomd_set_record(repomd_obj, fil_db_rec,    CR_MD_FILELISTS_SQLITE);
+    cr_repomd_set_record(repomd_obj, oth_db_rec,    CR_MD_OTHER_SQLITE);
+    cr_repomd_set_record(repomd_obj, groupfile_rec, CR_MD_GROUPFILE);
+    cr_repomd_set_record(repomd_obj, compressed_groupfile_rec,
+                         CR_MD_COMPRESSED_GROUPFILE);
+    cr_repomd_set_record(repomd_obj, update_info_rec, CR_MD_UPDATEINFO);
+
+    char *repomd_xml = cr_generate_repomd_xml(repomd_obj);
+
+    cr_free_repomd(repomd_obj);
 
     if (repomd_xml) {
         gchar *repomd_path = g_strconcat(cmd_options->out_repo, "repomd.xml", NULL);
@@ -824,16 +829,6 @@ dump_merged_metadata(GHashTable *merged_hashtable,
 
     g_free(repomd_xml);
 
-    cr_free_repomdrecord(pri_xml_rec);
-    cr_free_repomdrecord(fil_xml_rec);
-    cr_free_repomdrecord(oth_xml_rec);
-    cr_free_repomdrecord(pri_db_rec);
-    cr_free_repomdrecord(fil_db_rec);
-    cr_free_repomdrecord(oth_db_rec);
-    cr_free_repomdrecord(groupfile_rec);
-    cr_free_repomdrecord(compressed_groupfile_rec);
-    cr_free_repomdrecord(update_info_rec);
-
     g_free(pri_xml_filename);
     g_free(fil_xml_filename);
     g_free(oth_xml_filename);

diff --git a/src/repomd.c b/src/repomd.c
index 611926c..081e624 100644 (file)
--- a/src/repomd.c
+++ b/src/repomd.c
@@ -58,6 +58,30 @@ typedef struct _contentStat {
 } contentStat;
 
 
+typedef struct _cr_Distro * cr_Distro;
+struct _cr_Distro {
+    gchar *cpeid;
+    gchar *val;
+};
+
+
+cr_Distro
+cr_new_distro()
+{
+    return (cr_Distro) g_malloc0(sizeof(struct _cr_Distro));
+}
+
+
+void
+cr_free_distro(cr_Distro distro)
+{
+    if (!distro) return;
+    g_free(distro->cpeid);
+    g_free(distro->val);
+    g_free(distro);
+}
+
+
 cr_RepomdRecord
 cr_new_repomdrecord(const char *path)
 {
@@ -423,11 +447,7 @@ dump_data_items(xmlNodePtr root, cr_RepomdRecord md, const xmlChar *type)
 
 
 char *
-repomd_xml_dump(long revision, cr_RepomdRecord pri_xml, cr_RepomdRecord fil_xml,
-                cr_RepomdRecord oth_xml, cr_RepomdRecord pri_sqlite,
-                cr_RepomdRecord fil_sqlite, cr_RepomdRecord oth_sqlite,
-                cr_RepomdRecord groupfile, cr_RepomdRecord cgroupfile,
-                cr_RepomdRecord update_info)
+repomd_xml_dump(cr_Repomd repomd)
 {
     xmlDocPtr doc;
     xmlNodePtr root;
@@ -441,19 +461,48 @@ repomd_xml_dump(long revision, cr_RepomdRecord pri_xml, cr_RepomdRecord fil_xml,
     xmlNewNs(root, BAD_CAST RPM_NS, BAD_CAST "rpm");
     xmlDocSetRootElement(doc, root);
 
-    gchar str_revision[32];
-    g_snprintf(str_revision, 32, "%ld", revision);
-    xmlNewChild(root, NULL, BAD_CAST "revision", BAD_CAST str_revision);
+    xmlNewChild(root, NULL, BAD_CAST "revision", BAD_CAST repomd->revision);
+
+
+    // Tags
+
+    if (repomd->repos || repomd->distros || repomd->contents) {
+        GSList *element;
+        xmlNodePtr tags = xmlNewChild(root, NULL, BAD_CAST "tags", NULL);
+        element = repomd->contents;
+        for (; element; element = g_slist_next(element))
+            xmlNewChild(tags, NULL,
+                        BAD_CAST "content",
+                        BAD_CAST (element->data ? element->data : ""));
+        element = repomd->repos;
+        for (; element; element = g_slist_next(element))
+            xmlNewChild(tags, NULL,
+                        BAD_CAST "repo",
+                        BAD_CAST (element->data ? element->data : ""));
+        element = repomd->distros;
+        for (; element; element = g_slist_next(element)) {
+            xmlNodePtr distro_elem;
+            cr_Distro distro = (cr_Distro) element->data;
+            distro_elem = xmlNewChild(tags,
+                                      NULL,
+                                      BAD_CAST "distro",
+                                      BAD_CAST (distro->val ? distro->val : ""));
+            if (distro->cpeid)
+                xmlNewProp(distro_elem,
+                           BAD_CAST "cpeid",
+                           BAD_CAST distro->cpeid);
+        }
+    }
 
-    dump_data_items(root, pri_xml, (const xmlChar *) "primary");
-    dump_data_items(root, fil_xml, (const xmlChar *) "filelists");
-    dump_data_items(root, oth_xml, (const xmlChar *) "other");
-    dump_data_items(root, pri_sqlite, (const xmlChar *) "primary_db");
-    dump_data_items(root, fil_sqlite, (const xmlChar *) "filelists_db");
-    dump_data_items(root, oth_sqlite, (const xmlChar *) "other_db");
-    dump_data_items(root, groupfile, (const xmlChar *) "group");
-    dump_data_items(root, cgroupfile, (const xmlChar *) "group_gz");
-    dump_data_items(root, update_info, (const xmlChar *) "updateinfo");
+    dump_data_items(root, repomd->pri_xml, (const xmlChar *) "primary");
+    dump_data_items(root, repomd->fil_xml, (const xmlChar *) "filelists");
+    dump_data_items(root, repomd->oth_xml, (const xmlChar *) "other");
+    dump_data_items(root, repomd->pri_sql, (const xmlChar *) "primary_db");
+    dump_data_items(root, repomd->fil_sql, (const xmlChar *) "filelists_db");
+    dump_data_items(root, repomd->oth_sql, (const xmlChar *) "other_db");
+    dump_data_items(root, repomd->groupfile, (const xmlChar *) "group");
+    dump_data_items(root, repomd->cgroupfile, (const xmlChar *) "group_gz");
+    dump_data_items(root, repomd->updateinfo, (const xmlChar *) "updateinfo");
 
 
     // Dump IT!
@@ -561,26 +610,109 @@ cr_rename_repomdrecord_file(const char *base_path, cr_RepomdRecord md)
 }
 
 
+cr_Repomd
+cr_new_repomd()
+{
+    return (cr_Repomd) g_malloc0(sizeof(struct _cr_Repomd));
+}
+
+
+void
+cr_free_repomd(cr_Repomd repomd)
+{
+    if (!repomd) return;
+    cr_free_repomdrecord(repomd->pri_xml);
+    cr_free_repomdrecord(repomd->fil_xml);
+    cr_free_repomdrecord(repomd->oth_xml);
+    cr_free_repomdrecord(repomd->pri_sql);
+    cr_free_repomdrecord(repomd->fil_sql);
+    cr_free_repomdrecord(repomd->oth_sql);
+    cr_free_repomdrecord(repomd->groupfile);
+    cr_free_repomdrecord(repomd->cgroupfile);
+    cr_free_repomdrecord(repomd->updateinfo);
+    g_slist_free_full(repomd->repos, g_free);
+    g_slist_free_full(repomd->distros, (GDestroyNotify) cr_free_distro);
+    g_slist_free_full(repomd->contents, g_free);
+    g_free(repomd->revision);
+    g_free(repomd);
+}
+
+
+void
+cr_repomd_set_record(cr_Repomd repomd,
+                     cr_RepomdRecord record,
+                     cr_RepomdRecordType type)
+{
+    cr_RepomdRecord *rec;
+
+    if (!repomd || !record) return;
+
+    switch (type) {
+        case CR_MD_PRIMARY_XML:          rec = &(repomd->pri_xml);    break;
+        case CR_MD_FILELISTS_XML:        rec = &(repomd->fil_xml);    break;
+        case CR_MD_OTHER_XML:            rec = &(repomd->oth_xml);    break;
+        case CR_MD_PRIMARY_SQLITE:       rec = &(repomd->pri_sql);    break;
+        case CR_MD_FILELISTS_SQLITE:     rec = &(repomd->fil_sql);    break;
+        case CR_MD_OTHER_SQLITE:         rec = &(repomd->oth_sql);    break;
+        case CR_MD_GROUPFILE:            rec = &(repomd->groupfile);  break;
+        case CR_MD_COMPRESSED_GROUPFILE: rec = &(repomd->cgroupfile); break;
+        case CR_MD_UPDATEINFO:           rec = &(repomd->updateinfo); break;
+        default: return;
+    }
+
+    if (*rec)  // A record already exists
+        cr_free_repomdrecord(*rec);
+
+    *rec = record;
+}
+
+
+void
+cr_repomd_set_revision(cr_Repomd repomd, const char *revision)
+{
+    if (!repomd) return;
+    if (repomd->revision)  // A revision string already exists
+        g_free(repomd->revision);
+    repomd->revision = g_strdup(revision);
+}
+
+
+void
+cr_repomd_add_distro_tag(cr_Repomd repomd, const char *cpeid, const char *val)
+{
+    cr_Distro distro;
+    if (!repomd || !val) return;
+    distro = cr_new_distro();
+    distro->cpeid = g_strdup(cpeid);
+    distro->val   = g_strdup(val);
+    repomd->distros = g_slist_prepend(repomd->distros, (gpointer) distro);
+}
+
+
+void
+cr_repomd_add_repo_tag(cr_Repomd repomd, const char *repo)
+{
+    if (!repomd) return;
+    repomd->repos = g_slist_append(repomd->repos, g_strdup(repo));
+}
+
+
+void
+cr_repomd_add_content_tag(cr_Repomd repomd, const char *content)
+{
+    if (!repomd) return;
+    repomd->contents = g_slist_append(repomd->contents, g_strdup(content));
+}
+
+
 gchar *
-cr_generate_repomd_xml(const char *path, cr_RepomdRecord pri_xml,
-                       cr_RepomdRecord fil_xml, cr_RepomdRecord oth_xml,
-                       cr_RepomdRecord pri_sqlite, cr_RepomdRecord fil_sqlite,
-                       cr_RepomdRecord oth_sqlite, cr_RepomdRecord groupfile,
-                       cr_RepomdRecord cgroupfile, cr_RepomdRecord update_info)
+cr_generate_repomd_xml(cr_Repomd repomd)
 {
-    if (!path) {
-        return NULL;
+    if (!repomd->revision) {
+        gchar *rev = g_strdup_printf("%ld", time(NULL));
+        cr_repomd_set_revision(repomd, rev);
+        g_free(rev);
     }
 
-    long revision = (long) time(NULL);
-    return repomd_xml_dump(revision,
-                           pri_xml,
-                           fil_xml,
-                           oth_xml,
-                           pri_sqlite,
-                           fil_sqlite,
-                           oth_sqlite,
-                           groupfile,
-                           cgroupfile,
-                           update_info);
+    return repomd_xml_dump(repomd);
 }

diff --git a/src/repomd.h b/src/repomd.h
index 4c23d74..a40d576 100644 (file)
--- a/src/repomd.h
+++ b/src/repomd.h
@@ -36,6 +36,11 @@ extern "C" {
 typedef struct _cr_RepomdRecord * cr_RepomdRecord;
 
 /** \ingroup repomd
+ * cr_Repomd object - object representing repomd.xml
+ */
+typedef struct _cr_Repomd * cr_Repomd;
+
+/** \ingroup repomd
  * Internal representation of cr_RepomdRecord object
  */
 struct _cr_RepomdRecord {
@@ -53,13 +58,46 @@ struct _cr_RepomdRecord {
 };
 
 /** \ingroup repomd
+ * Internal representation of cr_Repomd object
+ */
+struct _cr_Repomd {
+    cr_RepomdRecord pri_xml;
+    cr_RepomdRecord fil_xml;
+    cr_RepomdRecord oth_xml;
+    cr_RepomdRecord pri_sql;
+    cr_RepomdRecord fil_sql;
+    cr_RepomdRecord oth_sql;
+    cr_RepomdRecord groupfile;
+    cr_RepomdRecord cgroupfile;
+    cr_RepomdRecord updateinfo;
+    GSList *repos;
+    GSList *distros;
+    GSList *contents;
+    gchar *revision;
+};
+
+typedef enum {
+    CR_MD_PRIMARY_XML,
+    CR_MD_FILELISTS_XML,
+    CR_MD_OTHER_XML,
+    CR_MD_PRIMARY_SQLITE,
+    CR_MD_FILELISTS_SQLITE,
+    CR_MD_OTHER_SQLITE,
+    CR_MD_GROUPFILE,
+    CR_MD_COMPRESSED_GROUPFILE,
+    CR_MD_UPDATEINFO
+} cr_RepomdRecordType;
+
+/** \ingroup repomd
  * Creates (alloc) new cr_RepomdRecord object
  * @param path                  path to the compressed file
  */
 cr_RepomdRecord cr_new_repomdrecord(const char *path);
 
 /** \ingroup repomd
- * Destroy cr_RepomdRecord object
+ * Destroy cr_RepomdRecord object.
+ * NOTE: Do NOT use this function on objects attached to cr_Repomd
+ * (by cr_repomd_set_record).
  * @param record                cr_RepomdRecord object
  */
 void cr_free_repomdrecord(cr_RepomdRecord record);
@@ -102,6 +140,24 @@ void cr_process_groupfile_repomdrecord(const char *base_path,
  */
 void cr_rename_repomdrecord_file(const char *base_path, cr_RepomdRecord record);
 
+cr_Repomd cr_new_repomd();
+void cr_repomd_set_record(cr_Repomd repomd,
+                          cr_RepomdRecord record,
+                          cr_RepomdRecordType type);
+void cr_repomd_set_revision(cr_Repomd repomd, const char *revision);
+void cr_repomd_add_distro_tag(cr_Repomd repomd,
+                              const char *cpeid,
+                              const char *val);
+void cr_repomd_add_repo_tag(cr_Repomd repomd, const char *repo);
+void cr_repomd_add_content_tag(cr_Repomd repomd, const char *content);
+
+/** \ingroup repomd
+ * Frees cr_Repomd object and all its cr_RepomdRecord objects
+ * @param repomd                cr_Repomd object
+ */
+void cr_free_repomd(cr_Repomd repomd);
+
+
 /** \ingroup repomd
  * Generate repomd.xml content.
  * @param path                  path to repository (to the directory contains
@@ -126,16 +182,7 @@ void cr_rename_repomdrecord_file(const char *base_path, cr_RepomdRecord record);
  *                              towards to the path param)
  * @return                      string with repomd.xml content
  */
-gchar *cr_generate_repomd_xml(const char *path,
-                              cr_RepomdRecord pri_xml,
-                              cr_RepomdRecord fil_xml,
-                              cr_RepomdRecord oth_xml,
-                              cr_RepomdRecord pri_sqlite,
-                              cr_RepomdRecord fil_sqlite,
-                              cr_RepomdRecord oth_sqlite,
-                              cr_RepomdRecord groupfile,
-                              cr_RepomdRecord cgroupfile,
-                              cr_RepomdRecord update_info);
+gchar *cr_generate_repomd_xml(cr_Repomd repomd);
 
 #ifdef __cplusplus
 }