]> git.meshlink.io Git - catta/commitdiff
Add CGI support to avahi-bookmarks. (Closes: #91) -- Thanks for the patch!
authorLennart Poettering <lennart@poettering.net>
Fri, 2 Feb 2007 13:45:43 +0000 (13:45 +0000)
committerLennart Poettering <lennart@poettering.net>
Fri, 2 Feb 2007 13:45:43 +0000 (13:45 +0000)
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1378 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

avahi-python/avahi-bookmarks.in

index 6466a221de28c1236484ce5c11974bad4d1e2a1b..a1e8d0ce6ab3ca5b47baf6e4ad9e7e734ac36d13 100755 (executable)
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-import sys, getopt
+import sys, getopt, os
 
 try:
     import avahi, gobject, dbus
@@ -32,29 +32,19 @@ try:
 except ImportError:
     pass
 
-try:
-    from twisted.internet import glib2reactor
-    glib2reactor.install()
-    from twisted.internet import reactor
-    from twisted.web import server, resource
-except ImportError:
-    print "Sorry, to use this tool you need to install twisted and twisted.web."
-    sys.exit(1)
-
 urlproto = { "_http._tcp" : "http",  "_https._tcp" : "https", "_ftp._tcp" : "ftp" }
 
 port = 8080
 address = "127.0.0.1"
 use_host_names = None
+use_CGI = None
 domain = "local"
+timeout = 3000
 
-class AvahiBookmarks(resource.Resource):
-    isLeaf = True
-
+class AvahiBookmarks:
     services = {}
 
     def __init__(self, use_host_names):
-        resource.Resource.__init__(self)
 
         self.bus = dbus.SystemBus()
         self.server = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER)
@@ -75,11 +65,13 @@ class AvahiBookmarks(resource.Resource):
 
     def browse_service_type(self, stype):
 
-        global domain
+        global domain, use_CGI
 
         browser = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.ServiceBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, stype, domain, dbus.UInt32(0))), avahi.DBUS_INTERFACE_SERVICE_BROWSER)
         browser.connect_to_signal('ItemNew', self.new_service)
         browser.connect_to_signal('ItemRemove', self.remove_service)
+        if use_CGI:
+            browser.connect_to_signal('AllForNow', self.all_for_now)
 
     def find_path(self, txt):
 
@@ -94,12 +86,14 @@ class AvahiBookmarks(resource.Resource):
 
         return "/"
 
-    def render_GET(self, request):
+    def render_html(self):
 
-        t = '<html><head><title>Zeroconf Bookmarks</title></head><body><h1>Zeroconf Bookmarks</h1>'
+        global domain
+
+        t = '<html><head><title>%s Zeroconf Bookmarks</title></head><body><h1>%s Zeroconf Bookmarks</h1>' % (domain, domain)
 
         if len(self.services) == 0:
-            t += '<p>Sorry, no web services have been registered on the local LAN.</p>'
+            t += '<p>Sorry, no Zeroconf web services have been registered on the %s domain.</p>' % domain
         else:
             t += '<ul style="padding: 0px; margin: 20px; list-style-type: none">'
 
@@ -135,12 +129,22 @@ class AvahiBookmarks(resource.Resource):
         self.services[(interface, protocol, name, type, domain)] = (host, aprotocol, h, port, txt)
 
     def remove_service(self, interface, protocol, name, type, domain):
+
         del self.services[(interface, protocol, name, type, domain)]
 
 
+    # Only reachable with use_CGI
+    def all_for_now(self):
+
+        mainloop.quit()
+
 def usage(retval = 0):
+
     print "%s [options]\n" % sys.argv[0]
     print "   -h --help             Show this help"
+    print "   -c --cgi              Run as a CGI instead of as a server (default to server"
+    print "                         unless environment variable GATEWAY_INTERFACE is set)"
+    print "   -t --timeout MS       Specify the max time for CGI browsing (default %u)" % timeout
     print "   -p --port PORT        Specify the port to use (default %u)" % port
     print "   -a --address ADDRESS  Specify the address to bind to (default %s)" % address
     print "   -H --host-names       Show links with real hostnames"
@@ -149,7 +153,7 @@ def usage(retval = 0):
     sys.exit(retval)
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], "hp:a:HAd:", ["help", "port=", "address=", "host-names", "addresses", "domain="])
+    opts, args = getopt.getopt(sys.argv[1:], "hct:p:a:HAd:", ["help", "cgi", "port=", "timeout=", "address=", "host-names", "addresses", "domain="])
 except getopt.GetoptError:
     usage(2)
 
@@ -157,6 +161,12 @@ for o, a in opts:
     if o in ("-h", "--help"):
         usage()
 
+    if o in ("-c", "--cgi"):
+        use_CGI = True
+
+    if o in ("-t", "--timeout"):
+        timeout = int(a)
+
     if o in ("-p", "--port"):
         port = int(a)
 
@@ -172,12 +182,48 @@ for o, a in opts:
     if o in ("-d", "--domain"):
         domain = a
 
-site = server.Site(AvahiBookmarks(use_host_names))
-reactor.listenTCP(port, site, interface=address)
+if use_CGI is None:
+    use_CGI = os.environ.has_key("GATEWAY_INTERFACE")
 
-print "Now point your web browser to http://%s:%u/!" % (address, port)
+if use_CGI:
+    cgi = AvahiBookmarks(use_host_names)
 
-try:
-    reactor.run()
-except KeyboardInterrupt, k:
-    pass
+    mainloop = gobject.MainLoop()
+    gobject.timeout_add(timeout, mainloop.quit)
+
+    try:
+        mainloop.run()
+    except KeyboardInterrupt:
+        pass
+        
+    print 'Content-type: text/html\n\n' + cgi.render_html()
+
+else:
+    try:
+        from twisted.internet import glib2reactor
+        glib2reactor.install()
+        from twisted.internet import reactor
+        from twisted.web import server, resource
+    except ImportError:
+        print "Sorry, to use this tool as a server you need to install twisted and twisted.web.\n"
+       sys.exit(1)
+
+    class AvahiBookmarksServer(AvahiBookmarks, resource.Resource):
+        isLeaf = True
+
+        def __init__(self, use_host_names):
+            resource.Resource.__init__(self)
+            AvahiBookmarks.__init__(self, use_host_names)
+
+        def render_GET(self, request):
+            return self.render_html()
+
+    site = server.Site(AvahiBookmarksServer(use_host_names))
+    reactor.listenTCP(port, site, interface=address)
+
+    print "Now point your web browser to http://%s:%u/!" % (address, port)
+
+    try:
+        reactor.run()
+    except KeyboardInterrupt:
+        pass