Removing more third-party apps; fixing more bugs.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 5ed1a1451ade76a4287b17c563a04b4c4046026d..350bdee428c2cef4d233986bf28575a3b490a427 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -87,6 +87,7 @@ eventTypesMap =          {'alarm.both': 'alarm',
                                                'mute.unmuted' : 'mute',
                                                'presence.present' : 'presence',
                                                'presence.not present' : 'presence',
+                                               'presence.not' : 'presence',
                                                'smoke.detected' : 'smoke',
                                                'smoke.clear' : 'smoke',
                                                'smoke.tested' : 'smoke',
@@ -321,7 +322,10 @@ def ExtractEvents(extractedEvents):
        extractedEvents.write("\tswitch(eventNumber) {\n")
        counter = 0
        indexApp1 = 0
-       indexApp2 = eventAppList.index("App2")
+       if "App2" in eventAppList:
+               indexApp2 = eventAppList.index("App2")
+       else:
+               indexApp2 = len(eventList)
        indexApp2Start = indexApp2
        #print "DEBUG: App1: %d" % indexApp1
        #print "DEBUG: App2: %d" % indexApp2

diff --git a/appLists/device-interaction/hueLightsAppList b/appLists/device-interaction/hueLightsAppList
index 71763e8e54c497ee09e8921b36b6f3ad509747ae..7604292a5d9a55ffd5027a582c873d76147441a7 100644 (file)
--- a/appLists/device-interaction/hueLightsAppList
+++ b/appLists/device-interaction/hueLightsAppList
@@ -1,14 +1,14 @@
-03-sms-to-hue.groovy
 door-state-to-color-light-hue-bulb.groovy
 hue-minimote.groovy
 hue-mood-lighting.groovy
 notify-me-with-hue.groovy
 step-notifier.groovy
-tweet-to-hue.groovy
 BetterLaundryMonitor.groovy
-Hue Party Mode.groovy
+Hue-Party-Mode.groovy
 mini-hue-controller.groovy
 # The following apps are removed
+###tweet-to-hue.groovy
+###03-sms-to-hue.groovy
 ###jenkins-notifier.groovy
 ###hue-lights-and-groups-and-scenes-oh-my.groovy
 ###loft.groovy
\ No newline at end of file