From 60ba63769bda0c71caabc00c86dbbdbe5836726b Mon Sep 17 00:00:00 2001 From: Elliot Murphy Date: Fri, 3 Feb 2023 13:22:42 -0800 Subject: [PATCH 1/2] load apprise notification plugins from standard locations Signed-off-by: Elliot Murphy --- scripts/utils/notifications.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/utils/notifications.py b/scripts/utils/notifications.py index 1e16cde..c6a4615 100644 --- a/scripts/utils/notifications.py +++ b/scripts/utils/notifications.py @@ -13,7 +13,13 @@ DB_PATH = userDir + '/BirdNET-Pi/scripts/birds.db' flickr_images = {} species_last_notified = {} -apobj = apprise.Apprise() +asset = apprise.AppriseAsset( + plugin_paths=[ + userDir + "/.apprise/plugins", + userDir + "/.config/apprise/plugins", + ] +) +apobj = apprise.Apprise(asset=asset) config = apprise.AppriseConfig() config.add(APPRISE_CONFIG) apobj.add(config) From 1b4c57f1298f246aeb9fef8e111831c414f432a2 Mon Sep 17 00:00:00 2001 From: "Kevin N. Murphy" Date: Fri, 3 Feb 2023 14:27:22 -0800 Subject: [PATCH 2/2] loading plugins with test button --- scripts/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.php b/scripts/config.php index 410d533..cc17dde 100644 --- a/scripts/config.php +++ b/scripts/config.php @@ -263,7 +263,7 @@ if(isset($_GET['sendtest']) && $_GET['sendtest'] == "true") { $body = str_replace("\$overlap", $overlap, $body); $body = str_replace("\$flickrimage", $exampleimage, $body); - echo "
".shell_exec($home."/BirdNET-Pi/birdnet/bin/apprise -vv -t '".$title."' -b '".$body."' ".$attach." ".$cf." ")."
"; + echo "
".shell_exec($home."/BirdNET-Pi/birdnet/bin/apprise -vv --plugin-path ".$home."/.apprise/plugins "." -t '".$title."' -b '".$body."' ".$attach." ".$cf." ")."
"; die(); }