summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2008-07-09 22:19:11 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2008-07-09 22:19:11 +0000
commitd6b28cdfb93d8c1a9a43093396a0d4dc9ed17482 (patch)
tree9e102e2bbaa16e28117253045bc2a5f527995b32
parent4cecb202f8765bcf4a381064631db04150cf687a (diff)
downloadurpmi-d6b28cdfb93d8c1a9a43093396a0d4dc9ed17482.tar
urpmi-d6b28cdfb93d8c1a9a43093396a0d4dc9ed17482.tar.gz
urpmi-d6b28cdfb93d8c1a9a43093396a0d4dc9ed17482.tar.bz2
urpmi-d6b28cdfb93d8c1a9a43093396a0d4dc9ed17482.tar.xz
urpmi-d6b28cdfb93d8c1a9a43093396a0d4dc9ed17482.zip
add local metalink generation
-rw-r--r--urpm/args.pm2
-rw-r--r--urpm/download.pm86
-rwxr-xr-xurpmi1
3 files changed, 85 insertions, 4 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index 82d0d8ca..c3e23e73 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -123,6 +123,8 @@ my %options_spec = (
'allow-force' => sub { $urpm->{options}{'allow-force'} = 1 },
'parallel=s' => \$::parallel,
+ metalink => sub { $urpm->{options}{metalink} = 1 },
+
# deprecated in favor of --downloader xxx
wget => sub { $urpm->{options}{downloader} = 'wget' },
curl => sub { $urpm->{options}{downloader} = 'curl' },
diff --git a/urpm/download.pm b/urpm/download.pm
index cee61fa3..885b9a26 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -39,6 +39,15 @@ sub available_ftp_http_downloaders() {
grep { -x "/usr/bin/$binaries{$_}" || -x "/bin/$binaries{$_}" } ftp_http_downloaders();
}
+sub metalink_downloaders() { qw(aria2) }
+
+sub available_metalink_downloaders() {
+ my %binaries = (
+ aria2 => 'aria2c',
+ );
+ grep { -x "/usr/bin/$binaries{$_}" || -x "/bin/$binaries{$_}" } metalink_downloaders();
+}
+
#- parses proxy.cfg (private)
sub load_proxy_config () {
return if defined $proxy_config;
@@ -601,6 +610,15 @@ sub sync_aria2 {
(my $cwd) = getcwd() =~ /(.*)/;
chdir $options->{dir};
my ($buf, $total, $file) = ('', undef, undef);
+ my @files;
+ for(my $i = 0; $i < @_; $i++){
+ my $metalinkfile = @_[$i];
+ $metalinkfile =~ s/metalink:.*/metalink/;
+ if ( not grep { $_ eq $metalinkfile } @files){
+ push(@files, $metalinkfile);
+ }
+ }
+
my $aria2c_command = join(" ", map { "'$_'" }
"/usr/bin/aria2c",
"--timeout", $CONNECT_TIMEOUT,
@@ -613,7 +631,7 @@ sub sync_aria2 {
($options->{proxy} ? set_proxy({ type => "aria2", proxy => $options->{proxy} }) : ()),
($options->{retry} ? "--max-tries=$options->{retry}" : "--max-tries=3"),
(defined $options->{'aria2-options'} ? split /\s+/, $options->{'aria2-options'} : ()),
- @_);
+ @files);
$options->{debug} and $options->{debug}($aria2c_command);
@@ -757,7 +775,7 @@ sub sync {
$urpm->{debug} ? (debug => $urpm->{debug}) : (),
%options,
);
- foreach my $cpt (qw(compress limit-rate retry wget-options curl-options rsync-options prozilla-options aria2-options)) {
+ foreach my $cpt (qw(compress limit-rate retry wget-options curl-options rsync-options prozilla-options aria2-options metalink)) {
$all_options{$cpt} = $urpm->{options}{$cpt} if defined $urpm->{options}{$cpt};
}
@@ -804,8 +822,9 @@ sub _sync_webfetch_raw {
delete @files{qw(removable file)};
}
if ($files{ftp} || $files{http} || $files{https}) {
-
- my @available = urpm::download::available_ftp_http_downloaders();
+
+ #- If metalink is used, only aria2 is available as other downloaders doesn't support metalink
+ my @available = ($options->{metalink} ? urpm::download::available_metalink_downloaders() : urpm::download::available_ftp_http_downloaders());
#- first downloader of @available is the default one
my $preferred = $available[0];
@@ -820,6 +839,11 @@ sub _sync_webfetch_raw {
}
my $sync = $urpm::download::{"sync_$preferred"} or die N("no webfetch found, supported webfetch are: %s\n", join(", ", urpm::download::ftp_http_downloaders()));
my @l = (@{$files{ftp} || []}, @{$files{http} || []}, @{$files{https} || []});
+
+ # FIXME: This is rather crude and should probably be done some better place.
+ if($options->{metalink}){
+ _create_metalink_($urpm, \@l, $options);
+ }
while (@l) {
my $half_MAX_ARG = 131072 / 2;
# restrict the number of elements so that it fits on cmdline of curl/wget/proz/aria2c
@@ -842,6 +866,60 @@ sub _sync_webfetch_raw {
%files and die N("unable to handle protocol: %s", join ', ', keys %files);
}
+sub _create_metalink_ {
+ my ($urpm, $files, $options) = @_;
+ # Don't create a metalink when downloading mirror list
+ if(! $options->{media}){
+ return;
+ }
+ my $mirror;
+ foreach my $medium (@{$urpm->{media} || []}){
+ if($medium->{name} eq $options->{media}){
+ my $mirrorlist = $medium->{mirrorlist};
+ $mirror = $urpm->{mirrors_cache}->{$mirrorlist};
+ }
+ }
+
+ my $metalinkfile = "$urpm->{cachedir}/$options->{media}.metalink";
+ my $metalink = '<?xml version="1.0" encoding="utf-8"?>'."\n";
+ $metalink = $metalink.'<metalink version="3.0" generator="URPMI"'."\n";
+ $metalink = $metalink.'xmlns="http://www.metalinker.org/">'."\n";
+ $metalink = $metalink.'<files>'."\n";
+
+ for(my $i = 0; $i < @$files; $i++){
+ my $append = @$files[$i];
+ $append =~ s/$mirror->{chosen}//;
+ $metalink = $metalink."\t<file name=\"".basename($append)."\">\n";
+ $metalink = $metalink."\t\t<resources>\n";
+
+ for(my $i = 0; $i < @{$mirror->{list}}; $i++){
+ my $type = $mirror->{list}[$i]->{url};
+ $type =~ s/:\/\/.*//;
+ my $preference = 100-$i;
+ # If more than 100 mirrors, give all the remaining mirrors a priority of 0
+ if($preference < 0){
+ $preference = 0;
+ }
+ $metalink = $metalink."\t\t\t<url type=\"$type\" preference=\"$preference\"";
+ # Not supported in metalinks
+ #if(@$list[$i]->{bw}){
+ # $metalink = $metalink." bandwidth=\"".@$list[$i]->{bw}."\" ";
+ # }
+ # Supported in metalinks, but no longer used in mirror list..?
+ if($mirror->{list}[$i]->{connections}){
+ $metalink = $metalink." maxconnections=\"".$mirror->{list}[$i]->{connections}."\"";
+ }
+ $metalink = $metalink." location=\"".lc($mirror->{list}[$i]->{zone})."\">".$mirror->{list}[$i]->{url}.$append."</url>\n";
+ }
+ $metalink = $metalink."\t\t</resources>\n";
+ $metalink = $metalink."\t</file>\n";
+ @$files[$i] = "$metalinkfile:$append";
+ }
+ $metalink = $metalink."</files>\n</metalink>\n";
+
+ output_safe("$metalinkfile", $metalink);
+}
+
1;
__END__
diff --git a/urpmi b/urpmi
index 7c3c0cda..200a3251 100755
--- a/urpmi
+++ b/urpmi
@@ -111,6 +111,7 @@ usage:
") . N(" --urpmi-root - use another root for urpmi db & rpm installation.
") . N(" --use-distrib - configure urpmi on the fly from a distrib tree, useful
to install a chroot with --root option.
+") . N(" --metalink - generate and use a local metalink.
") . N(" --downloader - program to use to retrieve distant files.
known programs: %s
", join(', ', urpm::download::ftp_http_downloaders()))