Zachary Kotlarek 13 жил өмнө
parent
commit
c85afd68dc
1 өөрчлөгдсөн 10 нэмэгдсэн , 18 устгасан
  1. 10 18
      serial/cmd.pl

+ 10 - 18
serial/cmd.pl

@@ -2,35 +2,27 @@
 use strict;
 use warnings;
 use IO::Socket::UNIX;
-use POSIX qw(ceil floor);
 
-# App config
-my $TIMEOUT  = 5;
-my $TEMP_DIR = `getconf DARWIN_USER_TEMP_DIR`;
-chomp($TEMP_DIR);
-my $DATA_DIR = $TEMP_DIR . 'plexMonitor/';
+# Local modules
+use Cwd qw(abs_path);
+use File::Basename qw(dirname);
+use lib dirname(abs_path($0));
+use DMX;
 
-# Debug
-my $DEBUG = 0;
-if ($ENV{'DEBUG'}) {
-	$DEBUG = 1;
-}
+# App config
+my $DATA_DIR = DMX::dataDir();
 
 # Command-line parameters
 my ($DEV, $CMD) = @ARGV;
 my $CMD_FILE = $DATA_DIR . uc($DEV) . '.socket';
 
 # Sanity check
-if (!-d $DATA_DIR || !-S $CMD_FILE) {
-	die("Bad config\n");
+if (!-S $CMD_FILE) {
+	die('Invalid command file: ' . $CMD_FILE . "\n");
 }
 
 # Socket init
-my $sock = IO::Socket::UNIX->new(
-	'Peer'    => $CMD_FILE,
-	'Type'    => SOCK_DGRAM,
-	'Timeout' => $TIMEOUT
-) or die('Unable to open socket: ' . $CMD_FILE . ": ${@}\n");
+my $sock = DMX::clientSock($CMD_FILE);
 
 # Send the command
 $sock->send($CMD)