From 8a0c05f626db0603eb1c0dc3bca00f9fc70d583c Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 19 Sep 2017 18:04:33 +0200 Subject: [PATCH 01/21] edit vers nr --- includes/globalVars.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/globalVars.py b/includes/globalVars.py index 0d6f2b3..3b34dcd 100644 --- a/includes/globalVars.py +++ b/includes/globalVars.py @@ -9,7 +9,7 @@ Global variables """ # version info -versionNr = "2.2.1-beta" +versionNr = "2.2.1" buildDate = "2017/09/19" From 7fa4a97ba42663fc6c329d7f092f9b64275fd612 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 3 Oct 2017 20:23:48 +0200 Subject: [PATCH 02/21] edit CL --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3f07e2..d317f04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### __[v2.2.2]__ - unreleased +### __[v2.3]__ - unreleased ##### Added - Installations Script für Services [#316](https://github.com/Schrolli91/BOSWatch/pull/316) ##### Changed From 594ddb44529f87e2c04aef8775397db1addd96c0 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 3 Oct 2017 22:26:05 +0200 Subject: [PATCH 03/21] add config debug prints --- boswatch.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boswatch.py b/boswatch.py index f21937b..08f8403 100755 --- a/boswatch.py +++ b/boswatch.py @@ -221,6 +221,10 @@ try: configHandler.checkConfig("FMS") configHandler.checkConfig("ZVEI") configHandler.checkConfig("POC") + configHandler.checkConfig("Plugins") + configHandler.checkConfig("Filters") + if globalVar.config.getint("NMAHandler","enableHandler"): + configHandler.checkConfig("NMAHandler") except: # we couldn't work without config -> exit logging.critical("cannot read config file") From cc66f4547ac1737200b11ba8283586818f291095 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Wed, 4 Oct 2017 06:16:37 +0200 Subject: [PATCH 04/21] print python vers nr in log --- boswatch.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/boswatch.py b/boswatch.py index 08f8403..46f864f 100755 --- a/boswatch.py +++ b/boswatch.py @@ -18,11 +18,12 @@ GitHUB: https://github.com/Schrolli91/BOSWatch import logging import logging.handlers -import argparse # for parse the args -import ConfigParser # for parse the config file -import os # for log mkdir -import time # for time.sleep() -import subprocess # for starting rtl_fm and multimon-ng +import argparse # for parse the args +import ConfigParser # for parse the config file +import os # for log mkdir +import sys # for py version +import time # for time.sleep() +import subprocess # for starting rtl_fm and multimon-ng from includes import globalVars # Global variables from includes import MyTimedRotatingFileHandler # extension of TimedRotatingFileHandler @@ -164,6 +165,7 @@ try: logging.debug("SW Version: %s",globalVars.versionNr) logging.debug("Branch: %s",globalVars.branch) logging.debug("Build Date: %s",globalVars.buildDate) + logging.debug("Python Vers: %s",sys.version) logging.debug("BOSWatch given arguments") if args.test: logging.debug(" - Test-Mode!") From 33706e5f2d0f644ee3d5db2e610c95cdb4bfd1a2 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Wed, 4 Oct 2017 06:30:53 +0200 Subject: [PATCH 05/21] little fix --- boswatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boswatch.py b/boswatch.py index 46f864f..ff2cb74 100755 --- a/boswatch.py +++ b/boswatch.py @@ -225,7 +225,7 @@ try: configHandler.checkConfig("POC") configHandler.checkConfig("Plugins") configHandler.checkConfig("Filters") - if globalVar.config.getint("NMAHandler","enableHandler"): + if globalVars.config.getint("NMAHandler","enableHandler"): configHandler.checkConfig("NMAHandler") except: # we couldn't work without config -> exit From 37829740949168f501910d3d3518c0701bbd13c2 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Wed, 4 Oct 2017 06:43:44 +0200 Subject: [PATCH 06/21] edit log output --- boswatch.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/boswatch.py b/boswatch.py index ff2cb74..df1e5e6 100755 --- a/boswatch.py +++ b/boswatch.py @@ -225,8 +225,7 @@ try: configHandler.checkConfig("POC") configHandler.checkConfig("Plugins") configHandler.checkConfig("Filters") - if globalVars.config.getint("NMAHandler","enableHandler"): - configHandler.checkConfig("NMAHandler") + #NMAHandler is outputed below except: # we couldn't work without config -> exit logging.critical("cannot read config file") From 18425e2be22db01f388343fa84b913e7bb21ecbf Mon Sep 17 00:00:00 2001 From: Florian Date: Wed, 4 Oct 2017 08:54:23 +0200 Subject: [PATCH 07/21] Update install.sh Clean up old statements Fix a few typos (#318) --- install.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/install.sh b/install.sh index 4b549a8..38a4530 100644 --- a/install.sh +++ b/install.sh @@ -12,7 +12,7 @@ function exitcodefunction { echo "Action: $action on $module failed." echo "Exitcode: $errorcode" echo "" - echo " -> If you want to open an Issue at https://github.com/Schrolli91/BOSWatch/issues" + echo " -> If you want to open an issue at https://github.com/Schrolli91/BOSWatch/issues" echo " please post the logfile, located at $boswatchpath/install/setup_log.txt" exit 1 else @@ -82,7 +82,7 @@ for (( i=1; i<=$#; i=$i+2 )); do *) branch=master ;; esac ;; - -p|--path) echo " !!! WARNING: you install BOSWATCH to alternative path !!! "; boswatchpath=$arg2 ;; + -p|--path) echo " !!! WARNING: you'll install BOSWATCH to alternative path !!! "; boswatchpath=$arg2 ;; *) echo "Internal error!" ; exit 1 ;; esac @@ -205,15 +205,14 @@ tput cup 15 5 echo "-> configure..........................." cd $boswatchpath/ chmod +x * -echo $'# BOSWatch - blacklist the DVB drivers to avoid conflict with the SDR driver\n blacklist dvb_usb_rtl28xxu \n blacklist rtl2830\n blacklist dvb_usb_v2\n blacklist dvb_core' >> /etc/modprobe.d/boswatch_blacklist_sdr.conf +echo $'# BOSWatch - blacklist the DVB drivers to avoid conflicts with the SDR driver\n blacklist dvb_usb_rtl28xxu \n blacklist rtl2830\n blacklist dvb_usb_v2\n blacklist dvb_core' >> /etc/modprobe.d/boswatch_blacklist_sdr.conf tput cup 17 1 echo "BOSWatch is now installed in $boswatchpath/" echo "Installation ready!" tput cup 19 3 -echo "Watch out: to run BOSWatch you have to generate and modify the config.ini!" -echo "Do the following steps to have a running version of BOSWatch:" -echo "sudo cp $boswatchpath/BOSWatch/config/config.template.ini $boswatchpath/BOSWatch/config/config.ini" +echo "Watch out: to run BOSWatch you have to modify the config.ini!" +echo "Do the following step to do so:" echo "sudo nano $boswatchpath/BOSWatch/config/config.ini" echo "and modify the config as you need. This step is optional if you are upgrading an old version of BOSWatch. " From 307731dabe1290f9722073143ff9f0364f0182da Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sun, 8 Oct 2017 10:19:53 +0200 Subject: [PATCH 08/21] Update Konzept.md --- Konzept.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Konzept.md b/Konzept.md index 6e3a5b1..7903dcc 100644 --- a/Konzept.md +++ b/Konzept.md @@ -2,6 +2,7 @@ ============ +Python 3 Verpacken der Funktionalitäten in Klassen um OOP-Grundsätze zu erreichen. @@ -12,11 +13,13 @@ Verpacken der Funktionalitäten in Klassen um OOP-Grundsätze zu erreichen. - reine Dekodierung mittels rtl-fm und multimon - Keine Filter usw. nur die Dekoder, Daten verpacken, verschicken - per TCP Socket an den Server + - versch Eingabequellen (DVB-T Stick, Audio Eingang) ### Server: - Empfängt die TCP Socket Pakete der einzelnen Clients - Durch doubleFiltering fallen doppelt eingehende Alarme der Clienten sowieso raus - - Danach Filterung usw. dann call an die plugins + - Danach Filterung nach neuen Filterkonzept + - dann call an die plugins From 8961148ecf16a7a79d475c9c36ab0933dc79591c Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sun, 8 Oct 2017 10:19:53 +0200 Subject: [PATCH 09/21] Update Konzept.md --- Konzept.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Konzept.md b/Konzept.md index 6e3a5b1..7903dcc 100644 --- a/Konzept.md +++ b/Konzept.md @@ -2,6 +2,7 @@ ============ +Python 3 Verpacken der Funktionalitäten in Klassen um OOP-Grundsätze zu erreichen. @@ -12,11 +13,13 @@ Verpacken der Funktionalitäten in Klassen um OOP-Grundsätze zu erreichen. - reine Dekodierung mittels rtl-fm und multimon - Keine Filter usw. nur die Dekoder, Daten verpacken, verschicken - per TCP Socket an den Server + - versch Eingabequellen (DVB-T Stick, Audio Eingang) ### Server: - Empfängt die TCP Socket Pakete der einzelnen Clients - Durch doubleFiltering fallen doppelt eingehende Alarme der Clienten sowieso raus - - Danach Filterung usw. dann call an die plugins + - Danach Filterung nach neuen Filterkonzept + - dann call an die plugins From b5d860f5cbdf010bc5f0f99485e3ac2bb9a7b4c5 Mon Sep 17 00:00:00 2001 From: Philip Giuliani Date: Mon, 9 Oct 2017 14:11:26 +0200 Subject: [PATCH 10/21] Fix output paths of the install script --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 5c251ea..1d214d9 100644 --- a/install.sh +++ b/install.sh @@ -213,8 +213,8 @@ echo "Installation ready!" tput cup 19 3 echo "Watch out: to run BOSWatch you have to generate and modify the config.ini!" echo "Do the following steps to have a running version of BOSWatch:" -echo "sudo cp $boswatchpath/BOSWatch/config/config.template.ini $boswatchpath/BOSWatch/config/config.ini" -echo "sudo nano $boswatchpath/BOSWatch/config/config.ini" +echo "sudo cp $boswatchpath/config/config.template.ini $boswatchpath/config/config.ini" +echo "sudo nano $boswatchpath/config/config.ini" echo "and modify the config as you need. This step is optional if you are upgrading an old version of BOSWatch. " tput cnorm From 886dcf63d08770fe6203efc89c27555790c9d8e9 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:14:06 +0200 Subject: [PATCH 11/21] edit CL --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d317f04..399d5c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ##### Deprecated ##### Removed ##### Fixed +- Schreibfehler der Pfadangabe im Installer [#317](https://github.com/Schrolli91/BOSWatch/pull/317) - Schreibfehler in Service Readme [#313](https://github.com/Schrolli91/BOSWatch/issues/313) - Einige Code-Style Verbesserungen [#310](https://github.com/Schrolli91/BOSWatch/pull/310) ##### Security From 7abc398a9447479bf13ea7ee4b4c82d1874a5f04 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:18:49 +0200 Subject: [PATCH 12/21] edit readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index eb8e805..e8abae2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ |Branch|Code Qualität|CI-Build| |---|---|---| |master|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/master.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763821)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=master)](https://travis-ci.org/Schrolli91/BOSWatch)| -|beta|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/beta.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=4213030)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=beta)](https://travis-ci.org/Schrolli91/BOSWatch)| |develop|[![Codacy Badge](https://img.shields.io/codacy/grade/d512976554354a199555bd34ed179bb1/develop.svg)](https://www.codacy.com/app/Schrolli91/BOSWatch/dashboard?bid=3763820)|[![Build Status](https://travis-ci.org/Schrolli91/BOSWatch.svg?branch=develop)](https://travis-ci.org/Schrolli91/BOSWatch)| From 2626a0418fa91f6921147d1cddf9cee248c34f39 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:20:34 +0200 Subject: [PATCH 13/21] edit CL --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 399d5c0..e37c29b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Telegram Plugin importiert Google Maps Funktionen nur noch wenn API Key eingetragen ist [#315](https://github.com/Schrolli91/BOSWatch/pull/315) - Versions Nummer und Branch Name getrennt [3fed1ac](https://github.com/Schrolli91/BOSWatch/commit/3fed1ac12af8690213766e0e81d71c237530ed2c) ##### Deprecated +- Beta Branch aus Readme, Installer und Travis-CI entfernt ##### Removed ##### Fixed - Schreibfehler der Pfadangabe im Installer [#317](https://github.com/Schrolli91/BOSWatch/pull/317) From c49c76dd6b06e16125f43c75343f4619ffcf9cae Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:20:46 +0200 Subject: [PATCH 14/21] edit installer --- install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/install.sh b/install.sh index 3fc8140..5470b24 100644 --- a/install.sh +++ b/install.sh @@ -78,7 +78,6 @@ for (( i=1; i<=$#; i=$i+2 )); do -b|--branch) case $arg2 in dev|develop) echo " !!! WARNING: you are using the DEV BRANCH !!! "; branch=dev ;; - beta) echo " !!! WARNING: you are using the BETA BRANCH !!! "; branch=beta ;; *) branch=master ;; esac ;; From 9e0e43ee135fe50a64ff16f50fc91c864f7456d2 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:20:53 +0200 Subject: [PATCH 15/21] edit travis config --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1103be..0082739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ sudo: required branches: only: - master - - beta - develop before_script: From 9cad78f71c15ce700d7693e5891051801195257e Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:23:19 +0200 Subject: [PATCH 16/21] edit CL --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e37c29b..b00e065 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Telegram Plugin importiert Google Maps Funktionen nur noch wenn API Key eingetragen ist [#315](https://github.com/Schrolli91/BOSWatch/pull/315) - Versions Nummer und Branch Name getrennt [3fed1ac](https://github.com/Schrolli91/BOSWatch/commit/3fed1ac12af8690213766e0e81d71c237530ed2c) ##### Deprecated -- Beta Branch aus Readme, Installer und Travis-CI entfernt +- Beta Branch aus Readme, Installer und Travis-CI entfernt [#324](https://github.com/Schrolli91/BOSWatch/pull/324) ##### Removed ##### Fixed - Schreibfehler der Pfadangabe im Installer [#317](https://github.com/Schrolli91/BOSWatch/pull/317) From 5ec51d56cf721dca79816f00ac291c380a72ea35 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:33:08 +0200 Subject: [PATCH 17/21] edit CL for release --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 399d5c0..6346714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,18 @@ # Changelog -### __[v2.3]__ - unreleased + +### __[v2.2.2]__ - 21.10.2017 ##### Added - Installations Script für Services [#316](https://github.com/Schrolli91/BOSWatch/pull/316) ##### Changed - Telegram Plugin importiert Google Maps Funktionen nur noch wenn API Key eingetragen ist [#315](https://github.com/Schrolli91/BOSWatch/pull/315) - Versions Nummer und Branch Name getrennt [3fed1ac](https://github.com/Schrolli91/BOSWatch/commit/3fed1ac12af8690213766e0e81d71c237530ed2c) ##### Deprecated -##### Removed +- Beta Branch wird mit nächstem Update entfernt [Forum](http://boswatch.de/index.php?thread/16-beta-branch-abschaffen/&postID=113#post113) ##### Fixed - Schreibfehler der Pfadangabe im Installer [#317](https://github.com/Schrolli91/BOSWatch/pull/317) - Schreibfehler in Service Readme [#313](https://github.com/Schrolli91/BOSWatch/issues/313) - Einige Code-Style Verbesserungen [#310](https://github.com/Schrolli91/BOSWatch/pull/310) -##### Security ### __[v2.2.1]__ - 19.09.2017 From c15de920ac2456c9f9ebe09923043e302c8d99de Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:34:37 +0200 Subject: [PATCH 18/21] edit CL --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6346714..cf8fdf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### __[2.3]__ - unreleased +##### Added +##### Changed +##### Deprecated +##### Removed +##### Fixed +##### Security + ### __[v2.2.2]__ - 21.10.2017 ##### Added From 44821bbfcd9f0870b030d60c7ef75f03e0e71b2a Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:49:18 +0200 Subject: [PATCH 19/21] edit CL --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf8fdf2..65e9843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### __[2.3]__ - unreleased +### __[2.x]__ - unreleased ##### Added ##### Changed ##### Deprecated From c144205eb0488c837fb62c1076c4afd4da2d0379 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:50:55 +0200 Subject: [PATCH 20/21] edit version --- includes/globalVars.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/globalVars.py b/includes/globalVars.py index be4305d..f5d416a 100644 --- a/includes/globalVars.py +++ b/includes/globalVars.py @@ -9,7 +9,7 @@ Global variables """ # version info -versionNr = "2.2.2" +versionNr = "2.3" branch = "dev" buildDate = "unreleased" From 9d06e38de97d462a5f794bf3050720387a48cc21 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 21 Oct 2017 22:57:52 +0200 Subject: [PATCH 21/21] edit CL --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca9d986..d9fe700 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### __[2.3]__ - unreleased +### __[2.x]__ - unreleased ##### Added ##### Changed ##### Deprecated