00dani/stow
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

do_link(): improve variable names

Browse source
This commit is contained in:
Adam Spiers 2024-04-01 00:34:19 +01:00
parent 48c6b5956b
commit c2da8b416d
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/Stow.pm.in
View file

@ -2159,17 +2159,17 @@ sub read_a_link {
internal_error("read_a_link() passed a non link path: $path\n"); internal_error("read_a_link() passed a non link path: $path\n");
} }
=head2 do_link($oldfile, $newfile) =head2 do_link($link_dest, $link_src)
Wrap 'link' operation for later processing Wrap 'link' operation for later processing
=over 4 =over 4
=item $oldfile =item $link_dest
the existing file to link to the existing file to link to
=item $newfile =item $link_src
the file to link the file to link
@ -2182,17 +2182,17 @@ Cleans up operations that undo previous operations.
sub do_link { sub do_link {
my $self = shift; my $self = shift;
my ($oldfile, $newfile) = @_; my ($link_dest, $link_src) = @_;
if (exists $self->{dir_task_for}{$newfile}) { if (exists $self->{dir_task_for}{$link_src}) {
my $task_ref = $self->{dir_task_for}{$newfile}; my $task_ref = $self->{dir_task_for}{$link_src};
if ($task_ref->{action} eq 'create') { if ($task_ref->{action} eq 'create') {
if ($task_ref->{type} eq 'dir') { if ($task_ref->{type} eq 'dir') {
internal_error( internal_error(
"new link (%s => %s) clashes with planned new directory", "new link (%s => %s) clashes with planned new directory",
$newfile, $link_src,
$oldfile, $link_dest,
); );
} }
} }
@ -2204,11 +2204,11 @@ sub do_link {
} }
} }
if (exists $self->{link_task_for}{$newfile}) { if (exists $self->{link_task_for}{$link_src}) {
my $task_ref = $self->{link_task_for}{$newfile}; my $task_ref = $self->{link_task_for}{$link_src};
if ($task_ref->{action} eq 'create') { if ($task_ref->{action} eq 'create') {
if ($task_ref->{source} ne $oldfile) { if ($task_ref->{source} ne $link_dest) {
internal_error( internal_error(
"new link clashes with planned new link: %s => %s", "new link clashes with planned new link: %s => %s",
$task_ref->{path}, $task_ref->{path},
@ -2216,16 +2216,16 @@ sub do_link {
) )
} }
else { else {
debug(1, 0, "LINK: $newfile => $oldfile (duplicates previous action)"); debug(1, 0, "LINK: $link_src => $link_dest (duplicates previous action)");
return; return;
} }
} }
elsif ($task_ref->{action} eq 'remove') { elsif ($task_ref->{action} eq 'remove') {
if ($task_ref->{source} eq $oldfile) { if ($task_ref->{source} eq $link_dest) {
# No need to remove a link we are going to recreate # No need to remove a link we are going to recreate
debug(1, 0, "LINK: $newfile => $oldfile (reverts previous action)"); debug(1, 0, "LINK: $link_src => $link_dest (reverts previous action)");
$self->{link_task_for}{$newfile}->{action} = 'skip'; $self->{link_task_for}{$link_src}->{action} = 'skip';
delete $self->{link_task_for}{$newfile}; delete $self->{link_task_for}{$link_src};
return; return;
} }
# We may need to remove a link to replace it so continue # We may need to remove a link to replace it so continue
@ -2236,15 +2236,15 @@ sub do_link {
} }
# Creating a new link # Creating a new link
debug(1, 0, "LINK: $newfile => $oldfile"); debug(1, 0, "LINK: $link_src => $link_dest");
my $task = { my $task = {
action => 'create', action => 'create',
type => 'link', type => 'link',
path => $newfile, path => $link_src,
source => $oldfile, source => $link_dest,
}; };
push @{ $self->{tasks} }, $task; push @{ $self->{tasks} }, $task;
$self->{link_task_for}{$newfile} = $task; $self->{link_task_for}{$link_src} = $task;
return; return;
} }