From 82a837c19e73ea37117d7f72a967857e0b1bf8c6 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@dieschrollis.de>
Date: Fri, 22 May 2015 21:27:46 +0200
Subject: [PATCH 1/2] move loadPlugins() pHanlder->pLoader

---
 boswatch.py               |  4 ++--
 includes/pluginHandler.py | 14 +-------------
 includes/pluginloader.py  | 10 ++++++++++
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/boswatch.py b/boswatch.py
index 678e37f..2768a5e 100755
--- a/boswatch.py
+++ b/boswatch.py
@@ -131,8 +131,8 @@ try:
 			else:				
 				
 				#load plugins
-				from includes import pluginHandler
-				pluginHandler.loadPlugins()
+				from includes import pluginloader
+				pluginloader.loadPlugins()
 				
 				try:				
 					#start rtl_fm
diff --git a/includes/pluginHandler.py b/includes/pluginHandler.py
index eadbd08..b3491e1 100644
--- a/includes/pluginHandler.py
+++ b/includes/pluginHandler.py
@@ -11,16 +11,4 @@ def throwAlarm(typ,freq,data):
 	for name, plugin in globals.pluginList.items():
 		logging.debug("call Plugin: %s", name)
 		plugin.run(typ,freq,data)
-	logging.debug("[END ALARM]")
-
-	
-def loadPlugins():
-	try:
-		#load plugins
-		logging.debug("loading plugins")
-		for i in pluginloader.getPlugins():
-			plugin = pluginloader.loadPlugin(i)
-			globals.pluginList[i["name"]] = plugin
-			
-	except:
-		logging.exception("cannot load Plugins")
\ No newline at end of file
+	logging.debug("[END ALARM]")
\ No newline at end of file
diff --git a/includes/pluginloader.py b/includes/pluginloader.py
index 25c66ad..ae591cf 100644
--- a/includes/pluginloader.py
+++ b/includes/pluginloader.py
@@ -7,6 +7,15 @@ import os
 
 from includes import globals  # Global variables
 
+def loadPlugins():
+	try:
+		logging.debug("loading plugins")
+		for i in getPlugins():
+			plugin = loadPlugin(i)
+			globals.pluginList[i["name"]] = plugin			
+	except:
+		logging.exception("cannot load Plugins")
+
 
 def getPlugins():
 	try:
@@ -34,6 +43,7 @@ def getPlugins():
 
 	return plugins
 
+
 def loadPlugin(plugin):
 	try:
 		logging.debug("load Plugin: %s", plugin["name"])

From 26c9e23db8c6f82247b772859d35e35f0ac3f919 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@dieschrollis.de>
Date: Fri, 22 May 2015 21:32:37 +0200
Subject: [PATCH 2/2] rename pluginHander.py->alarmHandler.py

Method rename:
throwAlarm() ->processAlarm()
---
 .../{pluginHandler.py => alarmHandler.py}     | 26 +++++++++----------
 includes/decoder.py                           |  8 +++---
 includes/decoders/poc.py                      |  4 +--
 3 files changed, 19 insertions(+), 19 deletions(-)
 rename includes/{pluginHandler.py => alarmHandler.py} (87%)

diff --git a/includes/pluginHandler.py b/includes/alarmHandler.py
similarity index 87%
rename from includes/pluginHandler.py
rename to includes/alarmHandler.py
index b3491e1..88a1834 100644
--- a/includes/pluginHandler.py
+++ b/includes/alarmHandler.py
@@ -1,14 +1,14 @@
-#!/usr/bin/python
-# -*- coding: cp1252 -*-
-
-import logging
-
-from includes import globals  # Global variables
-from includes import pluginloader
-
-def throwAlarm(typ,freq,data):
-	logging.debug("[  ALARM  ]")
-	for name, plugin in globals.pluginList.items():
-		logging.debug("call Plugin: %s", name)
-		plugin.run(typ,freq,data)
+#!/usr/bin/python
+# -*- coding: cp1252 -*-
+
+import logging
+
+from includes import globals  # Global variables
+from includes import pluginloader
+
+def processAlarm(typ,freq,data):
+	logging.debug("[  ALARM  ]")
+	for name, plugin in globals.pluginList.items():
+		logging.debug("call Plugin: %s", name)
+		plugin.run(typ,freq,data)
 	logging.debug("[END ALARM]")
\ No newline at end of file
diff --git a/includes/decoder.py b/includes/decoder.py
index 401b80c..6a2a0c7 100644
--- a/includes/decoder.py
+++ b/includes/decoder.py
@@ -33,8 +33,8 @@ def decode(freq, decoded):
 				else:
 					logging.info("FMS:%s Status:%s Richtung:%s TKI:%s", fms_id[0:8], fms_status, fms_direction, fms_tsi)
 					data = {"fms":fms_id[0:8], "status":fms_status, "direction":fms_direction, "tsi":fms_tsi}
-					from includes import pluginHandler
-					pluginHandler.throwAlarm("FMS",freq,data)
+					from includes import alarmHandler
+					alarmHandler.processAlarm("FMS",freq,data)
 					
 					globals.fms_id_old = fms_id #save last id
 					globals.fms_time_old = timestamp #save last time	
@@ -57,8 +57,8 @@ def decode(freq, decoded):
 			else:
 				logging.info("5-Ton: %s", zvei_id)
 				data = {"zvei":zvei_id}
-				from includes import pluginHandler
-				pluginHandler.throwAlarm("ZVEI",freq,data)
+				from includes import alarmHandler
+				alarmHandler.processAlarm("ZVEI",freq,data)
 
 				globals.zvei_id_old = zvei_id #save last id
 				globals.zvei_time_old = timestamp #save last time
diff --git a/includes/decoders/poc.py b/includes/decoders/poc.py
index d78c09a..0aa9e76 100644
--- a/includes/decoders/poc.py
+++ b/includes/decoders/poc.py
@@ -47,8 +47,8 @@ def decode(freq, decoded):
 					else:
 						logging.info("POCSAG%s: %s %s %s ", bitrate, poc_id, poc_sub, poc_text)
 						data = {"ric":poc_id, "function":poc_sub, "msg":poc_text, "bitrate":bitrate}
-						from includes import pluginHandler
-						pluginHandler.throwAlarm("POC",freq,data)
+						from includes import alarmHandler
+						alarmHandler.processAlarm("POC",freq,data)
 		
 						globals.poc_id_old = poc_id #save last id
 						globals.poc_time_old = timestamp #save last time