From ddcf19029c7b58b2ea236bd14e6c1456949f0fc0 Mon Sep 17 00:00:00 2001
From: Olivier Thauvin
Date: Sun, 3 Oct 2010 15:36:00 +0000
Subject: - use google maps for location, improve messages
---
lib/MGA/Mirrors/Controller/Graph.pm | 70 ++++++++++++++++++++++++++++++++
lib/MGA/Mirrors/Controller/Mirrors.pm | 3 ++
lib/MGA/Mirrors/Controller/New.pm | 22 ++++++++--
lib/MGA/Mirrors/Controller/Report.pm | 44 ++++++++++++++++++++
lib/MGA/Mirrors/Controller/Root.pm | 10 ++++-
lib/MGA/Mirrors/DB.pm | 62 ++++++++++++++++++++--------
lib/MGA/Mirrors/View/GraphViz.pm | 29 +++++++++++++
root/html/includes/distrib/distrib.tt | 11 +++++
root/html/includes/header.tt | 10 ++++-
root/html/includes/host_information.tt | 48 ++++++++++++++++++++++
root/html/includes/new/confirm.tt | 8 ----
root/html/includes/new/invalid_mirror.tt | 2 +-
root/html/includes/new/invalid_uri.tt | 2 +-
root/html/includes/new/mirror_exists.tt | 4 +-
root/html/includes/new/new_host.tt | 9 ----
root/html/includes/new/overlap_hosts.tt | 9 +++-
root/html/includes/new/url_form.tt | 3 --
root/html/pages/mirrors/mirror.tt | 19 +++++++++
root/html/pages/new/confirm.tt | 24 +++++++++++
root/html/pages/new/index.tt | 13 +++++-
root/html/pages/new/new_host.tt | 14 +++++++
root/html/pages/report/index.tt | 35 ++++++++++++++++
t/controller_Graph.t | 9 ++++
t/controller_Report.t | 9 ++++
t/view_GraphViz.t | 7 ++++
25 files changed, 427 insertions(+), 49 deletions(-)
create mode 100644 lib/MGA/Mirrors/Controller/Graph.pm
create mode 100644 lib/MGA/Mirrors/Controller/Report.pm
create mode 100644 lib/MGA/Mirrors/View/GraphViz.pm
create mode 100644 root/html/includes/distrib/distrib.tt
delete mode 100644 root/html/includes/new/confirm.tt
delete mode 100644 root/html/includes/new/new_host.tt
create mode 100644 root/html/pages/mirrors/mirror.tt
create mode 100644 root/html/pages/new/confirm.tt
create mode 100644 root/html/pages/new/new_host.tt
create mode 100644 root/html/pages/report/index.tt
create mode 100644 t/controller_Graph.t
create mode 100644 t/controller_Report.t
create mode 100644 t/view_GraphViz.t
diff --git a/lib/MGA/Mirrors/Controller/Graph.pm b/lib/MGA/Mirrors/Controller/Graph.pm
new file mode 100644
index 0000000..5ca93cf
--- /dev/null
+++ b/lib/MGA/Mirrors/Controller/Graph.pm
@@ -0,0 +1,70 @@
+package MGA::Mirrors::Controller::Graph;
+use Moose;
+use namespace::autoclean;
+
+BEGIN {extends 'Catalyst::Controller'; }
+
+=head1 NAME
+
+MGA::Mirrors::Controller::Graph - Catalyst Controller
+
+=head1 DESCRIPTION
+
+Catalyst Controller.
+
+=head1 METHODS
+
+=cut
+
+
+=head2 index
+
+=cut
+
+sub index :Path :Args(0) {
+ my ( $self, $c ) = @_;
+
+ my $mirror_list = $c->model('Mirrors')->find_mirrors;
+ my $graph = GraphViz->new(layout => 'dot', overlap => 'orthoxy', rankdir => 1);
+ my %node;
+ my %edge;
+ foreach (@{$mirror_list || []}) {
+ $node{$_->{hostname}} = $_;
+ if ($_->{syncfrom}) {
+ $edge{$_->{syncfrom}}{$_->{hostname}} = 1;
+ }
+ }
+ my %nodadded;
+ foreach my $from (keys %edge) {
+ foreach my $to (keys %{ $edge{$from} ||{}}) {
+ foreach ($from, $to) {
+ if (!$nodadded{$_}) {
+ $graph->add_node($_, shape => 'box', cluster => $node{$_}{country});
+ }
+ }
+ $graph->add_edge($from, $to);
+ }
+ }
+ $c->stash->{graphviz}->{graph} = $graph;
+}
+
+sub end : Private {
+ my ($self, $c) = @_;
+ $c->view('GraphViz')->process($c);
+ $c->model('Mirrors')->db->rollback;
+}
+
+=head1 AUTHOR
+
+Olivier Thauvin
+
+=head1 LICENSE
+
+This library is free software. You can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/lib/MGA/Mirrors/Controller/Mirrors.pm b/lib/MGA/Mirrors/Controller/Mirrors.pm
index 5d07ca5..73fa5ae 100644
--- a/lib/MGA/Mirrors/Controller/Mirrors.pm
+++ b/lib/MGA/Mirrors/Controller/Mirrors.pm
@@ -41,6 +41,8 @@ sub mirror :Path :Args(1) {
city => $c->req->param('city'),
country => $c->req->param('country'),
syncfrom=> $c->req->param('syncfrom'),
+ latitude => $c->req->param('latitude'),
+ longitude => $c->req->param('longitude'),
);
}
}
@@ -48,6 +50,7 @@ sub mirror :Path :Args(1) {
$c->stash->{host} = $c->model('Mirrors')->find_mirrors({
hostname => $host,
})->[0];
+ $c->model('Mirrors')->db->commit;
}
=head1 AUTHOR
diff --git a/lib/MGA/Mirrors/Controller/New.pm b/lib/MGA/Mirrors/Controller/New.pm
index d3ec38c..bf4fa59 100644
--- a/lib/MGA/Mirrors/Controller/New.pm
+++ b/lib/MGA/Mirrors/Controller/New.pm
@@ -43,7 +43,7 @@ sub index :Path :Args(0) {
{ protocol => $uri->scheme,
hostname => $uri->host, });
if (@{$urls || []}) {
- $c->stash->{exists_url} = $urls;
+ $c->stash->{exists_url} = $urls->[0];
if ($urls->[0]->{valid}) {
$c->stash->{subtemplate} = 'new/mirror_exists.tt';
return;
@@ -57,6 +57,18 @@ sub index :Path :Args(0) {
if (my @overlap_hosts = $c->model('Mirrors')->find_host_ip_overlap($uri->host)) {
$c->stash->{overlap_hosts} = \@overlap_hosts;
+ if (@overlap_hosts == 1) {
+ my $maybeurl = $c->model('Mirrors')->find_urls({
+ protocol => $uri->scheme,
+ hostname => $overlap_hosts[0]
+ });
+ if (!@{$maybeurl || []}) {
+ my $totryurl = $uri->clone;
+ $totryurl->host($overlap_hosts[0]);
+ $c->stash->{urlmaybe} = $totryurl;
+ $c->req->params->{url} = $totryurl;
+ }
+ }
$c->stash->{subtemplate} = 'new/overlap_hosts.tt';
return;
}
@@ -65,17 +77,19 @@ sub index :Path :Args(0) {
$c->stash->{location} = $c->model('Mirrors')->locate_ips(@ips);
$c->stash->{host}{country} = $c->stash->{location}{code};
+ $c->stash->{host}{latitude} = $c->stash->{location}{latitude};
+ $c->stash->{host}{longitude} = $c->stash->{location}{longitude};
my $mirror = $c->model('Mirrors')->find_mirrors(
{ hostname => $uri->host, });
if (@{ $mirror || []}) {
$c->stash->{mirror} = $mirror->[0];
} elsif ($c->req->param('hostinfo')) {
- foreach (qw(city country syncfrom bandwidth)) {
+ foreach (qw(city country syncfrom bandwidth latitude longitude)) {
$c->session->{hostinfo}{$_} = $c->req->param($_);
}
} else {
- $c->stash->{subtemplate} = 'new/new_host.tt';
+ $c->stash->{template} = 'new/new_host.tt';
return;
}
@@ -99,6 +113,8 @@ sub confirm :Path :Args(1) {
country => $c->session->{hostinfo}{country},
bandwidth => $c->session->{hostinfo}{bandwidth},
syncfrom => $c->session->{hostinfo}{syncfrom},
+ latitude => $c->session->{hostinfo}{latitude},
+ longitude => $c->session->{hostinfo}{longitude},
);
} else {
return;
diff --git a/lib/MGA/Mirrors/Controller/Report.pm b/lib/MGA/Mirrors/Controller/Report.pm
new file mode 100644
index 0000000..b6cf3d3
--- /dev/null
+++ b/lib/MGA/Mirrors/Controller/Report.pm
@@ -0,0 +1,44 @@
+package MGA::Mirrors::Controller::Report;
+use Moose;
+use namespace::autoclean;
+use URI;
+
+BEGIN {extends 'Catalyst::Controller'; }
+
+=head1 NAME
+
+MGA::Mirrors::Controller::Report - Catalyst Controller
+
+=head1 DESCRIPTION
+
+Catalyst Controller.
+
+=head1 METHODS
+
+=cut
+
+
+=head2 index
+
+=cut
+
+sub index :Path :Args(0) {
+ my ( $self, $c ) = @_;
+
+}
+
+
+=head1 AUTHOR
+
+Olivier Thauvin
+
+=head1 LICENSE
+
+This library is free software. You can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
+__PACKAGE__->meta->make_immutable;
+
+1;
diff --git a/lib/MGA/Mirrors/Controller/Root.pm b/lib/MGA/Mirrors/Controller/Root.pm
index bbc4d4d..416442c 100644
--- a/lib/MGA/Mirrors/Controller/Root.pm
+++ b/lib/MGA/Mirrors/Controller/Root.pm
@@ -51,7 +51,15 @@ Attempt to render a view, if needed.
=cut
-sub end : ActionClass('RenderView') {}
+sub _end : ActionClass('RenderView') {
+ my ($self, $c) = @_;
+}
+
+sub end : Private {
+ my ($self, $c) = @_;
+ $c->forward('_end');
+ $c->model('Mirrors')->db->rollback;
+}
=head1 AUTHOR
diff --git a/lib/MGA/Mirrors/DB.pm b/lib/MGA/Mirrors/DB.pm
index 31eb4cc..8f66ac1 100644
--- a/lib/MGA/Mirrors/DB.pm
+++ b/lib/MGA/Mirrors/DB.pm
@@ -85,6 +85,7 @@ sub protocol_list {
sub bandwidth_name {
my ($self, $value) = @_;
+ $value or return;
my $select = $self->db->prepare(q{
select name from bandwidth where value = ?
});
@@ -103,6 +104,17 @@ sub bandwidth_list {
return $list->fetchall_arrayref({});
}
+sub country_info {
+ my ($self, $code) = @_;
+ my $list = $self->db->prepare(q{
+ select * from countries where code = ?
+ });
+ $list->execute($code);
+ my $res = $list->fetchrow_hashref;
+ $list->finish;
+ $res
+}
+
sub country_list {
my ($self) = @_;
my $list = $self->db->prepare(q{
@@ -151,31 +163,39 @@ sub check_distributions {
my ($self) = @_;
my $uneeded_check = $self->db->prepare(q{
- select * from mirrors_distributions where
+ select * from distributions_validity where
lastcheck > now() - '6 hours'::interval
});
$uneeded_check->execute();
my $uch = $uneeded_check->fetchall_hashref([ qw(urlskey distributionkey) ]);
my $listd = $self->db->prepare(q{
- select * from urls, distributions
- where urls.valid = true
+ select * from toplevel_urls, distributions
+ where toplevel_urls.valid = true
});
my $addstatus = $self->db->prepare(q{
- insert into mirrors_distributions (urlskey, distributionkey, exists)
+ insert into distributions_validity (urlskey, distributionkey, exists)
values (?,?,?)
});
my $updstatus = $self->db->prepare(q{
- update mirrors_distributions set lastcheck = now(), exists = ?
+ update distributions_validity set lastcheck = now(), exists = ?
+ where urlskey = ? and distributionkey = ?
+ });
+ my $upd_lastok = $self->db->prepare(q{
+ update distributions_validity set lastok = now()
where urlskey = ? and distributionkey = ?
});
my %urls_status = ();
my $updurl = $self->db->prepare(q{
- update urls set lastcheck = now(), valid = ?
+ update toplevel_urls set lastcheck = now(), valid = ?
+ where key = ?
+ });
+ my $upd_url_lastok = $self->db->prepare(q{
+ update toplevel_urls set lastok = now()
where key = ?
});
@@ -184,8 +204,10 @@ sub check_distributions {
$uch->{$res->{key}}{$res->{dkey}} and next;
my $url = $self->fmt_url($res);
if (!exists($urls_status{$res->{key}})) {
+ $self->update_host_ips($res->{hostname});
my $ok = $self->mirror_validity($url);
$updurl->execute($ok ? 1 : 0, $res->{key});
+ $upd_url_lastok->execute($res->{key}) if ($ok);
$urls_status{$res->{key}} = $ok;
}
$urls_status{$res->{key}} or next;
@@ -194,6 +216,7 @@ sub check_distributions {
if ($updstatus->execute($exists, $res->{key}, $res->{dkey}) == 0) {
$addstatus->execute($res->{key}, $res->{dkey}, $exists);
}
+ $upd_lastok->execute($res->{key}, $res->{dkey}) if ($exists);
$self->db->commit;
}
}
@@ -225,9 +248,12 @@ sub find_mirrors {
my ($self, $filters, $key) = @_;
my $query = q{
- select * from hosts
+ select *,
+ coalesce(hosts.latitude, countries.latitude) as latitude,
+ coalesce(hosts.longitude, countries.longitude) as longitude
+ from hosts
left join countries on countries.code = hosts.country
- where hosts.hostname in (select hostname from urls %s)
+ where hosts.hostname in (select hostname from toplevel_urls %s)
%s
};
@@ -266,8 +292,8 @@ sub _find_urls {
my ($self, $filters, $key) = @_;
my $query = q{
- select urls.* from urls join
- hosts on hosts.hostname = urls.hostname
+ select toplevel_urls.* from toplevel_urls join
+ hosts on hosts.hostname = toplevel_urls.hostname
};
my @vals;
if (keys %{ $filters || {} }) {
@@ -276,7 +302,7 @@ sub _find_urls {
$filters->{$_} or next;
my $field = {
hostname => 'hosts.hostname',
- protocol => 'urls.protocol',
+ protocol => 'toplevel_urls.protocol',
}->{$_} or next;
push(@w, sprintf('%s = any(?)', $field));
@@ -301,10 +327,10 @@ sub _find_distributions {
my ($self, $filters, $key) = @_;
my $query = q{
- select *, urls.path || distributions.relpath as path from hosts
- join urls on urls.hostname = hosts.hostname
- join mirrors_distributions on urls.key = mirrors_distributions.urlskey
- join distributions on distributions.dkey = mirrors_distributions.distributionkey
+ select *, toplevel_urls.path || distributions.relpath as path from hosts
+ join toplevel_urls on toplevel_urls.hostname = hosts.hostname
+ join distributions_validity on toplevel_urls.key = distributions_validity.urlskey
+ join distributions on distributions.dkey = distributions_validity.distributionkey
};
my @vals;
@@ -314,7 +340,7 @@ sub _find_distributions {
$filters->{$_} or next;
my $field = {
hostname => 'hosts.hostname',
- protocol => 'urls.protocol',
+ protocol => 'topelvel_urls.protocol',
version => 'distributions.version',
arch => 'distributions.arch',
country => 'mirrors.country',
@@ -382,7 +408,7 @@ sub add_or_update_url {
}
my $update = $self->db->prepare(q{
- update urls set path = ?, port = ?, valid = true
+ update toplevel_urls set path = ?, port = ?, valid = true
where hostname = ? and protocol = ?
});
@@ -391,7 +417,7 @@ sub add_or_update_url {
$uri->host, $uri->scheme
) == 0) {
my $add = $self->db->prepare(q{
- insert into urls (path, port, hostname, protocol)
+ insert into toplevel_urls (path, port, hostname, protocol)
values (?,?,?,?)
});
$add->execute($uri->path, $uri->port == $uri->default_port ? undef : $uri->port,
diff --git a/lib/MGA/Mirrors/View/GraphViz.pm b/lib/MGA/Mirrors/View/GraphViz.pm
new file mode 100644
index 0000000..05811cd
--- /dev/null
+++ b/lib/MGA/Mirrors/View/GraphViz.pm
@@ -0,0 +1,29 @@
+package MGA::Mirrors::View::GraphViz;
+
+use strict;
+use base 'Catalyst::View::GraphViz';
+
+=head1 NAME
+
+MGA::Mirrors::View::GraphViz - Catalyst GraphViz View
+
+=head1 SYNOPSIS
+
+See L
+
+=head1 DESCRIPTION
+
+Catalyst GraphViz View.
+
+=head1 AUTHOR
+
+Olivier Thauvin
+
+=head1 LICENSE
+
+This library is free software, you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
+=cut
+
+1;
diff --git a/root/html/includes/distrib/distrib.tt b/root/html/includes/distrib/distrib.tt
new file mode 100644
index 0000000..60e5090
--- /dev/null
+++ b/root/html/includes/distrib/distrib.tt
@@ -0,0 +1,11 @@
+[% IF c.req.param('version') AND c.req.param('arch') %]
+[% list = c.model('Mirrors').find_distributions({
+ version => c.req.param('version'),
+ arch => c.req.param('arch'),
+ protocol => c.req.param('protocol'),
+}) %]
+
+[% FOREACH l = list %]
+[% l.url %]
+[% END %]
+[% END %]
diff --git a/root/html/includes/header.tt b/root/html/includes/header.tt
index 7f8b1d5..76bace4 100644
--- a/root/html/includes/header.tt
+++ b/root/html/includes/header.tt
@@ -5,9 +5,15 @@
[% c.prototype.define_javascript_functions %]
+
-Mageia mirrors database
+Mageia mirrors database
-Mirror not found ? register it
+
diff --git a/root/html/includes/host_information.tt b/root/html/includes/host_information.tt
index c0cb7cb..2c9b574 100644
--- a/root/html/includes/host_information.tt
+++ b/root/html/includes/host_information.tt
@@ -1,4 +1,5 @@
+
+
+
+
+
+
+
+
+
diff --git a/root/html/includes/new/confirm.tt b/root/html/includes/new/confirm.tt
deleted file mode 100644
index e0bb7d4..0000000
--- a/root/html/includes/new/confirm.tt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
Really adding [% c.session.new_uri | html %] ?
-
-[% c.prototype.form_remote_tag({ url => c.uri_for('confirm'), update => 'foo' } ) %]
-
-
-
-
diff --git a/root/html/includes/new/invalid_mirror.tt b/root/html/includes/new/invalid_mirror.tt
index f22d0f3..bef66c8 100644
--- a/root/html/includes/new/invalid_mirror.tt
+++ b/root/html/includes/new/invalid_mirror.tt
@@ -1 +1 @@
-This url seems to not contain a valid mirror.
+This url seems to not point a valid mirror.
diff --git a/root/html/includes/new/invalid_uri.tt b/root/html/includes/new/invalid_uri.tt
index 87ced3c..4d9390e 100644
--- a/root/html/includes/new/invalid_uri.tt
+++ b/root/html/includes/new/invalid_uri.tt
@@ -1 +1 @@
-[% uri %] is not a valid url.
+[% uri %] is not a valid url.
diff --git a/root/html/includes/new/mirror_exists.tt b/root/html/includes/new/mirror_exists.tt
index f891993..3345cd2 100644
--- a/root/html/includes/new/mirror_exists.tt
+++ b/root/html/includes/new/mirror_exists.tt
@@ -1 +1,3 @@
-The url [% uri | html %] has same server and same protocol than [% exists_url.0.url %].
+The mirror [% uri.host | html %] is already registered serving the distribution via [% uri.scheme | html %]
+at url [% uri | html %]
+The URL [% exists_url.url %] cannot be added.
diff --git a/root/html/includes/new/new_host.tt b/root/html/includes/new/new_host.tt
deleted file mode 100644
index a4296d2..0000000
--- a/root/html/includes/new/new_host.tt
+++ /dev/null
@@ -1,9 +0,0 @@
-Enter Info for [% uri.host %]
-
-
diff --git a/root/html/pages/mirrors/mirror.tt b/root/html/pages/mirrors/mirror.tt
new file mode 100644
index 0000000..dad43c2
--- /dev/null
+++ b/root/html/pages/mirrors/mirror.tt
@@ -0,0 +1,19 @@
+Mirror: [% hostname %]
+
+Host information
+
+[% INCLUDE 'host_information.tt'
+ action = c.uri_for(hostname)
+%]
+
+URLs to the distribution
+
+[% FOREACH u = c.model('Mirrors').find_urls({ hostname => hostname }) %]
+[% IF loop.first %]
+
+[% END %]
+[% END %]
diff --git a/root/html/pages/new/confirm.tt b/root/html/pages/new/confirm.tt
new file mode 100644
index 0000000..2dde830
--- /dev/null
+++ b/root/html/pages/new/confirm.tt
@@ -0,0 +1,24 @@
+
+
Confirmation
+
+
The URL [% c.session.new_uri | html %] has been succefully validated.
+
+
Please confirm the addition into the database.
+
+[% IF c.session.hostinfo %]
+
This URL refer to new mirror [% new_uri.host %]
+[% IF c.session.hostinfo.country %]
+[% cinfo = c.model('Mirrors').country_info(c.session.hostinfo.country) %]
+located in [% cinfo.name | html %] ([% cinfo.continent | html %])
+[%- END -%].
+[% ELSE %]
+[% END %]
+
+[% IF exists_url %]
+
This url will replace the currently invalid url [% exists_url.url | html %].
+[% END %]
+
+[% c.prototype.form_remote_tag({ url => c.uri_for('confirm'), update => 'foo' } ) %]
+
+
+
diff --git a/root/html/pages/new/index.tt b/root/html/pages/new/index.tt
index 0ef4cfd..c20344c 100644
--- a/root/html/pages/new/index.tt
+++ b/root/html/pages/new/index.tt
@@ -1,5 +1,16 @@
-[% INCLUDE 'new/url_form.tt' %]
[% IF subtemplate %]
[% INCLUDE $subtemplate %]
+[% ELSE %]
+ Enter the url to the top level mirror tree. The URL must be in form
+
PROTOCOL://SERVER/PATH
+Supported protocol are
+[%- FOREACH proto = c.model('Mirrors').protocol_list -%]
+[%- IF NOT loop.first -%]
+[%- IF loop.last %] or [% ELSE %], [% END %]
+[%- END -%]
+[%- proto | html -%]
+[%- END -%].
[% END %]
+
+[% INCLUDE 'new/url_form.tt' %]
diff --git a/root/html/pages/new/new_host.tt b/root/html/pages/new/new_host.tt
new file mode 100644
index 0000000..d73600c
--- /dev/null
+++ b/root/html/pages/new/new_host.tt
@@ -0,0 +1,14 @@
+Unknown mirror [% uri.host %]
+
+This server is still unknown in our database, please complete information about this mirror.
+
+[% IF location %]
+According the IP address this host is located in
+[% location.name | html %] ([% location.continent | html %]).
+[% END %]
+
+