From e61a92475cb29c3c16420c8e6630f139a7c554a9 Mon Sep 17 00:00:00 2001 From: ehpersonal38 <103586016+ehpersonal38@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:33:50 -0500 Subject: [PATCH] Revert "Merge pull request #724 from knmurphy/enable-apprise-plugins" This reverts commit ee63821a69fc638205a81c993bd2963a30b42e76, reversing changes made to 8491d216c48e12fc4e6617c3a743ed2ccdfc5178. --- scripts/config.php | 2 +- scripts/utils/notifications.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/config.php b/scripts/config.php index 03911b1..b384b74 100644 --- a/scripts/config.php +++ b/scripts/config.php @@ -280,7 +280,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 --plugin-path ".$home."/.apprise/plugins "." -t '".$title."' -b '".$body."' ".$attach." ".$cf." ").""; + echo "
".shell_exec($home."/BirdNET-Pi/birdnet/bin/apprise -vv -t '".$title."' -b '".$body."' ".$attach." ".$cf." ").""; die(); } diff --git a/scripts/utils/notifications.py b/scripts/utils/notifications.py index 304f0d7..8ed3770 100644 --- a/scripts/utils/notifications.py +++ b/scripts/utils/notifications.py @@ -13,13 +13,7 @@ DB_PATH = userDir + '/BirdNET-Pi/scripts/birds.db' flickr_images = {} species_last_notified = {} -asset = apprise.AppriseAsset( - plugin_paths=[ - userDir + "/.apprise/plugins", - userDir + "/.config/apprise/plugins", - ] -) -apobj = apprise.Apprise(asset=asset) +apobj = apprise.Apprise() config = apprise.AppriseConfig() config.add(APPRISE_CONFIG) apobj.add(config)