From 45f4887163c65d2cc187dc78dea093f1983a8e54 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Fri, 29 Sep 2017 13:26:06 +0200 Subject: [PATCH 1/7] edit changelog with links --- CHANGELOG.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6c0eae..4439a17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,16 +11,18 @@ ### __[v2.2.1]__ - 19.09.2017 ##### Added -- Neues Service Script -- Eigene Message für jeden Typ im Telegram Plugin in der config definierbar +- Neues Service Script [#263](https://github.com/Schrolli91/BOSWatch/pull/263) +- Eigene Message für jeden Typ im Telegram Plugin in der config definierbar [#267](https://github.com/Schrolli91/BOSWatch/pull/267) +- httpRequest Plugin unterstützt nun mehrere URLs [254](https://github.com/Schrolli91/BOSWatch/pull/254) ##### Changed -- Name der csv Dateien geändert um überschreiben bei Update zu vermeiden -- Description Liste kann nun zusätzlich Einträge für jede Subric enthalten (POCSAG) -- RegEX verbietet nun grundsätzlich alles - Es muss explizit zugelassen werden (wenn RegEX aktiv) +- Name der csv Dateien geändert um überschreiben bei Update zu vermeiden [#262](https://github.com/Schrolli91/BOSWatch/pull/262) +- Description Liste kann nun zusätzlich Einträge für jede Subric enthalten (POCSAG) [#271](https://github.com/Schrolli91/BOSWatch/pull/271) +- RegEX verbietet nun grundsätzlich alles - Es muss explizit zugelassen werden (wenn RegEX aktiv) [#284](https://github.com/Schrolli91/BOSWatch/pull/284) ##### Fixed -- Bug im SMS77 Plugin behoben +- Bug im SMS77 Plugin behoben [#257](https://github.com/Schrolli91/BOSWatch/issues/257) +- einige Code-Style Verbesserungen ---------------------------- From 0774a581939a1786bc92bd4744fa08565f2fab96 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 30 Sep 2017 15:56:10 +0200 Subject: [PATCH 2/7] rename systemcl to systemctl http://boswatch.de/index.php?thread/4-version-2-2-1/&postID=31#post31 --- service/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/README.md b/service/README.md index 41337a9..58ad6f9 100644 --- a/service/README.md +++ b/service/README.md @@ -10,8 +10,8 @@ Enter the frequency and the decoder(s) you want to use in line 7; you can add mo ### Install the service 1. Copy the file to /lib/systemd/system: sudo cp /opt/boswatch/service/boswatch.service /lib/systemd/system/ 2. Change the rights: sudo chmod 644 /lib/systemd/system/boswatch.service -3. Enable the service: sudo systemcl enable boswatch.service -4. Start the service: sudo systemcl start boswatch.service +3. Enable the service: sudo systemctl enable boswatch.service +4. Start the service: sudo systemctl start boswatch.service --- From 760f6c1abaa80a7398658d2ea7a2f21a79bbab2e Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 30 Sep 2017 16:05:23 +0200 Subject: [PATCH 3/7] Update globalVars.py --- includes/globalVars.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/globalVars.py b/includes/globalVars.py index 513d231..c081608 100644 --- a/includes/globalVars.py +++ b/includes/globalVars.py @@ -9,8 +9,8 @@ Global variables """ # version info -versionNr = "2.2.1-dev" -buildDate = "2017/09/19" +versionNr = "2.2.2-dev" +buildDate = "in dev" # Global variables From b2df53430d93cd56d261b7d73557680a0d32e492 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 30 Sep 2017 16:07:32 +0200 Subject: [PATCH 4/7] edit CL --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4439a17..609abc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # Changelog -### __[v2.2.3]__ - unreleased +### __[v2.2.2]__ - unreleased ##### Added ##### Changed ##### Deprecated ##### Removed ##### Fixed +- Schreibfehler in Service Readme [#313](https://github.com/Schrolli91/BOSWatch/issues/313) ##### Security From d4946bf714e4053f33209c0fd68287f4b01f6400 Mon Sep 17 00:00:00 2001 From: PeterLaemmle Date: Sat, 30 Sep 2017 18:11:20 +0200 Subject: [PATCH 5/7] Update Telegram.py Import libraries urllib and googlemaps only if RICforLocationAPIKey is defined. --- plugins/Telegram/Telegram.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/Telegram/Telegram.py b/plugins/Telegram/Telegram.py index fc4acc7..dc4cc6e 100644 --- a/plugins/Telegram/Telegram.py +++ b/plugins/Telegram/Telegram.py @@ -11,9 +11,11 @@ Plugin to send FMS-, ZVEI- and POCSAG-messages via Telegram # Imports # import logging # Global logger -import urllib, telegram, googlemaps +import telegram from telegram.error import (TelegramError, Unauthorized, BadRequest, NetworkError) from includes import globalVars # Global variables +if globalVars.config.get("Telegram","RICforLocationAPIKey"): + import urllib, googlemaps # Helper function, uncomment to use from includes.helper import wildcardHandler From 47bdff4b28292a6c0ff3009cc3fbab195037d59f Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Sat, 30 Sep 2017 18:27:11 +0200 Subject: [PATCH 6/7] edit CL --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 609abc4..15ca61e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### __[v2.2.2]__ - unreleased ##### Added ##### Changed +- Telegram Plugin importiert Google Maps Funktionen nur noch wenn API Key eingetragen ist [#315](https://github.com/Schrolli91/BOSWatch/pull/315) ##### Deprecated ##### Removed ##### Fixed From 9d552e5d244c0a19b0987a6a08be5214f1fd3a09 Mon Sep 17 00:00:00 2001 From: Florian Date: Sat, 30 Sep 2017 22:51:42 +0200 Subject: [PATCH 7/7] Add explanation Add description on how to use subric-specific description (according to #271 and #312) --- csv/poc.template.csv | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/csv/poc.template.csv b/csv/poc.template.csv index 87a5073..9dfe7d4 100644 --- a/csv/poc.template.csv +++ b/csv/poc.template.csv @@ -5,6 +5,12 @@ ric,description # For each RIC-Address you could set a description-text # Use the structure: ric,"Description-Text" # +# You can even define specific subrics, therefore you +# 1. need to specify a main RIC: 1234567, "Unit One" +# 2. specify a certain subric: 1234567B, "Subunit Bravo" +# The result for 1234567B will be "Unit One Subunit Bravo" +# - Be sure having defined the main RIC (step one)! - +# # !!! DO NOT delete the first line !!! # 1234567,"POCSAG testdata äöüß"