Преглед изворни кода

Prefer LINE of VALUE even if the file is only expected to contain a single line -- no reason to pick up data we do not need.

There may be value in adding a seperate non-slurping mode, but for now our files all too small to care (i.e. under 1 page)
Zachary Kotlarek пре 12 година
родитељ
комит
fe2b0c3fd7
1 измењених фајлова са 14 додато и 14 уклоњено
  1. 14 14
      dmx/state.pl

+ 14 - 14
dmx/state.pl

@@ -40,7 +40,7 @@ if ($HOST =~ /loki/i) {
 	}
 	}
 
 
 	# Garage door opener
 	# Garage door opener
-	$MON_FILES{ $MEDIA_PATH . '/DMX/cmd/GARAGE_CMD' } = 'EXISTS-VALUE-CLEAR';
+	$MON_FILES{ $MEDIA_PATH . '/DMX/cmd/GARAGE_CMD' } = 'EXISTS-LINE-CLEAR';
 }
 }
 
 
 # Available state files
 # Available state files
@@ -52,7 +52,7 @@ if ($HOST =~ /loki/i) {
 	$MON_FILES{'PLAYING'} = 'PLAYING';
 	$MON_FILES{'PLAYING'} = 'PLAYING';
 
 
 	# RiffTrax
 	# RiffTrax
-	$MON_FILES{'RIFF'} = 'VALUE-NOUPDATE';
+	$MON_FILES{'RIFF'} = 'LINE-NOUPDATE';
 
 
 	# Motion detection
 	# Motion detection
 	$MON_FILES{'MOTION'}        = 'MTIME';
 	$MON_FILES{'MOTION'}        = 'MTIME';
@@ -61,15 +61,15 @@ if ($HOST =~ /loki/i) {
 
 
 	# Projector
 	# Projector
 	$MON_FILES{'PROJECTOR'}       = 'STATUS';
 	$MON_FILES{'PROJECTOR'}       = 'STATUS';
-	$MON_FILES{'PROJECTOR_COLOR'} = 'VALUE-NOUPDATE';
-	$MON_FILES{'PROJECTOR_INPUT'} = 'VALUE-NOUPDATE';
-	$MON_FILES{'PROJECTOR_LAMP'}  = 'VALUE-NOUPDATE';
+	$MON_FILES{'PROJECTOR_COLOR'} = 'LINE-NOUPDATE';
+	$MON_FILES{'PROJECTOR_INPUT'} = 'LINE-NOUPDATE';
+	$MON_FILES{'PROJECTOR_LAMP'}  = 'LINE-NOUPDATE';
 
 
 	# Amplifier
 	# Amplifier
 	$MON_FILES{'AMPLIFIER'}       = 'STATUS';
 	$MON_FILES{'AMPLIFIER'}       = 'STATUS';
-	$MON_FILES{'AMPLIFIER_VOL'}   = 'VALUE-NOUPDATE';
-	$MON_FILES{'AMPLIFIER_MODE'}  = 'VALUE-NOUPDATE';
-	$MON_FILES{'AMPLIFIER_INPUT'} = 'VALUE-NOUPDATE';
+	$MON_FILES{'AMPLIFIER_VOL'}   = 'LINE-NOUPDATE';
+	$MON_FILES{'AMPLIFIER_MODE'}  = 'LINE-NOUPDATE';
+	$MON_FILES{'AMPLIFIER_INPUT'} = 'LINE-NOUPDATE';
 	$MON_FILES{'AUDIO_AMP'}       = 'EXISTS-ON';
 	$MON_FILES{'AUDIO_AMP'}       = 'EXISTS-ON';
 	$MON_FILES{'STEREO_CMD'}      = 'EXISTS-ON';
 	$MON_FILES{'STEREO_CMD'}      = 'EXISTS-ON';
 
 
@@ -80,14 +80,14 @@ if ($HOST =~ /loki/i) {
 	$MON_FILES{'EFFECT'} = 'EXISTS';
 	$MON_FILES{'EFFECT'} = 'EXISTS';
 
 
 	# Equipment
 	# Equipment
-	$MON_FILES{'FAN'}     = 'VALUE-NOUPDATE';
+	$MON_FILES{'FAN'}     = 'LINE-NOUPDATE';
 	$MON_FILES{'FAN_CMD'} = 'EXISTS-ON';
 	$MON_FILES{'FAN_CMD'} = 'EXISTS-ON';
 
 
 	# OS State
 	# OS State
-	$MON_FILES{'FRONT_APP'}   = 'VALUE-NOUPDATE';
-	$MON_FILES{'COLOR'}       = 'VALUE-NOUPDATE';
-	$MON_FILES{'AUDIO'}       = 'VALUE-NOUPDATE';
-	$MON_FILES{'AUDIO_STATE'} = 'VALUE-NOUPDATE';
+	$MON_FILES{'FRONT_APP'}   = 'LINE-NOUPDATE';
+	$MON_FILES{'COLOR'}       = 'LINE-NOUPDATE';
+	$MON_FILES{'AUDIO'}       = 'LINE-NOUPDATE';
+	$MON_FILES{'AUDIO_STATE'} = 'LINE-NOUPDATE';
 
 
 	# Lights
 	# Lights
 	$MON_FILES{'LED'}      = 'LINE-NOUPDATE';
 	$MON_FILES{'LED'}      = 'LINE-NOUPDATE';
@@ -97,7 +97,7 @@ if ($HOST =~ /loki/i) {
 
 
 	# TV
 	# TV
 	$MON_FILES{'TV'}     = 'STATUS';
 	$MON_FILES{'TV'}     = 'STATUS';
-	$MON_FILES{'TV_VOL'} = 'VALUE';
+	$MON_FILES{'TV_VOL'} = 'LINE';
 }
 }
 my %EXTRAS = (
 my %EXTRAS = (
 	'PLAYING' => {
 	'PLAYING' => {