Added group merge functionality.

convert-pattern-dir-to-xml.py

@@ -9,14 +9,52 @@
 pattern_ns="http://novell.com/package/metadata/suse/pattern"
 NSMAP = {None : pattern_ns, "rpm": rpm_ns}
 
-def create_patterns(patterns_dir, outputdir):
+NSMAP_GROUP = {None : pattern_ns, "rpm": rpm_ns, "patterns": pattern_ns}
+
+TMP_FILE = "xmllint_tmp.xml"
+
+def process_yaml(stream, proot):
+	y = yaml.load(stream)
 
-	if (not patterns_dir or not os.path.exists(patterns_dir)):
-		print "Error: Pattern dir '%s' doesn't exist." % (patterns_dir)
-		return
+	# <name>
+	etree.SubElement(proot, "name").text = y['Name']
+
+	# <version>
+	if y.has_key('Version'):
+		etree.SubElement(proot, "version").attrib['ver'] = "%s" % y['Version']
+
+	# <arch>
+	if y.has_key('Arch'):
+		etree.SubElement(proot, "arch").text = "%s" % y['Arch']
+
+	# <summary>
+	etree.SubElement(proot, "summary").text = y['Summary']
+	# <description>
+	etree.SubElement(proot, "description").text = y['Description']
+	# <uservisible>
+	etree.SubElement(proot, "uservisible")
+	# <category>
+	cat = etree.SubElement(proot, "category")
+	cat.text = "Base Group"
+	cat.set("lang", "en")
+	# <rpm:requires>
+	req = etree.SubElement(proot, "{%s}requires" %rpm_ns)
+	packages = y['Packages']
 
-	TMP_FILE = "pattern_tmp.xml"
+	for p in packages:
+		if type(p).__name__=='dict':
+			a = p.values()[0]
+			if a == arch:
+				entry = etree.SubElement(req, "{%s}entry" %rpm_ns)
+				entry.set("name", p.keys()[0])
+				entry.set("arch", arch)
+		else:
+			entry = etree.SubElement(req, "{%s}entry" %rpm_ns)
+			entry.set("name", p)
+
+	return proot
 
+def create_patterns(patterns_dir, outputdir):
 	for f in os.listdir(patterns_dir):
 		if not f.endswith('.yaml'):
 			continue
@@ -26,72 +64,61 @@ def create_patterns(patterns_dir, outputdir):
 		print "Working on %s" % (output_file)
 
 		stream = file("%s/%s" %(patterns_dir,f), 'r')
-		y = yaml.load(stream)        
 		proot = etree.Element("pattern",  nsmap=NSMAP)
-		# <name>
-		etree.SubElement(proot, "name").text = y['Name']
-
-		# <version>
-		if y.has_key('Version'):
-			etree.SubElement(proot, "version").attrib['ver'] = "%s" % y['Version']
-
-		# <arch>
-		if y.has_key('Arch'):
-			etree.SubElement(proot, "arch").text = "%s" % y['Arch']
-
-		# <summary>
-		etree.SubElement(proot, "summary").text = y['Summary']
-		# <description>
-		etree.SubElement(proot, "description").text = y['Description']
-		# <uservisible>
-		etree.SubElement(proot, "uservisible")
-		# <category>
-		cat = etree.SubElement(proot, "category")
-		cat.text = "Base Group"
-		cat.set("lang", "en")
-		# <???>
-		req = etree.SubElement(proot, "{%s}requires" %rpm_ns)
-		if y.has_key('Patterns'):
-			collect = []
-			for pat in y['Patterns']:
-				if os.path.exists("%s/%s.yaml" %(patterns_dir, pat)):
-					pf = file("%s/%s.yaml" %(patterns_dir, pat), 'r')
-					pfy = yaml.load(pf)
-				if pfy.has_key('Packages'):
-					collect += pfy['Packages']
-		elif y.has_key('Packages'):
-			collect = y['Packages']
-
-		for p in collect:
-			if type(p).__name__=='dict':
-				a = p.values()[0]
-				if a == arch:
-					entry = etree.SubElement(req, "{%s}entry" %rpm_ns)
-				entry.set("name", p.keys()[0])
-				entry.set("arch", arch)
-		else:
-			entry = etree.SubElement(req, "{%s}entry" %rpm_ns)
-			entry.set("name", p)
-
-		if outputdir and not os.path.exists(outputdir):
-			os.makedirs(outputdir)
+		proot = process_yaml(stream,proot)
 
+		# Indent the XML with xmllint and output to file.
 		tree = etree.ElementTree(proot)
 		tree.write("%s" % (TMP_FILE))
 		os.system("xmllint --format %s --output %s" % (TMP_FILE, output_file))
 
+def merge_patterns(patterns_dir,outputdir):
+	xmlroot = etree.Element("patterns")
+
+	count = 0
+	for f in os.listdir(patterns_dir):
+		if not f.endswith('.yaml'):
+			continue
+		print >> sys.stderr, "Working on %s" %f
+		count = count + 1
+		stream = file("%s/%s" %(patterns_dir,f), 'r')
+		proot = etree.SubElement(xmlroot, "pattern",  nsmap=NSMAP_GROUP)
+		proot = process_yaml(stream,proot)
+
+	xmlroot.set('count', "%d" %count)
+	tree = etree.ElementTree(xmlroot)
+	# Indent the XML with xmllint and output to file.
+	tree.write("%s" % (TMP_FILE))
+	output_file = "%s/group.xml" % (outputdir)
+	os.system("xmllint --format %s --output %s" % (TMP_FILE, output_file))
 
 if __name__ == '__main__':
 	parser = optparse.OptionParser()
 
+	parser.add_option("", "--patternxml", action="store_true", dest="patternxml",
+			default=False,
+			help="Create separated pattern XML file for each pattern.")
+	parser.add_option("", "--groupxml", action="store_true", dest="groupxml",
+			default=False,
+			help="Create merged group.xml from all the available patterns.")
 	parser.add_option("-p", "--patterndir", type="string", dest="patterndir",
 			default=None,
 			help="Directory where the pattern .yaml files are located.")
 	parser.add_option("-o", "--outputdir", type="string", dest="outputdir",
-			default=None,
+			default=".",
 			help="Output directory where the resulting .xml files are created.")
 
 	(options, args) = parser.parse_args()
+
+	if (not options.patterndir or not os.path.exists(options.patterndir)):
+		print "Error: Pattern dir '%s' doesn't exist." % (options.patterndir)
+		exit(1)
 
-	create_patterns(options.patterndir,options.outputdir)
+	if options.outputdir and not os.path.exists(options.outputdir):
+		os.makedirs(options.outputdir)
+
+	if options.patternxml:
+		create_patterns(options.patterndir,options.outputdir)
 
+	if options.groupxml:
+		merge_patterns(options.patterndir,options.outputdir)