From 6918d9fc27dcd56ee0e1a77702238b8f2b470b82 Mon Sep 17 00:00:00 2001 From: rtrimana Date: Mon, 5 Aug 2019 17:29:59 -0700 Subject: [PATCH] Removing more third-party apps; fixing more bugs. --- Extractor/ExtractorScript.py | 6 +++++- appLists/device-interaction/hueLightsAppList | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py index 5ed1a14..350bdee 100644 --- 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 71763e8..7604292 100644 --- 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 -- 2.34.1