From 8549b0f31aea615494315bfa6cefad63bebfe323 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:05:01 +0200 Subject: [PATCH] Correct FlickrImage --- birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py b/birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py index 30068ff5e..344254915 100644 --- a/birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py +++ b/birdnet-pi/rootfs/helpers/birdnet_to_mqtt.py @@ -62,14 +62,14 @@ def automatic_mqtt_publish(file, detections): bird['ClipName'] = path bird['url'] = bird_lookup_url_base + detection.scientific_name + # Flickimage image_url = "" - common_name = detection.common_name - if len(settings_dict.get('FLICKR_API_KEY', '')) > 0: + common_name = high_bird_fields[3] + if len(settings_dict.get('FLICKR_API_KEY')) > 0: if common_name not in flickr_images: try: headers = {'User-Agent': 'Python_Flickr/1.0'} - url = ('https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=' + - str(settings_dict.get('FLICKR_API_KEY')) + + url = ('https://www.flickr.com/services/rest/?method=flickr.photos.search&api_key=' + str(settings_dict.get('FLICKR_API_KEY')) + '&text=' + str(common_name) + ' bird&sort=relevance&per_page=5&media=photos&format=json&license=2%2C3%2C4%2C5%2C6%2C9&nojsoncallback=1') resp = requests.get(url=url, headers=headers, timeout=10) @@ -77,12 +77,12 @@ def automatic_mqtt_publish(file, detections): data = resp.json()["photos"]["photo"][0] image_url = 'https://farm'+str(data["farm"])+'.static.flickr.com/'+str(data["server"])+'/'+str(data["id"])+'_'+str(data["secret"])+'_n.jpg' - flickr_images[common_name] = image_url + flickr_images[comName] = image_url except Exception as e: - log.error("FLICKR API ERROR: " + str(e)) + print("FLICKR API ERROR: "+str(e)) image_url = "" else: - image_url = flickr_images[common_name] + image_url = flickr_images[comName] bird['Flickrimage'] = image_url json_bird = json.dumps(bird)