Unify socket nameing. I would use abstract names, but we are not on linux (yet).

dmx/Audio.pm

@@ -14,8 +14,8 @@ my $MEDIA_PATH = `~/bin/video/mediaPath`;
 
 # App config
 my $DATA_DIR   = DMX::dataDir();
-my $QT_FILE    = $DATA_DIR . 'QT_PLAYER';
-my $QT_SOCK    = $QT_FILE . '.socket';
+my $QT_SOCK    = 'QT_PLAYER';
+my $QT_FILE    = $DATA_DIR . $QT_SOCK;
 my $WAIT_DELAY = 0.1;
 my $MAX_WAIT   = 5 / $WAIT_DELAY;
 

dmx/DMX.pm

@@ -21,8 +21,8 @@ my $MAX_CMD_LEN  = 16384;
 my $TEMP_DIR     = `getconf DARWIN_USER_TEMP_DIR`;
 chomp($TEMP_DIR);
 my $DATA_DIR    = $TEMP_DIR . 'plexMonitor/';
-my $DMX_SOCK    = $DATA_DIR . 'DMX.socket';
-my $SUB_SOCK    = $DATA_DIR . 'STATE.socket';
+my $DMX_SOCK    = 'DMX';
+my $SUB_SOCK    = 'STATE';
 my %CHANNEL_ADJ = (
 	'13' => 1.00,
 	'14' => 1.14,
@@ -52,6 +52,7 @@ sub maxCmdLen() {
 # Generic client socket
 sub clientSock($) {
 	my ($path) = @_;
+	$path = $DATA_DIR . $path . '.socket';
 	my $sock = IO::Socket::UNIX->new(
 		'Peer'    => $path,
 		'Type'    => IO::Socket::UNIX::SOCK_DGRAM,
@@ -63,6 +64,7 @@ sub clientSock($) {
 # Generic server socket
 sub serverSock($) {
 	my ($path) = @_;
+	$path = $DATA_DIR . $path . '.socket';
 
 	if (-e $path) {
 		unlink($path);

dmx/amplifierPower.pl

@@ -11,9 +11,9 @@ use DMX;
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'AMPLIFIER_POWER';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
-my $AMP_SOCK     = $DATA_DIR . 'AMPLIFIER.socket';
+my $STATE_SOCK   = 'AMPLIFIER_POWER';
+my $AMP_SOCK     = 'AMPLIFIER';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/audio.pl

@@ -20,9 +20,9 @@ my %DEVS = (
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'AUDIO';
+my $STATE_SOCK   = 'AUDIO';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $OUTPUT_STATE = $OUTPUT_FILE . '_STATE';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = 1;

dmx/bias.pl

@@ -18,8 +18,8 @@ my %DIM = (
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'BIAS';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'BIAS';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/color.pl

@@ -21,8 +21,8 @@ my %PROFILES = (
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'COLOR';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'COLOR';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/debug.pl

@@ -16,8 +16,7 @@ my %DIM   = ();
 my $DELAY = 10;
 
 # App config
-my $DATA_DIR   = DMX::dataDir();
-my $STATE_SOCK = $DATA_DIR . 'DEBUG.socket';
+my $STATE_SOCK = 'DEBUG';
 
 # Sockets
 DMX::stateSocket($STATE_SOCK);

dmx/fan.pl

@@ -16,8 +16,8 @@ my %DIM = (
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'FAN';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'FAN';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/garage.pl

@@ -18,8 +18,8 @@ my %DIM         = (
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'GARAGE';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'GARAGE';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/leds.pl

@@ -49,8 +49,8 @@ my %DIM            = (
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'LED';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'LED';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/overhead.pl

@@ -19,8 +19,8 @@ my %DIM = (
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'OVERHEAD';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'OVERHEAD';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/projectorPower.pl

@@ -21,9 +21,9 @@ my $LAMP_LIFE   = 2000;
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'PROJECTOR_POWER';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
-my $PROJ_SOCK    = $DATA_DIR . 'PROJECTOR.socket';
+my $STATE_SOCK   = 'PROJECTOR_POWER';
+my $PROJ_SOCK    = 'PROJECTOR';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/qt_player.pl

@@ -25,8 +25,8 @@ sub cmdApp($$);
 
 # App config
 my $DATA_DIR    = DMX::dataDir();
-my $OUTPUT_FILE = $DATA_DIR . 'QT_PLAYER';
-my $STATE_SOCK  = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK  = 'QT_PLAYER';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $DELAY       = 5;
 my $MAX_CMD_LEN = 16384;
 

dmx/rave.pl

@@ -41,8 +41,8 @@ sub ampWait($$$);
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'RAVE_CMD';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'RAVE_CMD';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $RAVE_FILE    = $DATA_DIR . 'RAVE';
 my $EFFECT_FILE  = $DATA_DIR . 'EFFECT';
 my $PUSH_TIMEOUT = 20;

dmx/rifftrax.pl

@@ -33,8 +33,8 @@ sub playPausePlex();
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'RIFF';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'RIFF';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PULL_TIMEOUT = 60;
 my $DELAY        = $PULL_TIMEOUT / 3;
 my %RIFFS        = ();

dmx/rope.pl

@@ -64,8 +64,8 @@ my %DIM = (
 
 # App config
 my $DATA_DIR     = DMX::dataDir();
-my $OUTPUT_FILE  = $DATA_DIR . 'ROPE';
-my $STATE_SOCK   = $OUTPUT_FILE . '.socket';
+my $STATE_SOCK   = 'ROPE';
+my $OUTPUT_FILE  = $DATA_DIR . $STATE_SOCK;
 my $PUSH_TIMEOUT = 20;
 my $PULL_TIMEOUT = $PUSH_TIMEOUT * 3;
 my $DELAY        = $PULL_TIMEOUT / 2;

dmx/state.pl

@@ -92,7 +92,7 @@ my %EXTRAS = (
 # App config
 my $SOCK_TIMEOUT = 5;
 my $DATA_DIR     = DMX::dataDir();
-my $CMD_FILE     = $DATA_DIR . 'STATE.socket';
+my $CMD_FILE     = 'STATE';
 my $MAX_CMD_LEN  = 4096;
 my $RESET_CMD    = $ENV{'HOME'} . '/bin/video/dmx/reset.sh';
 my $PUSH_TIMEOUT = 20;
@@ -232,16 +232,11 @@ while (1) {
 		$fh->recv($path, $MAX_CMD_LEN);
 		$path =~ s/^\s+//;
 		$path =~ s/\s+$//;
+		$path =~ s/\W/_/g;
 		if ($DEBUG) {
 			print STDERR 'Got path: ' . $path . "\n";
 		}
 
-		# Only accept valid paths
-		if (!-r $path) {
-			print STDERR 'Invalid socket path: ' . $path . "\n";
-			next;
-		}
-
 		# Open the new socket
 		my $sub = eval { DMX::clientSock($path); };
 		if (!$sub) {

serial/cmd.pl

@@ -14,7 +14,7 @@ my $DATA_DIR = DMX::dataDir();
 
 # Command-line parameters
 my ($DEV, $CMD) = @ARGV;
-my $CMD_FILE = $DATA_DIR . uc($DEV) . '.socket';
+my $CMD_FILE = 'UberZach::Integration::' . uc($DEV);
 
 # Sanity check
 if (!-S $CMD_FILE) {

serial/launchd/com.uberzach.projector.plist

@@ -14,13 +14,7 @@
 	<key>Label</key>
 	<string>com.uberzach.projector</string>
 	<key>KeepAlive</key>
-	<dict>
-		<key>PathState</key>
-		<dict>
-			<key>/dev/tty.usbserial-A5006xbj</key>
-			<true/>
-		</dict>
-	</dict>
+	<true/>
 	<key>ProgramArguments</key>
 	<array>
 		<string>/Users/tv/bin/video/serial/projector.pl</string>

serial/serial.pl

@@ -116,7 +116,7 @@ if (basename($0) =~ /PROJECTOR/i) {
 
 # App config
 my $DATA_DIR        = DMX::dataDir();
-my $CMD_FILE        = $DATA_DIR . uc($DEV) . '.socket';
+my $CMD_FILE        = uc($DEV);
 my $BT_CHECK        = $ENV{'HOME'} . '/bin/btcheck';
 my $DELAY_STATUS    = 1;
 my $BYTE_TIMEOUT    = 50;