[freenet-cvs] r9192 - in trunk/freenet/src/freenet: clients/http node/fcp

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-06-14 09:29:12 +0000 (Wed, 14 Jun 2006)
New Revision: 9192

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
   trunk/freenet/src/freenet/node/fcp/ClientRequest.java
Log:
some work on #462, resolves #431

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-06-14 
08:59:07 UTC (rev 9191)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2006-06-14 
09:29:12 UTC (rev 9192)
@@ -99,10 +99,6 @@

                StringBuffer buf = new StringBuffer(2048);

-               ctx.getPageMaker().makeHead(buf, "Queued Requests");
-               
-               node.alerts.toSummaryHtml(buf);
-               
                // First, get the queued requests, and separate them into 
different types.

                LinkedList completedDownloadToDisk = new LinkedList();
@@ -159,6 +155,15 @@
                        }
                }

+               
+               ctx.getPageMaker().makeHead(buf, "Queued Requests 
("+(uncompletedDirUpload.size()+uncompletedDownload.size()+uncompletedUpload.size())+
+                               
"/"+(failedDirUpload.size()+failedDownload.size()+failedUpload.size())+
+                               
"/"+(completedDirUpload.size()+completedDownloadToDisk.size()+completedDownloadToTemp.size()+completedUpload.size())+
+                               ")");
+               
+               node.alerts.toSummaryHtml(buf);
+               
+               
                if(!(completedDownloadToTemp.isEmpty() && 
completedDownloadToDisk.isEmpty() &&
                                completedUpload.isEmpty() && 
completedDirUpload.isEmpty())) {
                        writeBigHeading("Completed requests", buf);
@@ -400,6 +405,7 @@
                        nf.setMaximumFractionDigits(0);
                        buf.append("<div class=\"progressbar\"><div 
class=\"progressbar-done\" style=\"width: "+nf.format(frac*100)+"%\" /></div>");

+                       nf.setMaximumFractionDigits(1);
                        if(b)
                                buf.append("<span 
class=\"progress_fraction_finalized\">");
                        else

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2006-06-14 08:59:07 UTC 
(rev 9191)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2006-06-14 09:29:12 UTC 
(rev 9192)
@@ -27,6 +27,8 @@
        private final FreenetURI targetURI;
        private final Bucket data;
        private final ClientMetadata clientMetadata;
+       /** We store the size of inserted data before freeing it */
+       private long finishedSize;

        public ClientPut(FCPConnectionHandler handler, ClientPutMessage 
message) throws IdentifierCollisionException {
                super(message.uri, message.identifier, message.verbosity, 
handler, 
@@ -162,6 +164,7 @@
        }

        protected void freeData() {
+               finishedSize=data.size();
                data.free();
        }

@@ -216,7 +219,10 @@
        }

        public long getDataSize() {
-               return data.size();
+               if(data == null)
+                       return finishedSize;
+               else
+                       return data.size();
        }

        public String getMIMEType() {

Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2006-06-14 
08:59:07 UTC (rev 9191)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2006-06-14 
09:29:12 UTC (rev 9192)
@@ -202,6 +202,11 @@
                cancel();
                freeData();
        }
+       
+       /** Return the priority class */
+       public short getPriority(){
+               return priorityClass;
+       }

        /** Free cached data bucket(s) */
        protected abstract void freeData();