- partial support for showing if packages is marked for mv/rm

Changed files:
    modules/cmds.py -> 1.9
    modules/ftpio.py -> 1.7
    modules/wwwcmds.py -> 1.3

diff --git a/modules/cmds.py b/modules/cmds.py
index ec19b1719c37f37ae6477ebd3ced27cc1142013f..dff6fa9fc99ee3873346e646ff970e7e9265d141 100644 (file)
--- a/modules/cmds.py
+++ b/modules/cmds.py
@@ -137,10 +137,20 @@ def reloadftptree():
 
 def cmd_gettree(con):
     buf=''
-    for pkg in pkglist:
+    for pkgname in pkglist:
         # TODO: show only user's own pkgs
         # TODO: show if already marked
-        buf=buf+'\n'+pkg
+        pkg=srctree[pkgname]
+        line=pkgname
+        if pkg.marked4moving:
+            line=line+'\n1'
+        else:
+            line=line+'\n0'
+        if pkg.marked4removal:
+            line=line+'\n1'
+        else:
+            line=line+'\n0'
+        buf=buf+'\0'+line
     if buf:
         con.sock.send('%.6d' % (len(buf)-1))
         con.sock.send(buf[1:])

diff --git a/modules/ftpio.py b/modules/ftpio.py
index 1adf490a3444226390e3cab1d1d0eac51ef35a21..194d2a59d50dbec6ecad507a50d8b7bfab166bb2 100644 (file)
--- a/modules/ftpio.py
+++ b/modules/ftpio.py
@@ -69,7 +69,8 @@ def gettree():
     pkgs=[]
     len=int(sock.recv(6))
     if len:
-        for pkg in sock.recv(len).split('\n'):
-            pkgs.append(pkg)
+        for pkg in sock.recv(len).split('\0'):
+            tmp=pkg.split('\n')
+            pkgs.append((tmp[0], int(tmp[1]), int(tmp[2])))
     return pkgs
 

diff --git a/modules/wwwcmds.py b/modules/wwwcmds.py
index 831d06fc0d803642b1cf66becab073804fefe585..ea6c63cb7fcf02c912f1f9062180ba94994956fd 100644 (file)
--- a/modules/wwwcmds.py
+++ b/modules/wwwcmds.py
@@ -4,14 +4,21 @@ import wwwiface, ftpio
 
 
 def handlecmds(options):
+    def chkbox(pkgname, value):
+        retval='<input type="checkbox" name="%s"' % pkgname
+        if value:
+            retval=retval+' checked="yes"'
+        retval=retval+'>'
+        return retval
+
     if 'action' in options and options['action'] in actions:
         pass
     else:
         wwwiface.addcontent('<form action="index.py" method="post"><table border="1">')
-        wwwiface.addcontent('<tr><td>Mv</td><td>Package</td></tr>\n')
+        wwwiface.addcontent('<tr><td>Mv</td><td>Rm</td><td>Package</td></tr>')
         for pkg in ftpio.gettree():
-            wwwiface.addcontent('<tr><td><input type="checkbox"></td><td>'+pkg+'</td></tr>\n')
-        wwwiface.addcontent('<tr><td>&nbsp;</td><td><input type="submit" value="Move"></td></tr>')
+            wwwiface.addcontent('<tr><td>%s</td><td>%s</td><td>%s</td></tr>' % (chkbox(pkg[0], pkg[1]), chkbox(pkg[0], pkg[2]), pkg[0]))
+        wwwiface.addcontent('<tr><td>&nbsp;</td><td>&nbsp;</td><td><input type="submit" value="Commit"></td></tr>')
         wwwiface.addcontent('</table></form>')