Changeset 3889:d1945060338b

Timestamp:

04/11/07 16:56:33 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

make it so hg and notebook auto-open browser by default; make "open browser" message more uniform. add address support for hg server

Location:

sage

Files:

• misc/hg.py (modified) (3 diffs)
• server/misc.py (added)
• server/notebook/notebook.py (modified) (5 diffs)
• server/wiki/moin.py (modified) (6 diffs)

sage/misc/hg.py

@@ -35 +35 @@
 from   misc   import tmp_filename, branch_current_hg
 from   remote_file import get_remote_file
+from   sage.server.misc import print_open_msg
 
 def embedded():
@@ -154 +155 @@
             return out, err
 
-    def serve(self, port=8200, open_viewer=False):
+    def serve(self, port=8200, address='localhost',
+              open_viewer=True, options=''):
         """
         Start a web server for this repository.
@@ -164 +166 @@
         INPUT:
             port -- port that the server will listen on
-            open_viewer -- boolean (default: False); whether to pop up the web page
-        """
-        print('Now serving repository on port %s'%port)
-        print("Point your web browser at http://localhost:%s"%port)
+            address --  (default: 'localhost') address to listen on
+            open_viewer -- boolean (default: True); whether to pop up the web page
+            options -- a string passed directly to hg's serve command.
+        """
         if open_viewer:
-            cmd = 'sleep 1; %s http://%s:%s 1>&2 >/dev/null'%(browser(), 'localhost', port)
+            cmd = 'sleep 1; %s http://%s:%s 1>&2 >/dev/null'%(browser(),
+                                                              address, port)
             t = tmp_filename()
             open(t,'w').write(cmd)
             P = os.path.abspath(t)
             os.system('chmod +x %s; %s &'%(P, P))
-        self('serve --port %s'%port)
+            
+        print_open_msg(address, port)
+        tries = 0
+        while self('serve --address %s --port %s  %s'%(address, port, options)) != 2:
+            port += 1
+            tries += 1
+            if tries > 100:
+                raise RuntimeError, "no port found after trying 100 (maybe your network is down)"
+            print_open_msg(address, port)            
+        
 
     browse = serve

sage/server/notebook/notebook.py

@@ -17 +17 @@
 \subsection{Supported Browsers}
 
-The SAGE notebook should fully work with Firefox (and Mozilla),
-Safari, and Opera. The notebook works somewhat in Internet Explorer.
+The SAGE notebook should fully work with Firefox (and Mozilla).  It
+may work to some extent with Safari and Opera.  Internet Explorer is
+not supported.
 
 \subsection{Tutorial}
@@ -347 +348 @@
 from   sage.misc.viewer     import browser
 from   sage.misc.misc       import alarm, cancel_alarm
+from   sage.server.misc import print_open_msg
 
 # SAGE Notebook
@@ -775 +777 @@
                 break
 
-        s = "Open your web browser to http://%s:%s"%(address, port)
-        t = len(s)
-        if t%2:
-            t += 1
-            s += ' '
-        n = max(t+4, 50)
-        k = n - t  - 1
-        j = k/2 
-        print '*'*n
-        print '*'+ ' '*(n-2) + '*'
-        print '*' + ' '*j + s + ' '*j + '*'
-        print '*'+ ' '*(n-2) + '*'
-        print '*'*n
-        print "WARNING: The SAGE Notebook works best with Firefox/Mozilla, Safari, and Opera."
+        print_open_msg(address, port)
+        print "WARNING: The SAGE Notebook works best with ** Firefox/Mozilla **."
+        
 
         if open_viewer:
@@ -1475 +1466 @@
              port        = 8000,
              address     = 'localhost',
-             open_viewer = False,
+             open_viewer = True,
              max_tries   = 10,
              username    = None,
@@ -1502 +1493 @@
         address -- (default: 'localhost') address that the server
                    will listen on
-        open_viewer -- bool (default:False); if True, pop up a web browser at the URL
+        open_viewer -- bool (default: True); if True, pop up a web browser at the URL
         max_tries -- (default: 10) maximum number of ports > port to try in
                      case given port can't be opened.

sage/server/wiki/moin.py

@@ -16 +16 @@
 
 from   sage.misc.viewer     import browser
+from   sage.server.misc import print_open_msg
 
 # if you change the default sage_wiki, you must also change local/bin/sage-wiki
@@ -39 +40 @@
          port=9000,
          address='localhost',
-         open_viewer = False,
          threads=10):
     r"""
@@ -83 +83 @@
         config.close()                     
 
-        ## Open a viewer if requested
-        if open_viewer:
-            cmd = '%s http://%s:%s 1>&2 >/dev/null &'%(browser(), address, port)
-            os.system(cmd)
-
         ## Start up twisted
+        print_open_msg(address, port)
         e = os.system('twistd -n --python twistedconf.py')
         if not e:
@@ -98 +94 @@
             run(port + i)
         except socket.error:
-            print "Port %s is already in use.  Trying next port..."%(Config.port)
+            print "Port %s is already in use.  Trying next port..."%port
         else:
             break
@@ -107 +103 @@
 def wiki_simple_http(directory='sage_wiki',
          port=9000,
-         address='localhost',
-         open_viewer = False):
+         address='localhost'):
     r"""
     Create (if necessary) and start up a Moin Moin wiki.
@@ -190 +185 @@
 
 
-    if open_viewer:
-        cmd = '%s http://%s:%s 1>&2 >/dev/null &'%(browser(), address, port)
-        os.system(cmd)
-
     for i in range(256):   
         try:
+            print_open_msg(address, port)
             run(Config)
         except socket.error: