From 0a16500133c17bf9257a6f059cbaefbaea0d4402 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Tue, 21 Apr 2020 19:24:57 +0200 Subject: [PATCH] get avatar path from pkg_resources, refs #108 --- owrx/controllers/status.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py index 1c73f66..61f7102 100644 --- a/owrx/controllers/status.py +++ b/owrx/controllers/status.py @@ -5,6 +5,7 @@ from owrx.sdr import SdrService from owrx.config import Config import os import json +import pkg_resources class StatusController(Controller): @@ -12,6 +13,7 @@ class StatusController(Controller): pm = Config.get() # convert to old format gps = (pm["receiver_gps"]["lat"], pm["receiver_gps"]["lon"]) + avatar_path = pkg_resources.resource_filename("htdocs", "gfx/openwebrx-avatar.png") # TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna vars = { "status": "active", @@ -23,7 +25,7 @@ class StatusController(Controller): "asl": pm["receiver_asl"], "loc": pm["receiver_location"], "sw_version": openwebrx_version, - "avatar_ctime": os.path.getctime("htdocs/gfx/openwebrx-avatar.png"), + "avatar_ctime": os.path.getctime(avatar_path), } self.send_response("\n".join(["{key}={value}".format(key=key, value=value) for key, value in vars.items()]))