A bit of cleaning up.

[smartthings-infrastructure.git] / Extractor / ExtractorScript.py

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 350bdee428c2cef4d233986bf28575a3b490a427..c8786e671728918703cb790dcf09e1c9aa5ed155 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -15,7 +15,6 @@ app2Subscribe = False
 # Mapping for event type and number of events
 # e.g., switch has 2 events: on and off
 eventTypeCounterMap =  {'lock': 2,
-                                               'unlock' : 1,
                                                'nfcTouch' : 1,
                                                'app' : 1,
                                                'button' : 2,
@@ -40,14 +39,14 @@ eventTypeCounterMap =  {'lock': 2,
                                                'sunriseTime' : 1,
                                                'acceleration' : 2,
                                                'sleeping' : 2,
-                                               'goal' : 1,
-                                               'steps' : 1,
+                                               'goal' : 2,
+                                               'steps' : 2,
                                                'color' : 1,
                                                'colorTemperature' : 1,
                                                'hue' : 1,
                                                'saturation' : 1,
                                                'energy' : 1,
-                                               'power' : 1,
+                                               'power' : 2,
                                                'illuminance' : 1,
                                                'humidity' : 1,
                                                'alarm' : 4,
@@ -213,7 +212,10 @@ def ExtractFunctions(F, appName):
                        #print "DEBUG: %s - %s" % (variable, Temp)
                        #print capabilityMap
                        #print "DEBUG: location variable: %s" % Temp    
-                       
+
+                        #This is a bogus event, just skip it...
+                        if Temp == "unlock":
+                                continue                        
                        #Translate and reduce through mapping
                        if Temp in eventTypesMap.keys():                
                                Temp = eventTypesMap[Temp]
@@ -304,6 +306,7 @@ def CountEvents():
        global eventList
        numOfActualEvents = 0
        #print "DEBUG: eventlist: %d" % len(eventList)
+       #print "DEBUG: eventlist: %s" % eventList
        for event in eventList:
                #print "DEBUG: Event: %s %d" % (event, eventTypeCounterMap[event])
                numOfActualEvents = numOfActualEvents + eventTypeCounterMap[event]
@@ -330,6 +333,7 @@ def ExtractEvents(extractedEvents):
        #print "DEBUG: App1: %d" % indexApp1
        #print "DEBUG: App2: %d" % indexApp2
        #print "DEBUG: eventList: %d" % len(eventList)
+       #print eventList
        isApp1 = True
        while counter < numOfActualEvents:
                # Interleave events from App1 and App2
@@ -358,9 +362,6 @@ def ExtractEvents(extractedEvents):
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "unlock":
-                       #Don't do anything for this case
-                       counter = counter - 1
                elif eventList[i] == "nfcTouch":
                        event = open("eventSimulator/nfcTouchEvent.groovy", "r")
                        for line in event:
@@ -736,36 +737,42 @@ def ExtractEvents(extractedEvents):
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "acceleration.active":
-                       event = open("eventSimulator/accelerationDefaultActiveEvent.groovy", "r")
+               elif eventList[i] == "sleeping":
+                       #Write two events subsequently
+                       event = open("eventSimulator/sleepSleepingEvent.groovy", "r")                   
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "acceleration.inactive":
-                       event = open("eventSimulator/accelerationDefaultInactiveEvent.groovy", "r")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       event = open("eventSimulator/sleepNotSleepingEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "sleeping":
+               elif eventList[i] == "goal":
                        #Write two events subsequently
-                       event = open("eventSimulator/sleepSleepingEvent.groovy", "r")                   
+                       event = open("eventSimulator/stepGoalHighEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
                        extractedEvents.write("\n\t\t\tbreak\n")
                        counter = counter + 1
                        extractedEvents.write("\t\tcase %d:\n" % counter)
-                       event = open("eventSimulator/sleepNotSleepingEvent.groovy", "r")
+                       event = open("eventSimulator/stepGoalLowEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "goal":
-                       event = open("eventSimulator/stepGoalEvent.groovy", "r")
+               elif eventList[i] == "steps":
+                       #Write two events subsequently
+                       event = open("eventSimulator/stepStepsHighEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "steps":
-                       event = open("eventSimulator/stepStepsEvent.groovy", "r")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       event = open("eventSimulator/stepStepsLowEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
@@ -795,7 +802,15 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "power":
-                       event = open("eventSimulator/powerMeterEvent.groovy", "r")
+                       #Write two events subsequently
+                       event = open("eventSimulator/powerMeterHighPowerEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       event = open("eventSimulator/powerMeterLowPowerEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()