Changeset 102:b2f8756ebfeb

Timestamp:

10/25/08 23:05:13 (3 years ago)

Author:

chris

Branch:

unix

Children:

103:53ed1f0943b8, 106:3b863d4d373e

Message:

add ability to send test alerts to all devices

Files:

• EmailAlertDevice.py (modified) (1 diff)
• TestAlert.py (added)
• XmlWeather.py (modified) (3 diffs)
• examples/test-alert.cap (added)
• ss.py (modified) (3 diffs)

EmailAlertDevice.py

@@ -70 +70 @@
                         str += "TextWidth: %i" % self.__textwidth
 
-                str += "To: " + self.to + "\n" + \
-                                self.__smtpInfo.__str__() + \
+                str += self.__smtpInfo.__str__() + \
                                 super(EmailAlertDevice,self).__str__()
 

XmlWeather.py

@@ -43 +43 @@
 import urllib
 import logging
+import sys
 from xml.dom import minidom
 
@@ -74 +75 @@
                         if(self.__simfetch):
                                 self.log.info("Simulating fetch using examples directory")
-                                self.dom = minidom.parse("examples/" + self.__state.lower() + ".cap")
+                                self.__dom = minidom.parse("examples/" + self.__state.lower() + ".cap")
                         else:
-                                self.dom = minidom.parse(urllib.urlopen(self.__url))
-                except IOError:
+                                self.__dom = minidom.parse(urllib.urlopen(self.__url))
+                except IOError,e:
                         # No net connection available, exit.
-                        self.log.error("Internet connection not available, exiting")
+                        self.log.error("Internet connection not available?, exiting: %s" % e)
                         sys.exit()
-
-                self.__parse()
 
         def __str__(self):
@@ -99 +98 @@
 
         def __parse(self):
-                for capXmlText in self.dom.getElementsByTagName(self.__tag_item):
+                for capXmlText in self.__dom.getElementsByTagName(self.__tag_item):
                         cap_item = CAP(capXmlText, self.__state)
                         #cap_item.display()

ss.py

@@ -43 +43 @@
 from optparse import OptionParser
 
+from TestAlert import TestAlert
+from WeatherAlert import WeatherAlert
 from StormWeather import StormWeather
 from StormConfig import StormConfig
@@ -76 +78 @@
                                         help="Override log configuration file", metavar="file_name", default=None)
 
+        parser.add_option("-t", "--testpage", 
+                                        action="store_true", dest="testpage", default=False,
+                                        help="Send a test alert to all configured devices")
+
 
         (options, args) = parser.parse_args()
@@ -92 +98 @@
         #history.display()
 
-        for state in conf.states:
-                log.info("State: " + state)
-                xw = StormWeather(state,history,options.simfetch,options.simalert)
-                #xw.display()
+        if(not options.testpage):
+                for state in conf.states:
+                        log.info("State: " + state)
+                        xw = StormWeather(state,history,options.simfetch,options.simalert)
+                        #xw.display()
+                        for dev in conf.devices:
+                                if(dev.isStateWanted(state)):
+                                        xw.registerDevice(dev)
+                        xw.fetch()
+
+                history.save()
+        else:
+                log.info("Sending test page to all devices")
+                ta = TestAlert("examples/test-alert.cap")
+                ta.fetch()
                 for dev in conf.devices:
-                        if(dev.isStateWanted(state)):
-                                xw.registerDevice(dev)
-                xw.fetch()
-
-        history.save()
+                        log.info("\tSending test alert to:\n%s" % dev.__str__())
+                        dev.send(ta.weather_alert)