From 64d63c08df1df96b4bb8520c500499301d76aa2b Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Tue, 26 Mar 2024 14:43:43 +0100
Subject: [PATCH] netbrowse: convert to flask

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/netbrowse/Config.in |  2 +-
 src/netbrowse/netbrowse     | 34 ++++++++--------------------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/package/netbrowse/Config.in b/package/netbrowse/Config.in
index d50befce..4c5125db 100644
--- a/package/netbrowse/Config.in
+++ b/package/netbrowse/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_NETBROWSE
 	bool netbrowse
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_PYTHON
-	select BR2_PACKAGE_PYTHON_FLUP
+	select BR2_PACKAGE_PYTHON_FLASK
 	help
 	  Advertises the initial $(HOSTNAME).local and network.local to
 	  give your device a http://network.local mDNS/SD browser.
diff --git a/src/netbrowse/netbrowse b/src/netbrowse/netbrowse
index 529384b5..1c374bd8 100755
--- a/src/netbrowse/netbrowse
+++ b/src/netbrowse/netbrowse
@@ -2,46 +2,28 @@
 """
    Main server loop.
 """
-import os
-import signal
 import sys
-from flup.server.fcgi import WSGIServer
 
+from flask       import Flask#, render_template_string
 from avahi_alias import AvahiAlias
-from mdns_hosts import MdnsHosts
+from mdns_hosts  import MdnsHosts
 
-SOCK_FILE='/tmp/netbrowse.sock'
+app = Flask(__name__)
 
-def app(_, start_response):
+@app.route('/browse')
+def browse():
     """The /browse network.local application"""
     mdns_hosts = MdnsHosts()
     content = mdns_hosts.html().encode('utf-8')
-
-    start_response('200 OK', [('Content-Type', 'text/html'), ('Content-Length', str(len(content)))])
-    return [content]
-
-def cleanup():
-    """Clean up on server shutdown"""
-    try:
-        os.remove(SOCK_FILE)
-    except OSError:
-        pass
-    sys.exit(0)
-
-def __sigcb(_, __):
-    cleanup()
+    #return render_template_string(content)
+    return content
 
 if __name__ == '__main__':
     avahi_aliases = AvahiAlias()
     for each in sys.argv[1:]:
         avahi_aliases.publish_cname(str(each).encode("utf-8", "strict"))
 
-    signal.signal(signal.SIGINT,  __sigcb)
-    signal.signal(signal.SIGTERM, __sigcb)
-
     try:
-        # For testing on PC as $USER, add: , umask=0
-        WSGIServer(app, bindAddress=SOCK_FILE).run()
+        app.run(debug=True)
     except KeyboardInterrupt:
-        cleanup()
         print("Exiting")