From 89aae1fb29a84a9e4dd324a61d0395cd8902a641 Mon Sep 17 00:00:00 2001
From: JHCD <github@jhc.de>
Date: Fri, 22 May 2015 21:40:38 +0200
Subject: [PATCH] restructure decode - zvei

---
 includes/decoder.py       | 19 ++-----------------
 includes/decoders/zvei.py | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/includes/decoder.py b/includes/decoder.py
index 401b80c..ecd5632 100644
--- a/includes/decoder.py
+++ b/includes/decoder.py
@@ -48,23 +48,8 @@ def decode(freq, decoded):
 	#check ZVEI: -> validate -> check double alarm -> log     
 	if "ZVEI2:" in decoded:
 		logging.debug("recieved ZVEI")			
-		
-		zvei_id = decoded[7:12] #ZVEI Code  
-		if re.search("[0-9F]{5}", zvei_id): #if ZVEI is valid
-			if zvei_id == globals.zvei_id_old and timestamp < globals.zvei_time_old + globals.config.getint("BOSWatch", "zvei_double_ignore_time"): #check for double alarm
-				logging.info("ZVEI double alarm: %s within %s second(s)", globals.zvei_id_old, timestamp-globals.zvei_time_old)
-				globals.zvei_time_old = timestamp #in case of double alarm, zvei_double_ignore_time set new
-			else:
-				logging.info("5-Ton: %s", zvei_id)
-				data = {"zvei":zvei_id}
-				from includes import pluginHandler
-				pluginHandler.throwAlarm("ZVEI",freq,data)
-
-				globals.zvei_id_old = zvei_id #save last id
-				globals.zvei_time_old = timestamp #save last time
-		else:
-			logging.warning("No valid ZVEI: %s", zvei_id)
-		
+		from includes.decoders import zvei
+		zvei.decode(freq, decoded)
 		
 	#POCSAG Decoder Section
 	#check POCSAG -> validate -> check double alarm -> log      
diff --git a/includes/decoders/zvei.py b/includes/decoders/zvei.py
index e69de29..08e6744 100644
--- a/includes/decoders/zvei.py
+++ b/includes/decoders/zvei.py
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+# -*- coding: cp1252 -*-
+
+import logging
+import time #timestamp for doublealarm
+import re #Regex for validation
+
+from includes import globals  # Global variables
+
+def decode(freq, decoded):
+	timestamp = int(time.time())#Get Timestamp                  
+
+	zvei_id = decoded[7:12] #ZVEI Code  
+	if re.search("[0-9F]{5}", zvei_id): #if ZVEI is valid
+		if zvei_id == globals.zvei_id_old and timestamp < globals.zvei_time_old + globals.config.getint("BOSWatch", "zvei_double_ignore_time"): #check for double alarm
+			logging.info("ZVEI double alarm: %s within %s second(s)", globals.zvei_id_old, timestamp-globals.zvei_time_old)
+			globals.zvei_time_old = timestamp #in case of double alarm, zvei_double_ignore_time set new
+		else:
+			logging.info("5-Ton: %s", zvei_id)
+			data = {"zvei":zvei_id}
+			from includes import pluginHandler
+			pluginHandler.throwAlarm("ZVEI",freq,data)
+
+			globals.zvei_id_old = zvei_id #save last id
+			globals.zvei_time_old = timestamp #save last time
+	else:
+		logging.warning("No valid ZVEI: %s", zvei_id)
\ No newline at end of file