pl/DisOrder.pm, etc.: Split `load_config' from `connect_to_server'.

[profile] / bin / disorder-autoplay

diff --git a/bin/disorder-autoplay b/bin/disorder-autoplay
index 0ab0051..7b0eca3 100755 (executable)
--- a/bin/disorder-autoplay
+++ b/bin/disorder-autoplay
@@ -59,9 +59,10 @@ EOF
 
 defined (my $op = shift @ARGV) or die_usage;
 if ($op eq "get") {
-  defined (my $conf = shift @ARGV) or die_usage;
+  defined (my $cf = shift @ARGV) or die_usage;
   !@ARGV or die_usage;
-  my $sk = connect_to_server $conf;
+  my $conf = load_config $cf;
+  my $sk = connect_to_server %$conf;
   my ($root, $list) = grobble_root $sk;
 
   for my $f (sort @$list) {
@@ -70,13 +71,14 @@ if ($op eq "get") {
   }
   close $sk;
 } else {
-  defined (my $conf = shift @ARGV) or die_usage;
+  defined (my $cf = shift @ARGV) or die_usage;
   my $fh;
   if (defined (my $list = shift @ARGV)) { open $fh, "<", $list; }
   else { $fh = \*STDIN; }
   my %black = ();
   while (<$fh>) { chomp; $black{$_} = 1; }
-  my $sk = connect_to_server $conf;
+  my $conf = load_config $cf;
+  my $sk = connect_to_server %$conf;
   my ($root, $list) = grobble_root $sk;
 
   FILE: for my $f (sort @$list) {