Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

_read_config: Minor refactor for readability and maintainability

Browse source
This commit is contained in:
Richard Hansen 2024-08-30 18:23:08 -04:00
parent ac67c04f13
commit 0f1ea65fd7
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ddclient.in
View file

@ -1896,32 +1896,20 @@ sub _read_config {
if (defined($locals{'host'})) { if (defined($locals{'host'})) {
$args[0] = (@args ? "$args[0]," : '') . $locals{host}; $args[0] = (@args ? "$args[0]," : '') . $locals{host};
} }
## accumulate globals my ($host, $login, $password) = @args;
if (!@args) { $locals{'login'} = $login if defined $login;
$locals{'password'} = $password if defined $password;
my @hosts = split_by_comma($host);
if (!@hosts) {
%globals = (%globals, %locals); %globals = (%globals, %locals);
next; next;
} }
for my $h (@hosts) {
## process this host definition
my ($host, $login, $password) = @args;
## add in any globals..
%locals = (%globals, %locals);
## override login and password if specified the old way.
$locals{'login'} = $login if defined $login;
$locals{'password'} = $password if defined $password;
## allow {host} to be a comma separated list of hosts
for my $h (split_by_comma($host)) {
# TODO: Shouldn't %locals go after $config{h}? Later lines should override earlier # TODO: Shouldn't %locals go after $config{h}? Later lines should override earlier
# lines, no? Otherwise, later assignments will have a mixed effect: assignments to new # lines, no? Otherwise, later assignments will have a mixed effect: assignments to new
# variables will take effect but assignments to variables that already have a value # variables will take effect but assignments to variables that already have a value
# will not. One problem with swapping the order: due to the `%locals = (%globals, # will not.
# %locals)` line above, any values in %globals would override any locals in the $config{$h} = {%globals, %locals, %{$config{$h} // {}}, 'host' => $h};
# previous host line.
$config{$h} = {%locals, %{$config{$h} // {}}};
$config{$h}{'host'} = $h;
} }
} }
close(FD); close(FD);