Fixed problem with header name encoding in tags and groups

[pithos-web-client] / src / gr / grnet / pithos / web / client / foldertree / AccountResource.java

diff --git a/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java b/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java
index b746028..e6283e1 100644 (file)
--- a/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/AccountResource.java
@@ -44,6 +44,7 @@ import java.util.List;
 
 import com.google.gwt.http.client.Header;
 import com.google.gwt.http.client.Response;
+import com.google.gwt.http.client.URL;
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
 import com.google.gwt.i18n.client.NumberFormat;
@@ -64,7 +65,7 @@ public class AccountResource extends Resource {
 
     private long bytesUsed = 0;
 
-    private long bytesRemaining = 0;
+    private long quota = 0;
 
     private Date lastLogin = null;
 
@@ -76,12 +77,12 @@ public class AccountResource extends Resource {
 
     private List<Group> groups = new ArrayList<Group>();
 
-    public long getBytesRemaining() {
-        return bytesRemaining;
+    public long getQuota() {
+        return quota;
     }
 
-    public void setBytesRemaining(long bytesRemaining) {
-        this.bytesRemaining = bytesRemaining;
+    public void setQuota(long quota) {
+        this.quota = quota;
     }
 
     public long getBytesUsed() {
@@ -100,7 +101,8 @@ public class AccountResource extends Resource {
         this.lastLogin = lastLogin;
     }
 
-    public Date getLastModified() {
+    @Override
+       public Date getLastModified() {
         return lastModified;
     }
 
@@ -139,33 +141,35 @@ public class AccountResource extends Resource {
     public void populate(String owner, Response response) {
         DateTimeFormat df = DateTimeFormat.getFormat(PredefinedFormat.RFC_2822);
         for (Header h : response.getHeaders()) {
-            String name = h.getName();
-            if (name.startsWith("X-Account-Group-")) {
-                String groupName = name.substring("X-Account-Group-".length()).trim().toLowerCase();
-                Group g = new Group(groupName);
-                String[] members = h.getValue().split(",");
-                for (String s : members)
-                    g.addMember(s.trim());
-                groups.add(g);
-            }
-            else if (name.equals("X-Account-Container-Count")) {
-                numberOfContainers = Long.valueOf(h.getValue());
-            }
-            else if (name.equals("X-Account-Object-Count")) {
-                numberOfObjects = Long.valueOf(h.getValue());
-            }
-            else if (name.equals("X-Account-Bytes-Used")) {
-                bytesUsed = Long.valueOf(h.getValue());
-            }
-            else if (name.equals("X-Account-Bytes-Remaining")) {
-                bytesRemaining = Long.valueOf(h.getValue());
-            }
-            else if (name.equals("X-Account-Last-Login")) {
-                lastLogin = df.parse(h.getValue());
-            }
-            else if (name.equals("Last-Modified")) {
-                lastModified = df.parse(h.getValue());
-            }
+               if (h != null) {
+                       String name = h.getName();
+                       if (name.startsWith("X-Account-Group-")) {
+                           String groupName = URL.decodePathSegment(name.substring("X-Account-Group-".length())).trim().toLowerCase();
+                           Group g = new Group(groupName);
+                           String[] members = h.getValue().split(",");
+                           for (String s : members)
+                               g.addMember(s.trim());
+                           groups.add(g);
+                       }
+                       else if (name.equals("X-Account-Container-Count")) {
+                           numberOfContainers = Long.valueOf(h.getValue());
+                       }
+                       else if (name.equals("X-Account-Object-Count")) {
+                           numberOfObjects = Long.valueOf(h.getValue());
+                       }
+                       else if (name.equals("X-Account-Bytes-Used")) {
+                           bytesUsed = Long.valueOf(h.getValue());
+                       }
+                       else if (name.equals("X-Account-Policy-Quota")) {
+                           quota = Long.valueOf(h.getValue());
+                       }
+                       else if (name.equals("X-Account-Last-Login")) {
+                           lastLogin = df.parse(h.getValue());
+                       }
+                       else if (name.equals("Last-Modified")) {
+                           lastModified = df.parse(h.getValue());
+                       }
+               }
         }
 
         if (response.getText() != null && response.getText().length() > 0) {
@@ -202,23 +206,22 @@ public class AccountResource extends Resource {
 
     public String getFileSizeAsString() {
         if (bytesUsed < 1024)
-            return String.valueOf(bytesUsed) + " B";
+            return String.valueOf(bytesUsed) + "B";
         else if (bytesUsed < 1024*1024)
-            return getSize(bytesUsed, 1024D) + " KB";
+            return getSize(bytesUsed, 1024D) + "KB";
         else if (bytesUsed < 1024*1024*1024)
-            return getSize(bytesUsed,(1024D*1024D)) + " MB";
-        return getSize(bytesUsed , (1024D*1024D*1024D)) + " GB";
+            return getSize(bytesUsed,(1024D*1024D)) + "MB";
+        return getSize(bytesUsed , (1024D*1024D*1024D)) + "GB";
     }
 
     public String getQuotaAsString() {
-       long quota = bytesUsed + bytesRemaining;
         if (quota < 1024)
-            return String.valueOf(quota) + " B";
+            return String.valueOf(quota) + "B";
         else if (quota < 1024 * 1024)
-            return getSize(quota, 1024D) + " KB";
+            return getSize(quota, 1024D) + "KB";
         else if (quota < 1024 * 1024 * 1024)
-            return getSize(quota,(1024D * 1024D)) + " MB";
-        return getSize(quota , (1024D * 1024D * 1024D)) + " GB";
+            return getSize(quota,(1024D * 1024D)) + "MB";
+        return getSize(quota , (1024D * 1024D * 1024D)) + "GB";
     }
 
     public List<Group> getGroups() {
@@ -256,6 +259,15 @@ public class AccountResource extends Resource {
        }
 
        public double getUsedPercentage() {
-               return 100.0 * bytesUsed / (bytesUsed + bytesRemaining);
+               if (quota == 0)
+                       return 0;
+               return ((double) bytesUsed) / quota;
+       }
+
+       public Folder getPithos() {
+               for (Folder f : containers)
+                       if (f.getName().equals(Pithos.HOME_CONTAINER))
+                               return f;
+               return null;
        }
 }