Rename Folder Size to Node Size for repository webscript

zhihailiu · Nov 23, 2016 · eef5865 · eef5865
1 parent 45c9a1f
commit eef5865
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ http://docs.alfresco.com/5.0/tasks/dev-extensions-share-tutorials-add-content.ht
 http://sharextras.org/jsdoc/share/community-4.0.e/symbols/Alfresco.FolderMetadata.html
 
 ### Add component/region to existing page/template
-http://docs.alfresco.com/4.0/tasks/tu_40_add-content.html
-http://docs.alfresco.com/4.0/tasks/tu-share-FM-temp-customize.html
-http://docs.alfresco.com/5.0/tasks/dev-extensions-share-tutorials-fm-temp-customize.html
-https://www.alfresco.com/blogs/developer/2011/08/12/customizing-alfresco-share-freemarker-templates/
+- http://docs.alfresco.com/4.0/tasks/tu_40_add-content.html
+- http://docs.alfresco.com/4.0/tasks/tu-share-FM-temp-customize.html
+- http://docs.alfresco.com/5.0/tasks/dev-extensions-share-tutorials-fm-temp-customize.html
+- https://www.alfresco.com/blogs/developer/2011/08/12/customizing-alfresco-share-freemarker-templates/
diff --git a/...nfig/alfresco/extension/templates/webscripts/com/acme/foldersize/folder-size.get.desc.xml b/...nfig/alfresco/extension/templates/webscripts/com/acme/foldersize/folder-size.get.desc.xml
diff --git a/...p/config/alfresco/extension/templates/webscripts/com/acme/nodesize/node-size.get.desc.xml b/...p/config/alfresco/extension/templates/webscripts/com/acme/nodesize/node-size.get.desc.xml
@@ -0,0 +1,8 @@
+<webscript>
+	<shortname>Node Content Size</shortname>
+	<description>Returns the recursive content size of the given nodeRef</description>
+	<url>/com/acme/nodesize/node-size?nodeRef={nodeRef}</url>
+	<authentication>user</authentication>
+	<format default="html">extension</format>
+	<family>Node Size Utilities</family>
+</webscript>
diff --git a/.../acme/foldersize/folder-size.get.html.ftl → .../com/acme/nodesize/node-size.get.html.ftl b/.../acme/foldersize/folder-size.get.html.ftl → .../com/acme/nodesize/node-size.get.html.ftl
@@ -4,11 +4,11 @@
     <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Folder Size</title>
+    <title>Node Content Size</title>
 </head>
 <body>
         <div>
-        <h1>Folder Size</h1>
+        <h1>Node Content Size</h1>
         <p>Name : ${nodeName}</p>
         <p>Size : ${size}</p>
     </div>

diff --git a/.../acme/foldersize/folder-size.get.json.ftl → .../com/acme/nodesize/node-size.get.json.ftl b/.../acme/foldersize/folder-size.get.json.ftl → .../com/acme/nodesize/node-size.get.json.ftl
diff --git a/repo-amp/src/main/amp/config/alfresco/module/repo-amp/context/webscript-context.xml b/repo-amp/src/main/amp/config/alfresco/module/repo-amp/context/webscript-context.xml
@@ -15,7 +15,7 @@
 		parent="webscript">
 	</bean>
 
-	<bean id="webscript.com.acme.foldersize.folder-size.get" class="com.acme.foldersize.FolderSizeWebScript"
+	<bean id="webscript.com.acme.nodesize.node-size.get" class="com.acme.nodesize.NodeSizeWebScript"
 		parent="webscript">
 		<property name="nodeService">
 			<ref bean="NodeService" />

diff --git a/.../acme/foldersize/FolderSizeWebScript.java → .../com/acme/nodesize/NodeSizeWebScript.java b/.../acme/foldersize/FolderSizeWebScript.java → .../com/acme/nodesize/NodeSizeWebScript.java
@@ -1,4 +1,4 @@
-package com.acme.foldersize;
+package com.acme.nodesize;
 
 import java.util.HashMap;
 import java.util.List;
@@ -14,8 +14,14 @@
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptRequest;
 
-//http://www.dedunu.info/2015/03/alfresco-calculate-folder-size-using.html
-public class FolderSizeWebScript extends DeclarativeWebScript {
+/**
+ * Calculate node content size recursively.
+ * Modified from http://www.dedunu.info/2015/03/alfresco-calculate-folder-size-using.html
+ * 
+ * @author Zhihai Liu
+ *
+ */
+public class NodeSizeWebScript extends DeclarativeWebScript {
 
 	private NodeService nodeService;
 
@@ -27,7 +33,6 @@ public final void setNodeService(final NodeService nodeService) {
 	protected Map<String, Object> executeImpl(WebScriptRequest req, Status status, Cache cache) {
 		Map<String, Object> model = new HashMap<String, Object>();
 		String nodeRefId = req.getParameter("nodeRef");
-		System.out.println("nodeRef=" + nodeRefId);
 		NodeRef nodeRef = new NodeRef(nodeRefId);
 
 		String nodeName = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
@@ -52,6 +57,7 @@ private long getNodeSize(NodeRef nodeRef) {
 		}
 
 		// Collecting child nodes' sizes
+		// even a document (cm:content) can have child nodes, such as thumbnail
 		List<ChildAssociationRef> chilAssocsList = nodeService.getChildAssocs(nodeRef);
 
 		for (ChildAssociationRef childAssociationRef : chilAssocsList) {

diff --git a/...web-extension/site-webscripts/com/acme/components/folder-details/folder-size.get.html.ftl b/...web-extension/site-webscripts/com/acme/components/folder-details/folder-size.get.html.ftl
@@ -1,4 +1,3 @@
-<#include "/org/alfresco/include/alfresco-macros.lib.ftl" />
 <#assign el=args.htmlid>
 
 <div id="${el}-body" class="folder-metadata-header folder-details-panel">

diff --git a/...resco/web-extension/site-webscripts/com/acme/components/folder-details/folder-size.get.js b/...resco/web-extension/site-webscripts/com/acme/components/folder-details/folder-size.get.js
@@ -1,6 +1,6 @@
 <import resource="classpath:/alfresco/templates/org/alfresco/import/alfresco-util.js">
 
-//https://jsfiddle.net/oy02axhh/
+// https://jsfiddle.net/oy02axhh/
 function formatBytes(bytes) {
 	if(bytes == 0) return '0 Byte';
 	var k = 1024; // or 1024 for binary
@@ -15,7 +15,7 @@ function main() {
 
 	// call repository webscript
 	var connector = remote.connect("alfresco");
-	var data = connector.get("/com/acme/foldersize/folder-size.json?nodeRef=" + model.nodeRef);
+	var data = connector.get("/com/acme/nodesize/node-size.json?nodeRef=" + model.nodeRef);
 
 	// create json object from data
 	var result = eval('(' + data + ')');