Changeset 2454

Timestamp:

Aug 21, 2009, 12:42:41 PM (15 years ago)

Author:

quentin

Message:

Use browser-based dupe suppression, so multiple clients can connect to the same terminal and not miss updates

Location:

package_branches/invirt-web/cherrypy/code

Files:

• ajaxterm.py (modified) (5 diffs)
• main.py (modified) (2 diffs)
• static/ajaxterm/ajaxterm.js (modified) (3 diffs)

package_branches/invirt-web/cherrypy/code/ajaxterm.py

@@ -3 +3 @@
 """ Ajaxterm """
 
-import array,cgi,fcntl,glob,mimetypes,optparse,os,pty,random,re,signal,select,sys,threading,time,termios,struct,pwd
+import array,cgi,fcntl,glob,hashlib,mimetypes,optparse,os,pty,random,re,signal,select,sys,threading,time,termios,struct,pwd
 
 os.chdir(os.path.normpath(os.path.dirname(__file__)))
@@ -101 +101 @@
                 self.buf=""
                 self.outbuf=""
-                self.last_html=""
         def peek(self,y1,x1,y2,x2):
                 return self.scr[self.width*y1+x1:self.width*y2+x2]
@@ -321 +320 @@
         def dumplatin1(self):
                 return self.dump().translate(self.trl1)
-        def dumphtml(self,color=1,force=False):
+        def dumphtml(self,color=1,last_hash=None):
                 h=self.height
                 w=self.width
@@ -343 +342 @@
                         if i%w==w-1:
                                 span+='\n'
-                r='<?xml version="1.0" encoding="ISO-8859-1"?><pre class="term">%s</pre>'%r
-                if self.last_html==r and not force:
+                hash = hashlib.md5(r).hexdigest()
+                r='<?xml version="1.0" encoding="ISO-8859-1"?><pre class="term" id="%s">%s</pre>'% (hash,r)
+                if last_hash == hash:
                         return '<?xml version="1.0"?><idem></idem>'
                 else:
-                        self.last_html=r
-#                       print self
                         return r
         def __repr__(self):
@@ -437 +435 @@
                 except (IOError,OSError):
                         self.proc_kill(fd)
-        def dump(self,fd,color=1,force=False):
+        def dump(self,fd,color=1,last_hash=None):
                 try:
-                        return self.proc[fd]['term'].dumphtml(color, force)
+                        return self.proc[fd]['term'].dumphtml(color, last_hash)
                 except KeyError:
                         return False

package_branches/invirt-web/cherrypy/code/main.py

@@ -305 +305 @@
         @cherrypy.tools.require_POST()
         @cherrypy.tools.gzip()
-        def at(self, machine_id, k=None, c=0, force=0):
+        def at(self, machine_id, k=None, c=0, h=None):
             machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine
             with self.atsessions_lock:
@@ -323 +323 @@
                     self.atmulti.proc_write(term,k)
                 time.sleep(0.002)
-                dump=self.atmulti.dump(term,c,int(force))
+                dump=self.atmulti.dump(term,c,h)
                 cherrypy.response.headers['Content-Type']='text/xml'
                 if isinstance(dump,str):

package_branches/invirt-web/cherrypy/code/static/ajaxterm/ajaxterm.js

@@ -13 +13 @@
         var sending=0;
         var rmax=1;
-        var force=true;
 
         var div=document.getElementById(id);
@@ -99 +98 @@
                         }
                         var query=query1+send;
-                        if (force) {
-                            query=query+"&force=1";
-                            force=false;
+                        if (dterm.firstChild && dterm.firstChild.id) {
+                            query=query+"&h="+dterm.firstChild.id;
                         }
                         r.open("POST",base_path,true);
@@ -263 +261 @@
                 focus_element.onkeypress=keypress;
                 focus_element.onkeydown=keydown;
-                force=true;
                 timeout=window.setTimeout(update,100);
         }