Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create bee Events with less Effort #284

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Create bee Events with less Effort #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be84145
Bees can now create Events
penguwin Feb 20, 2020
20876b0
Use the bees CreateEvent method in openweathermapbee/event.go
penguwin Feb 20, 2020
6e9b6d0
Use the bees CreateEvent method in ircbee.go
penguwin Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions bees/bees.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*
* Authors:
* Christian Muehlhaeuser <[email protected]>
* Nicolas Martin <[email protected]>
*/

// Package bees is Beehive's central module system.
Expand Down Expand Up @@ -325,6 +326,42 @@ func (bee *Bee) LogEvent() {
bee.lastEvent = time.Now()
}

// CreateEvent creates an Event for the given name and fills it's Placeholders
// from the given map. This map should be structured like this:
//
// properties := map[string]interface{}{
// "event0": val0,
// "event1": val1,
// "event2": val2,
// // ...
// }
//
// whereas the map keys correspond to the placeholders name as string and the map
// values correspond to the desired values for the specific placeholder.
func (bee *Bee) CreateEvent(name string, prop map[string]interface{}) Event {
event := Event{
Bee: bee.Name(),
Name: name,
Options: []Placeholder{},
}

// iterate over the Events provided in the Namespace of the bee and match on
// the provided name
for _, ev := range (*factories[bee.Namespace()]).Events() {
if ev.Name == name {
// and create the corresponding Placholder for the Event
for _, pl := range ev.Options {
event.Options = append(event.Options, Placeholder{
Name: pl.Name,
Value: prop[pl.Name],
Type: pl.Type,
})
}
}
}
return event
}

// LogAction logs the last triggered action.
func (bee *Bee) LogAction() {
bee.lastAction = time.Now()
Expand Down
55 changes: 12 additions & 43 deletions bees/ircbee/ircbee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*
* Authors:
* Christian Muehlhaeuser <[email protected]>
* Nicolas Martin <[email protected]>
*/

// Package ircbee is a Bee that can connect to an IRC server.
Expand Down Expand Up @@ -153,23 +154,12 @@ func (mod *IrcBee) statusChange(eventChan chan bees.Event, conn *irc.Conn, line

channel := line.Args[0]
user := line.Src[:strings.Index(line.Src, "!")]
ev := bees.Event{
Bee: mod.Name(),
Name: strings.ToLower(line.Cmd),
Options: []bees.Placeholder{
{
Name: "channel",
Type: "string",
Value: channel,
},
{
Name: "user",
Type: "string",
Value: user,
},
},

properties := map[string]interface{}{
"channel": channel,
"user": user,
}
eventChan <- ev
eventChan <- mod.CreateEvent(strings.ToLower(line.Cmd), properties)
}

// Run executes the Bee's event loop.
Expand Down Expand Up @@ -226,33 +216,12 @@ func (mod *IrcBee) Run(eventChan chan bees.Event) {
user := line.Src[:strings.Index(line.Src, "!")]
hostmask := line.Src[strings.Index(line.Src, "!")+2:]

ev := bees.Event{
Bee: mod.Name(),
Name: "message",
Options: []bees.Placeholder{
{
Name: "channel",
Type: "string",
Value: channel,
},
{
Name: "user",
Type: "string",
Value: user,
},
{
Name: "hostmask",
Type: "string",
Value: hostmask,
},
{
Name: "text",
Type: "string",
Value: msg,
},
},
}
eventChan <- ev
eventChan <- mod.CreateEvent("message", map[string]interface{}{
"channel": channel,
"user": user,
"hostmask": hostmask,
"text": msg,
})
})

waitForDisconnect := false
Expand Down
213 changes: 38 additions & 175 deletions bees/openweathermapbee/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,166 +16,49 @@
*
* Authors:
* Christian Muehlhaeuser <[email protected]>
* Nicolas Martin <[email protected]>
* Nicolas Martin <[email protected]>
*/

package openweathermapbee

import (
"github.com/muesli/beehive/bees"

owm "github.com/briandowns/openweathermap"
)

// TriggerCurrentWeatherEvent triggers all current weather events
func (mod *OpenweathermapBee) TriggerCurrentWeatherEvent() {
ev := bees.Event{
Bee: mod.Name(),
Name: "current_weather",
Options: []bees.Placeholder{
{
Name: "geo_pos_longitude",
Type: "float64",
Value: mod.current.GeoPos.Longitude,
},
{
Name: "geo_pos_latitude",
Type: "float64",
Value: mod.current.GeoPos.Latitude,
},
{
Name: "sys_type",
Type: "int",
Value: mod.current.Sys.Type,
},
{
Name: "sys_id",
Type: "int",
Value: mod.current.Sys.ID,
},
{
Name: "sys_message",
Type: "float64",
Value: mod.current.Sys.Message,
},
{
Name: "sys_country",
Type: "string",
Value: mod.current.Sys.Country,
},
{
Name: "sys_sunrise",
Type: "int",
Value: mod.current.Sys.Sunrise,
},
{
Name: "sys_sunset",
Type: "int",
Value: mod.current.Sys.Sunset,
},
{
Name: "base",
Type: "string",
Value: mod.current.Base,
},
{
Name: "main_temp",
Type: "float64",
Value: mod.current.Main.Temp,
},
{
Name: "main_temp_min",
Type: "float64",
Value: mod.current.Main.TempMin,
},
{
Name: "main_temp_max",
Type: "float64",
Value: mod.current.Main.TempMax,
},
{
Name: "main_pressure",
Type: "float64",
Value: mod.current.Main.Pressure,
},
{
Name: "main_sealevel",
Type: "float64",
Value: mod.current.Main.SeaLevel,
},
{
Name: "main_grndlevel",
Type: "float64",
Value: mod.current.Main.GrndLevel,
},
{
Name: "main_humidity",
Type: "float64",
Value: mod.current.Main.Humidity,
},
{
Name: "wind_speed",
Type: "float64",
Value: mod.current.Wind.Speed,
},
{
Name: "wind_deg",
Type: "float64",
Value: mod.current.Wind.Deg,
},
{
Name: "clouds_all",
Type: "int",
Value: mod.current.Clouds.All,
},
{
Name: "rain",
Type: "map[string]float64",
Value: mod.current.Rain,
},
{
Name: "snow",
Type: "map[string]float64",
Value: mod.current.Snow,
},
{
Name: "dt",
Type: "int",
Value: mod.current.Dt,
},
{
Name: "id",
Type: "int",
Value: mod.current.ID,
},
{
Name: "name",
Type: "string",
Value: mod.current.Name,
},
{
Name: "cod",
Type: "int",
Value: mod.current.Cod,
},
{
Name: "unit",
Type: "string",
Value: mod.current.Unit,
},
{
Name: "lang",
Type: "string",
Value: mod.current.Lang,
},
{
Name: "key",
Type: "string",
Value: mod.current.Key,
},
},
properties := map[string]interface{}{
"geo_pos_longitude": mod.current.GeoPos.Longitude,
"geo_pos_latitude": mod.current.GeoPos.Latitude,
"sys_type": mod.current.Sys.Type,
"sys_id": mod.current.Sys.ID,
"sys_message": mod.current.Sys.Message,
"sys_country": mod.current.Sys.Country,
"sys_sunrise": mod.current.Sys.Sunrise,
"sys_sunset": mod.current.Sys.Sunset,
"base": mod.current.Base,
"main_temp": mod.current.Main.Temp,
"main_temp_min": mod.current.Main.TempMin,
"main_temp_max": mod.current.Main.TempMax,
"main_pressure": mod.current.Main.Pressure,
"main_sealevel": mod.current.Main.SeaLevel,
"main_grndlevel": mod.current.Main.GrndLevel,
"main_humidity": mod.current.Main.Humidity,
"wind_speed": mod.current.Wind.Speed,
"wind_deg": mod.current.Wind.Deg,
"clouds_all": mod.current.Clouds.All,
"rain": mod.current.Rain,
"snow": mod.current.Snow,
"dt": mod.current.Dt,
"id": mod.current.ID,
"name": mod.current.Name,
"cod": mod.current.Cod,
"unit": mod.current.Unit,
"lang": mod.current.Lang,
"key": mod.current.Key,
}
mod.evchan <- ev

mod.evchan <- mod.CreateEvent("current_weather", properties)

for _, v := range mod.current.Weather {
mod.TriggerWeatherInformationEvent(&v)
Expand All @@ -184,31 +67,11 @@ func (mod *OpenweathermapBee) TriggerCurrentWeatherEvent() {

// WeatherInformationEvent triggers a weather event
func (mod *OpenweathermapBee) TriggerWeatherInformationEvent(v *owm.Weather) {
weather := bees.Event{
Bee: mod.Name(),
Name: "main_weather",
Options: []bees.Placeholder{
{
Name: "id",
Type: "int",
Value: v.ID,
},
{
Name: "main",
Type: "string",
Value: v.Main,
},
{
Name: "description",
Type: "string",
Value: v.Description,
},
{
Name: "icon",
Type: "string",
Value: v.Icon,
},
},
properties := map[string]interface{}{
"id": v.ID,
"main": v.Main,
"description": v.Description,
"icon": v.Icon,
}
mod.evchan <- weather
mod.evchan <- mod.CreateEvent("main_weather", properties)
}