Single definition for the DATA_DIR

dmx/DMX.pm

@@ -28,10 +28,20 @@ my %CHANNEL_ADJ  = (
 	'15' => 1.19,
 );
 
+# Sanity check
+if (! -d $DATA_DIR) {
+	die('Data directory not available: ' . $DATA_DIR . "\n");
+}
+
 # State
 my $DMX_FH = undef();
 my $SELECT = undef();
 
+# Data directory
+sub dataDir() {
+	return $DATA_DIR;
+}
+
 # DMX socket init
 sub dmxSock() {
 	if (!defined($DMX_FH)) {

dmx/bias.pl

@@ -25,13 +25,12 @@ my %DIM = (
 );
 
 # App config
-my $TEMP_DIR     = `getconf DARWIN_USER_TEMP_DIR`;
-chomp($TEMP_DIR);
-my $DATA_DIR     = $TEMP_DIR . 'plexMonitor/';
+my $DATA_DIR     = DMX::dataDir();
 my $OUTPUT_FILE  = $DATA_DIR . 'BIAS';
 my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
+my $DELAY        = $PULL_TIMEOUT / 2;
 
 # Debug
 my $DEBUG = 0;
@@ -39,17 +38,6 @@ if ($ENV{'DEBUG'}) {
 	$DEBUG = 1;
 }
 
-# Command-line arguments
-my ($DELAY) = @ARGV;
-if (!$DELAY) {
-	$DELAY = $PULL_TIMEOUT / 2;
-}
-
-# Sanity check
-if (!-d $DATA_DIR) {
-	die("Bad config\n");
-}
-
 # Construct a list of valid states
 my %VALID = ();
 foreach my $key (keys(%DIM)) {

dmx/fan.pl

@@ -19,13 +19,12 @@ my %DIM = (
 );
 
 # App config
-my $TEMP_DIR     = `getconf DARWIN_USER_TEMP_DIR`;
-chomp($TEMP_DIR);
-my $DATA_DIR     = $TEMP_DIR . 'plexMonitor/';
+my $DATA_DIR     = DMX::dataDir();
 my $OUTPUT_FILE  = $DATA_DIR . 'FAN';
 my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
+my $DELAY        = $PULL_TIMEOUT / 2;
 
 # Debug
 my $DEBUG = 0;
@@ -33,17 +32,6 @@ if ($ENV{'DEBUG'}) {
 	$DEBUG = 1;
 }
 
-# Command-line arguments
-my ($DELAY) = @ARGV;
-if (!$DELAY) {
-	$DELAY = $PULL_TIMEOUT / 2;
-}
-
-# Sanity check
-if (!-d $DATA_DIR) {
-	die("Bad config\n");
-}
-
 # Sockets
 DMX::stateSocket($STATE_SOCK);
 DMX::stateSubscribe($STATE_SOCK);
@@ -62,9 +50,6 @@ DMX::dim({ 'channel' => 11, 'value' => 0, 'time' => 0 });
 # Loop forever
 while (1) {
 
-	# Set anywhere to force an update this cycle
-	my $update = 0;
-
 	# State is calculated; use newState to gather data
 	my $newState = $state;
 

dmx/overhead.pl

@@ -28,13 +28,12 @@ my %DIM = (
 );
 
 # App config
-my $TEMP_DIR     = `getconf DARWIN_USER_TEMP_DIR`;
-chomp($TEMP_DIR);
-my $DATA_DIR     = $TEMP_DIR . 'plexMonitor/';
+my $DATA_DIR     = DMX::dataDir();
 my $OUTPUT_FILE  = $DATA_DIR . 'OVERHEAD';
 my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
+my $DELAY        = $PULL_TIMEOUT / 2;
 
 # Debug
 my $DEBUG = 0;
@@ -42,17 +41,6 @@ if ($ENV{'DEBUG'}) {
 	$DEBUG = 1;
 }
 
-# Command-line arguments
-my ($DELAY) = @ARGV;
-if (!$DELAY) {
-	$DELAY = $PULL_TIMEOUT / 2;
-}
-
-# Sanity check
-if (!-d $DATA_DIR) {
-	die("Bad config\n");
-}
-
 # Construct a list of valid states
 my %VALID = ();
 foreach my $key (keys(%DIM)) {

dmx/rope.pl

@@ -56,13 +56,12 @@ my %DIM = (
 );
 
 # App config
-my $TEMP_DIR     = `getconf DARWIN_USER_TEMP_DIR`;
-chomp($TEMP_DIR);
-my $DATA_DIR     = $TEMP_DIR . 'plexMonitor/';
+my $DATA_DIR     = DMX::dataDir();
 my $OUTPUT_FILE  = $DATA_DIR . 'ROPE';
 my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
+my $DELAY        = $PULL_TIMEOUT / 2;
 
 # Debug
 my $DEBUG = 0;
@@ -70,17 +69,6 @@ if ($ENV{'DEBUG'}) {
 	$DEBUG = 1;
 }
 
-# Command-line arguments
-my ($DELAY) = @ARGV;
-if (!$DELAY) {
-	$DELAY = $PULL_TIMEOUT / 2;
-}
-
-# Sanity check
-if (!-d $DATA_DIR) {
-	die("Bad config\n");
-}
-
 # Construct a list of valid states
 my %VALID = ();
 foreach my $key (keys(%DIM)) {