Author: locilka
Date: Mon Jul 9 15:56:44 2007
New Revision: 39252
URL: http://svn.opensuse.org/viewcvs/yast?rev=39252&view=rev
Log:
- Added new OneClickInstallStandard module written in Perl to
support XML format specified by One Click Install Standard
http://en.opensuse.org/Standards/One_Click_Install - Only
repositories are supported now.
- Added perl-XML-Simple to the spec file as 'Requires'.
Added:
trunk/packager/src/modules/OneClickInstallStandard.pm
Modified:
trunk/packager/package/yast2-packager.changes
trunk/packager/src/modules/Makefile.am
trunk/packager/yast2-packager.spec.in
Modified: trunk/packager/package/yast2-packager.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=39252&r1=39251&r2=39252&view=diff
==============================================================================
--- trunk/packager/package/yast2-packager.changes (original)
+++ trunk/packager/package/yast2-packager.changes Mon Jul 9 15:56:44 2007
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Mon Jul 9 15:52:53 CEST 2007 - locilka@suse.cz
+
+- Added new OneClickInstallStandard module written in Perl to
+ support XML format specified by One Click Install Standard
+ http://en.opensuse.org/Standards/One_Click_Install - Only
+ repositories are supported now.
+- Added perl-XML-Simple to the spec file as 'Requires'.
+
+-------------------------------------------------------------------
Wed Jul 4 10:57:55 CEST 2007 - locilka@suse.cz
- Callback function for setting the trust level to the GnuPG key
Modified: trunk/packager/src/modules/Makefile.am
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Makefile.am?rev=39252&r1=39251&r2=39252&view=diff
==============================================================================
--- trunk/packager/src/modules/Makefile.am (original)
+++ trunk/packager/src/modules/Makefile.am Mon Jul 9 15:56:44 2007
@@ -1,5 +1,5 @@
# Makefile.am for packager/src/modules
-module_DATA = $(wildcard [A-Z]*.ycp)
+module_DATA = $(wildcard [A-Z]*.ycp [A-Z]*.pm)
EXTRA_DIST = $(module_DATA)
include $(top_srcdir)/Makefile.am.common
Added: trunk/packager/src/modules/OneClickInstallStandard.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/OneClickInstallStandard.pm?rev=39252&view=auto
==============================================================================
--- trunk/packager/src/modules/OneClickInstallStandard.pm (added)
+++ trunk/packager/src/modules/OneClickInstallStandard.pm Mon Jul 9 15:56:44 2007
@@ -0,0 +1,133 @@
+#!/usr/bin/perl -w
+
+#
+# Module: OneClickInstallStandard.pm
+# Authors: Lukas Ocilka
+# Summary: Module for parsing One Click Install Standard
+# http://en.opensuse.org/Standards/One_Click_Install
+#
+
+package OneClickInstallStandard;
+
+use strict;
+
+use XML::Simple;
+
+use YaPI;
+use YaST::YCP;
+
+my %config = (
+ # evaluate everything as arrays
+ ForceArray => 1,
+ # remove the the first XML tag
+ KeepRoot => 0,
+ NoEscape => 1,
+ NoIndent => 1,
+ ForceContent => 1,
+ ContentKey => '-content',
+);
+
+our %TYPEINFO;
+
+##
+# Converts XML to a list of maps with all repositories described in the XML content.
+#
+# @param XML content as descibed at http://en.opensuse.org/Standards/One_Click_Install
+# @return list >
+#
+# @struct $[
+# "distversion" : "openSUSE Factory",
+# "url" : "full url of the repository (http://.../)",
+# "format" : "yast",
+# "recommended" : true,
+# "description" : "repository description",
+# "localized_description" : $[
+# "en_GB" : "repository description (localized to en_GB)",
+# ...
+# ],
+# "summary" : "repository summary",
+# "localized_summary" : $[
+# "en_GB" : "repository summary (localized to en_GB)",
+# ...
+# ],
+# "name" : "repository name",
+# "localized_name" : $[
+# "en_GB" : "repository name (localized to en_GB)",
+# ...
+# ],
+# "mirrors" : [
+# $[
+# "url" : "full url of the mirror (http://.../)",
+# "location" : "?",
+# "score" : number,
+# ]
+# ...
+# ]
+# ]
+BEGIN {$TYPEINFO{GetRepositoriesFromXML} = ["function", ["list", ["map", "string", "any"]], "string"];}
+sub GetRepositoriesFromXML ($) {
+ my $class = shift;
+
+ my $xmlfilecontent = shift || do {
+ y2error ("First parameter needs to be a XML content");
+ return undef;
+ };
+
+ my $xmlparser = new XML::Simple (%config);
+ my $data = $xmlparser->XMLin ($xmlfilecontent);
+ $xmlparser = undef;
+
+ my $groups = $data->{'group'} || [];
+ $data = undef;
+
+ my @repos = ();
+ my $repo = {};
+ # default language is used when no 'language' string is defined
+ my $default_lang = "en_US";
+
+ foreach my $group (@{$groups}) {
+ foreach my $one_repo_group (@{$group->{'repositories'}}) {
+ foreach my $one_repo (@{$one_repo_group->{'repository'}}) {
+ $repo = {};
+ $repo->{'distversion'} = $group->{'distversion'} || "";
+ $repo->{'format'} = $one_repo->{'format'} || "";
+
+ # fills up:
+ # * name, description, summary (string)
+ # * localized_name, localized_description, localized_summary (map )
+ foreach my $key ('name', 'description', 'summary') {
+ foreach my $repo_keys (@{$one_repo->{$key}}) {
+ my $lang = $repo_keys->{'lang'} || $default_lang;
+ $repo->{'localized_'.$key}->{$lang} = $repo_keys->{'content'} || "";
+ }
+ if (defined $repo->{'localized_'.$key}->{$default_lang}) {
+ $repo->{$key} = $repo->{'localized_'.$key}->{$default_lang};
+ }
+ }
+
+ my @mirrors = ();
+ foreach my $repo_url (@{$one_repo->{'url'}}) {
+ # default url
+ if (! defined $repo_url->{'score'} && ! defined $repo_url->{'location'}) {
+ $repo->{'url'} = $repo_url->{'content'} || "";
+ } else {
+ push @mirrors, {
+ 'url' => $repo_url->{'content'} || "",
+ 'score' => $repo_url->{'score'} || "",
+ 'location' => $repo_url->{'location'} || "",
+ };
+ }
+ }
+ if (scalar(@mirrors) > 0) {
+ @{$repo->{'mirrors'}} = @mirrors;
+ }
+
+ push @repos, $repo;
+ }
+ }
+ }
+
+ return \@repos;
+}
+
+$! = 1;
Modified: trunk/packager/yast2-packager.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=39252&r1=39251&r2=39252&view=diff
==============================================================================
--- trunk/packager/yast2-packager.spec.in (original)
+++ trunk/packager/yast2-packager.spec.in Mon Jul 9 15:56:44 2007
@@ -5,6 +5,9 @@
BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-slp
BuildRequires: yast2 >= 2.15.38
+# Module: OneClickInstallStandard
+Requires: perl-XML-Simple
+
Requires: yast2-country
Requires: yast2-installation >= 2.15.12
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
