X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Extractor%2FExtractorScript.py;h=974afc453933e8c6f2dd0921524127d3465f4cfe;hb=c16421586f6281bce41fb42a22befbbb7d099745;hp=375a68823a5ae31166a3616478037556b9a03a04;hpb=96ca313fd54b9e7615c1355ff050a44f74e29883;p=smartthings-infrastructure.git diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py index 375a688..974afc4 100644 --- a/Extractor/ExtractorScript.py +++ b/Extractor/ExtractorScript.py @@ -86,7 +86,7 @@ def ExtractFunctions(F, appName): eventVarMap[Temp] = variable #Check and analyze capabilities for physical interaction - AnalyzeCapabilities(Temp, appName) + AnalyzeCapabilities(Temp, appName, F) Temp = GetToken(F) @@ -96,7 +96,7 @@ def ExtractFunctions(F, appName): -def AnalyzeCapabilities(Temp, appName): +def AnalyzeCapabilities(Temp, appName, F): #Illuminance related if (Temp == "capability.switch" or Temp == "capability.switchLevel" or @@ -115,6 +115,15 @@ def AnalyzeCapabilities(Temp, appName): app1Capabilities.append(Temp) else: app2Capabilities.append(Temp) + if (Temp == "capability"): + Temp = GetToken(F) #Get '"' + Temp = GetToken(F) #Get 'Music' + Temp = Temp + GetToken(F) #Get 'Player' + if (Temp == "MusicPlayer"): + if (appName == "App1"): + app1Capabilities.append("capability.musicPlayer") + else: + app2Capabilities.append("capability.musicPlayer") def AnalyzePhysicalInteraction(app1Capab, app2Capab): #Light