summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/drakups
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/standalone/drakups')
-rwxr-xr-xperl-install/standalone/drakups187
1 files changed, 106 insertions, 81 deletions
diff --git a/perl-install/standalone/drakups b/perl-install/standalone/drakups
index bba576929..427216069 100755
--- a/perl-install/standalone/drakups
+++ b/perl-install/standalone/drakups
@@ -6,10 +6,10 @@ use standalone;
use common;
use mouse;
use detect_devices;
-use ugtk2 qw(:create :dialogs :helpers :wrappers);
+use ugtk3 qw(:create :dialogs :helpers :wrappers);
use interactive;
use Libconf qw(:functions);
-use Libconf::Glueconf::Ups;
+use Libconf::Glueconf::NUT::Ups_conf;
# config files:
my %files = (devices => "/etc/ups/ups.conf",
@@ -23,39 +23,47 @@ my ($w, $in); # GUI
my %indexes;
-sub writeconf {
+sub writeconf() {
info_dialog(N("Warning"), "Write support for users is incomplete\n\nIt lacks some support for some extra fields that would be lost else");
log::explanations("Updating NUT configuration accordingly");
$struct->writeConf($files{devices});
- log::explanations("Updating NUT users configuration accordingly");
- $users->writeConf($files{users});
+ if ($users) {
+ log::explanations("Updating NUT users configuration accordingly");
+ $users->writeConf($files{users});
+ }
+
+ require services;
+ services::restart("upsd");
+}
+
+sub read_nut_config() {
+ $struct = Libconf::Glueconf::NUT::Ups_conf->new({ filename => $files{devices} });
}
-sub readDriversList {
+sub readDriversList() {
my (%ups, @ups);
local $_;
- foreach (cat_(first(glob("/usr/share/doc/nut-*/docs/driver.list")))) {
+ foreach (cat_(first(glob("/usr/share/doc/nut/docs/driver.list")))) {
/^#/ and next;
if (my ($vendor, $model, $extra, $driver) = /^"(.*)"\s+"(.*)"\s+"(.*)"\s+"(.*)"/) {
- $ups{$vendor}{$model} = {
+ $ups{$vendor}{$model . $extra} = {
driver => $driver,
extra => $extra,
};
- push @ups, "$vendor|$model";
+ push @ups, "$vendor|$model ($extra)";
}
}
\%ups, \@ups;
}
+my %models;
+
sub add_device_wizard {
my ($in, $config) = @_;
my ($ups_models, $model_list) = readDriversList();
- use wizards;
- my ($ups, $vendor, $model, $name, $driver, $port, @new_devices);
- my $w = wizards->new;
- my $wiz;
+ my ($ups, $vendor, $model, $extra, $name, $driver, $port, @new_devices, $opts);
my %methods = (
# network => N("Connected through the network"), # need SNMP probe
# serial => N("Connected through a serial port"),
@@ -63,22 +71,23 @@ sub add_device_wizard {
auto => N("Connected through a serial port or an usb cable"),
manual => N("Manual configuration"),
);
- my $method = $methods{manual};
- $wiz = {
+ my $method = $methods{auto};
+ require wizards;
+ my $wiz = wizards->new({
#defaultimage => "logdrake.png", # FIXME
name => N("Add an UPS device"),
pages => {
welcome => {
name => N("Welcome to the UPS configuration utility.
-Here, you'll be add a new UPS to your system.\n"),
+Here, you'll add a new UPS to your system.\n"),
no_back => 1,
next => 'method'
},
method => {
name => N("We're going to add an UPS device.
-Do you prefer autodetect UPS devices connected to this machine or ?"),
+Do you want to autodetect UPS devices connected to this machine or to manually select them?"),
data => [ { label => N("Autodetection"), val => \$method, type => "list",
list => [ values %methods ] } ],
post => sub { +{ reverse %methods }->{$method} },
@@ -87,7 +96,7 @@ Do you prefer autodetect UPS devices connected to this machine or ?"),
end => 1,
pre => sub {
local $::isWizard;
- my $wait = $in->wait_message(N("Please wait"), N("Detection in progress"));
+ my $_wait = $in->wait_message(N("Please wait"), N("Detection in progress"));
# UPS autoconfig:
detect_devices::probeSerialDevices() if !$::testing;
@new_devices = ();
@@ -95,10 +104,11 @@ Do you prefer autodetect UPS devices connected to this machine or ?"),
foreach my $ups_device (detect_devices::getUPS()) {
my $str = $ups_device->{name} || $ups_device->{DESCRIPTION};
$str =~ s/ /_/g;
+ $name = $str;
if (!exists $struct->{$str}) {
- $struct->{$str}{port} = $ups_device->{port} || $ups_device->{DEVICE};
- $struct->{$str}{driver} = $ups_device->{driver};
+ $port = $struct->{$str}{port} = $ups_device->{port} || $ups_device->{DEVICE};
+ $driver = $struct->{$str}{driver} = $ups_device->{driver};
push @new_devices, $str;
}
}
@@ -106,7 +116,7 @@ Do you prefer autodetect UPS devices connected to this machine or ?"),
name => sub {
if (@new_devices) {
N("Congratulations") . "\n\n" .
- N("The wizard successfully added the following UPS devices:", join("\n\n-", @new_devices))
+ N("The wizard successfully added the following UPS devices:") . join("\n\n-", @new_devices);
} else {
N("No new UPS devices was found");
}
@@ -117,9 +127,9 @@ Do you prefer autodetect UPS devices connected to this machine or ?"),
data => [ { label => N("Manufacturer / Model:"), val => \$ups, list => $model_list,
type => 'combo', sort => 1, separator => '|' }, ],
post => sub {
- ($vendor, $model) = split(/\|/, $ups);
- ($name, $driver, $port) = ("myups", $ups_models->{$vendor}{$model}{driver}, "");
- ($driver) = split(/\s*/, $driver);
+ ($vendor, $model, $extra) = ($1, $2, $3) if $ups =~ /(.*)\|(.*) \((.*)\)$/;
+ ($name, $driver, $port) = ("myups", $ups_models->{$vendor}{$model . $extra}{driver}, "");
+ ($driver, $opts) = split(/\s+/, $driver);
"driver";
},
},
@@ -131,13 +141,16 @@ Please fill in its name, its driver and its port.", $model, $vendor);
data => sub {
[
{ label => N("Name:"), val => \$name, help => N("The name of your ups") },
- { label => N("Driver:"), val => \$driver, help => N("The driver that manage your ups") },
- { label => N("Port:"), val => \$port, format => \&mouse::serial_port2text, type => "combo",
- list => [ &mouse::serial_ports() ], not_edit => 0,
+ { label => N("Driver:"), val => \$driver, help => N("The driver that manages your ups") },
+ { label => N("Port:"), val => \$port, format => \&detect_devices::serialPort2text, type => "combo",
+ list => [ &detect_devices::serialPorts() ], not_edit => 0,
help => N("The port on which is connected your ups") },
];
},
- next => "end",
+ post => sub {
+ $port = '/dev/' . $port if $port !~ m!/dev/!;
+ return 'end';
+ },
},
end => {
name => sub {
@@ -149,11 +162,14 @@ Please fill in its name, its driver and its port.", $model, $vendor);
next => 0
},
},
- };
- $w->process($wiz, $in);
+ });
+ $wiz->process($in);
$config->{$name}{driver} = $driver;
$config->{$name}{port} = $port;
+ $config->{$name}{$1} = $2 if $opts =~ /\b(.*)=(.*)\b/;
+ # refresh the GUI when needed:
+ $models{ups}->append_set(1 => $name, 2 => $driver, 3 => $port) if $models{ups};
log::explanations(qq(Configuring "$name" UPS));
}
@@ -178,27 +194,27 @@ sub load_access_conf() {
# misc gui data
sub edit_row {
- my ($model, $iter) = @_;
+ my ($model, $o_iter) = @_;
# create new item if needed (that is when adding a new one) at end of list
- $iter ||= $model->append;
- my $dialog = Gtk2::Dialog->new;
- $dialog->set_transient_for($w->{rwindow}) unless $::isEmbedded;
+ my $iter = $o_iter || $model->append;
+ my $dialog = Gtk3::Dialog->new;
+ $dialog->set_transient_for($w->{real_window});
$dialog->set_modal(1);
- gtkpack_($dialog->vbox,
+ gtkpack_($dialog->get_child,
#map {
#}
);
- gtkadd($dialog->action_area,
- gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => sub {
+ gtkadd($dialog->get_action_area,
+ gtksignal_connect(Gtk3::Button->new(N("Ok")), clicked => sub {
# create new item if needed (that is when adding a new one) at end of list
$iter ||= $model->append;
# $model->set($iter, 1 => $file->get_text); # FILL ME
$dialog->destroy;
# $modified++;
}),
- gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $dialog->destroy }),
+ gtksignal_connect(Gtk3::Button->new(N("Cancel")), clicked => sub { $dialog->destroy }),
);
$dialog->show_all;
@@ -206,22 +222,22 @@ sub edit_row {
}
-sub add_callback() {
- my ($model, $list, $getindex) = @_;
+sub add_callback {
+ my ($model, $_list, $_getindex) = @_;
edit_row($model);
}
-sub edit_callback() {
+sub edit_callback {
my ($model, $list) = @_;
my ($iter) = $list->get_selection->get_selected;
return unless $iter;
edit_row($model, $iter);
}
-sub del_callback() {
+sub del_callback {
my ($model, $list) = @_;
- my (undef, $iter) = $list->get_selection->get_selected;
- my $removed_idx = $list->get($iter, 0); # 1st column is index
+ #my (undef, $iter) = $list->get_selection->get_selected;
+ #my $removed_idx = $model->get($iter, 0); # 1st column is index
#@rules = grep { $_->{index} ne $removed_idx } @rules;
#$tree->remove($iter);
#sensitive_buttons(0);
@@ -239,13 +255,14 @@ my @pages = (
$::WizardWindow->destroy if defined $::WizardWindow;
undef $::WizardWindow;
},
- edit => sub { },
- remove => sub { },
+ edit => sub {},
+ remove => sub {},
},
load => sub {
- $struct = Libconf::Glueconf::Ups->new($files{devices});
+ read_nut_config();
map { [ $_, @{$struct->{$_}}{qw(driver port)} ] } keys %$struct;
},
+ id => "ups",
},
{ name => N("UPS users"),
columns => [ N("Name") ],
@@ -254,35 +271,38 @@ my @pages = (
my ($name) = @_;
$users->{$name} = {};
},
- edit => sub { },
- remove => sub { },
+ edit => sub {},
+ remove => sub {},
},
load => sub {
- $users = Libconf::Glueconf::Ups->new($files{users});
+ $users = Libconf::Glueconf::NUT::Ups_conf->new({ filename => $files{users} });
map { [ $_ ] } keys %$users;
},
+ id => "users",
},
{ name => N("Access Control Lists"),
columns => [ N("Name"), N("IP address"), N("IP mask") ],
callbacks => {
- add => sub { },
- edit => sub { },
- remove => sub { },
+ add => sub {},
+ edit => sub {},
+ remove => sub {},
},
load => sub {
load_access_conf();
@acls;
},
+ id => "acls",
},
{ name => N("Rules"),
columns => [ N("Action"), N("Level"), N("ACL name"), N("Password") ],
callbacks => {
- N("Add") => sub { },
- N("Edit") => sub { },
- N("Remove") => sub { },
+ N("Add") => sub {},
+ N("Edit") => sub {},
+ N("Remove") => sub {},
},
load => sub { @rules }, # already loaded when we loaded acls
+ id => "rules",
},
);
@@ -293,10 +313,22 @@ my @pages = (
#$in = 'interactive'->vnew('su'); # require_root_capability();
$in = 'interactive'->vnew;
-$ugtk2::wm_icon = "drakups";
-$w = ugtk2->new(N("DrakUPS"));
+$ugtk3::wm_icon = "drakups";
+
+if (!$::testing) {
+ $in->do_pkgs->ensure_is_installed('nut-server', '/usr/sbin/upsd') or $in->exit(1);
+}
+
+if (member('--wizard', @ARGV)) {
+ read_nut_config();
+ add_device_wizard($in, $struct);
+ writeconf();
+ $in->exit($@ ? 1 : 0);
+}
+
+$w = ugtk3->new(N("UPS Management"));
if (!$::isEmbedded) {
- $::main_window = $w->{rwindow};
+ mygtk3::register_main_window($w->{real_window});
$w->{window}->set_size_request(500, 550);
$w->{rwindow}->set_title(N("DrakUPS"));
}
@@ -306,10 +338,10 @@ if (!$::isEmbedded) {
my $_msg = N("Welcome to the UPS configuration tools");
-$w->{window}->add(gtkpack_(Gtk2::VBox->new,
- 0, Gtk2::Banner->new('drakups', N("DrakUPS")),
- 1, my $nb = Gtk2::Notebook->new,
- 0, create_okcancel( my $oc =
+$w->{window}->add(gtkpack_(Gtk3::VBox->new,
+ if_(!$::isEmbedded, 0, Gtk3::Banner->new('drakups', N("DrakUPS"))),
+ 1, my $nb = Gtk3::Notebook->new,
+ 0, create_okcancel(
{
ok_clicked => sub {
#$_->{save}->() foreach @pages;
@@ -325,42 +357,36 @@ $w->{window}->add(gtkpack_(Gtk2::VBox->new,
#------------------------------------------------------------------
# build the notebook
-my %labels = (
- add => N("Add"),
- edit => N("Edit"),
- remove => N("Remove"),
- );
-
foreach my $i (@pages) {
- my $model = Gtk2::ListStore->new("Glib::Int", ("Glib::String") x listlength(@{$i->{columns}}));
+ my $model = $models{$i->{id}} = Gtk3::ListStore->new("Glib::Int", ("Glib::String") x listlength(@{$i->{columns}}));
my (%buttons, $list);
$indexes{$i->{name}} = 0;
my $idx = \$indexes{$i->{name}};
- my $getindex = sub { ${$idx}++ };
- $nb->append_page(gtkpack_(Gtk2::VBox->new,
- 1, create_scrolled_window($list = Gtk2::TreeView->new_with_model($model),
+ my $getindex = sub { $$idx++ };
+ $nb->append_page(gtkpack_(Gtk3::VBox->new,
+ 1, create_scrolled_window($list = Gtk3::TreeView->new_with_model($model),
[ 'automatic', 'automatic' ]),
- 0, gtkpack(Gtk2::HButtonBox->new,
+ 0, gtkpack(Gtk3::HButtonBox->new,
(map {
my ($id, $label, $sub) = @$_;
- gtksignal_connect($buttons{$id} = Gtk2::Button->new($label), clicked => sub {
+ gtksignal_connect($buttons{$id} = Gtk3::Button->new($label), clicked => sub {
$sub->($model, $list, $getindex);
- })
+ });
} ([ 'add', N("Add"), $i->{callbacks}{add} || \&add_callback ],
[ 'edit', N("Edit"), \&edit_callback ],
- [ 'remove', N("Remove"), \&del_callback],
+ [ 'remove', N("Remove"), \&del_callback ],
)
)
#(map {
- # gtksignal_connect(Gtk2::Button->new($_), clicked => $i->{callbacks}{$_}),
+ # gtksignal_connect(Gtk3::Button->new($_), clicked => $i->{callbacks}{$_}),
#} keys %{$i->{callbacks}})
),
),
- Gtk2::Label->new($i->{name}),
+ Gtk3::Label->new($i->{name}),
);
#$i->{list} = $list;
each_index {
- $list->append_column(Gtk2::TreeViewColumn->new_with_attributes($_, Gtk2::CellRendererText->new, 'text' => $::i + 1));
+ $list->append_column(Gtk3::TreeViewColumn->new_with_attributes($_, Gtk3::CellRendererText->new, 'text' => $::i + 1));
} @{$i->{columns}};
my @u = $i->{load}->();
foreach my $line (@u) {
@@ -380,6 +406,5 @@ foreach my $i (@pages) {
#------------------------------------------------------------------
# let's start the show:
-$in->do_pkgs->ensure_is_installed('nut-server', '/usr/sbin/upsd') if !$::testing;
$w->{rwindow}->show_all;
$w->main;
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-25 19:40:00 +0000