Skip to content

improvement of priority handling #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

improvement of priority handling #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c6e9c7
output priority in status list
flensrocker May 30, 2015
3debd71
don't create link if it exists with any priority
flensrocker May 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions vdrctl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Pod::PlainText;
use Term::ANSIColor;

my $PROGNAME = 'vdrctl';
my $VERSION = '0.1.0';
my $VERSION = '0.1.1';

my $argsdir = `pkg-config --variable argsdir vdr`;
chomp($argsdir);
Expand All @@ -21,11 +21,15 @@ my $availdir = "$argsdir/../conf.avail";
my $editor = $ENV{EDITOR};
$editor = 'vi' unless $editor;

my $default_priority = 50;

my $force;
my $force_prio;
GetOptions(
"argsdir=s" => \$argsdir,
"availdir=s" => \$availdir,
"force" => \$force,
"priority=i" => \$force_prio,
"help" => \&help,
"version" => \&version
) or die("Error in command line arguments\n");
Expand All @@ -39,7 +43,10 @@ GetOptions(

# Try name.conf
($name) = basename($file) =~ /^(.*?).conf$/ unless $name;
($priority) = $default_priority unless $priority;

$configfiles{$name}{available} = $file;
$configfiles{$name}{priority} = $priority;
}

foreach my $file (<"$argsdir/*.conf">) {
Expand All @@ -49,7 +56,10 @@ GetOptions(

# Try name.conf
($name) = basename($file) =~ /^(.*?).conf$/ unless $name;
($priority) = $default_priority unless $priority;

$configfiles{$name}{enabled} = $file;
$configfiles{$name}{priority} = $priority;
}

if ($ARGV[1]) {
Expand All @@ -76,24 +86,26 @@ GetOptions(

sub status {
my $configfiles_ref = shift;
print sprintf('%-22s%s', 'PLUGIN', 'STATE'), "\n";
print sprintf('%-22s%-10s%s', 'PLUGIN', 'STATE', 'PRIORITY'), "\n";

foreach my $plugin (sort(keys(%$configfiles_ref))) {
print sprintf('%-22s', $plugin);

if (!$configfiles_ref->{$plugin}->{enabled}) {
# Not in $argsdir --> disabled
print colored['bright_red bold'], 'disabled';
print colored['bright_red bold'], sprintf('%-10s', 'disabled');
}
elsif (!$configfiles_ref->{$plugin}->{available}) {
# Not in $availdir --> static
print 'static';
print sprintf('%-10s', 'static');
}
else {
# In both directories --> enabled
print colored['bright_green bold'], 'enabled';
print colored['bright_green bold'], sprintf('%-10s', 'enabled');
}

print $configfiles_ref->{$plugin}->{priority};

print "\n";
}
}
Expand Down Expand Up @@ -126,10 +138,19 @@ sub enable {
foreach my $plugin (@_) {
my $filename = basename($configfiles_ref->{$plugin}->{available})
or die("$plugin is unknown\n");
my $priority = basename($configfiles_ref->{$plugin}->{priority});
if ($force_prio) {
$priority = $force_prio;
}

# $file may be not the exact filename.
symlink(abs2rel("$availdir/$filename", $argsdir), "$argsdir/$filename")
or die "Cannot create symlink to $argsdir/$filename\n";
unless ($configfiles_ref->{$plugin}->{enabled} and !$force_prio) {
symlink(abs2rel("$availdir/$filename", $argsdir), "$argsdir/$priority-$plugin.conf")
or die "Cannot create symlink to $argsdir/$priority-$plugin.conf\n";
}
else {
die("$availdir/$filename is already linked to $argsdir");
}
}
}

Expand Down Expand Up @@ -226,6 +247,14 @@ AVAILDIR is /etc/vdr/conf.d/../conf.avail

=over 5

=item B<--force>

force deleting static files in ARGSDIR

=item B<--priority>=<n>

use <n> as priority instead of the one coded in the filename

=item B<--argsdir>=<directory>

read config-files from <directory> instead of ARGSDIR
Expand Down