showDotfiles

Author: weberjn

src/main/java/de/jwi/jfm/Folder.java

@@ -24,6 +24,7 @@
  */
 
 import java.io.File;
+import java.io.FilenameFilter;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -81,6 +82,8 @@ public class Folder
 	String url;
 
 	private File myFile;
+	
+	private Map<String,String> options;
 
 	File[] children;
 
@@ -119,12 +122,13 @@ private Folder()
 		// NOP
 	}
 
-	public Folder(File f, String path, String url)
+	public Folder(File f, String path, String url, Map<String,String> options)
 			throws IOException
 	{
 		myFile = f;
 		this.path = path;
 		this.url = url;
+		this.options = options;
 
 		if (!myFile.exists())
 		{
@@ -140,7 +144,18 @@ public List<FileWrapper> getFiles()
 	public void load()
 	{
 
-		children = myFile.listFiles();
+		children = myFile.listFiles(new FilenameFilter()
+		{
+			public boolean 	accept(File dir, String name)
+			{
+				if (name.startsWith(".") && null == options.get("showDotfiles"))
+				{
+					return false;
+				}
+				return true;
+			}
+		}
+		);
 
 		if (children == null)
 		{

src/main/java/de/jwi/jfm/servlets/Controller.java

@@ -33,6 +33,8 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
@@ -63,9 +65,6 @@ public class Controller extends HttpServlet {
 
 	private static final String FILE_DOWNLOAD_SERVLET = "/dlf";
 
-	private static String version = "unknown";
-	private static String builddate = "unknown";
-
 	private static final String VERSIONCONFIGFILE = "/version.txt";
 
 	public static final int NOP_ACTION = 0;
@@ -108,6 +107,8 @@ public class Controller extends HttpServlet {
 
 	private String filebase = null;
 
+	private Properties versionProperties;
+
 	public void init() throws ServletException {
 		tempDir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir");
 
@@ -134,23 +135,12 @@ public void init() throws ServletException {
 			InputStream is = getClass().getResourceAsStream(VERSIONCONFIGFILE);
 
 			if (is != null) {
-				Properties versionProperties = new Properties();
+				versionProperties = new Properties();
 				versionProperties.load(is);
 				is.close();
-				
-				s = versionProperties.getProperty("version");
-				if (null != s) {
-					version = s;
-				}
-				
-				s = versionProperties.getProperty("build.date");
-				if (null != s) {
-					builddate = s;
-				}
-				
 			}
 		} catch (Exception e) {
-			e.printStackTrace(System.err);
+			throw new ServletException(VERSIONCONFIGFILE,e);
 		}
 
 	}
@@ -181,6 +171,19 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 
 				return;
 			}
+			
+			String showDotfiles = request.getParameter("showDotfiles");
+
+			HttpSession session = request.getSession();
+
+			Map<String,String> options = (Map<String,String>)session.getAttribute("options");
+			if (options == null)
+			{
+				options = new HashMap<String,String>();
+				session.setAttribute("options", options);
+			}
+
+			options.put("showDotfiles", showDotfiles);	
 
 			File f = new File(filebase, pathInfo);
 
@@ -213,7 +216,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 			String fileURL = requestURI.replaceFirst(contextPath, "");
 			fileURL = fileURL.replaceFirst(servletPath, "");
 
-			folder = new Folder(f, pathInfo, fileURL);
+			folder = new Folder(f, pathInfo, fileURL, options);
 
 			folder.load();
 
@@ -258,16 +261,12 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 
 		request.setAttribute("date", s);
 
-		request.setAttribute("version", version);
+		request.setAttribute("versionInfo", versionProperties);
 
-		request.setAttribute("builddate", builddate);
-
 		request.setAttribute("javaversion", System.getProperty("java.version"));
 
 		request.setAttribute("serverInfo", getServletContext().getServerInfo());
 
-		request.setAttribute("jfmhome", "https://java.net/projects/jfm");
-		
 		request.setAttribute("url", contextPath);
 
 		request.setAttribute("path", pathInfo);
@@ -295,7 +294,7 @@ private String handleQuery(HttpServletRequest request, HttpServletResponse respo
 		String rc = "";
 
 		HttpSession session = request.getSession();
-		
+				
 		String target = null;
 		int action = NOP_ACTION;
 		String[] selectedfiles = request.getParameterValues("index");

src/main/resources/version.txt

@@ -1,2 +1,4 @@
 version=${pom.version}
-build.date=${timestamp}
+buildDate=${timestamp}
+jfmHome=${project.url}
+copyRight=2004,2019 Jürgen Weber

src/main/webapp/WEB-INF/fm.jsp

@@ -13,12 +13,7 @@
 
 
 <body bgcolor="#FFFFFF">
-<h3>jFM - File Manager </h3>
-
-<c:if test="${!principal}">
-<a href="${self}${path}?logout=t" title="Log out">log out ${principal}</a>
-</c:if>
-<p>
+<h3>jFM - File Manager</h3>
 
 <span style="color: rgb(255, 0, 0);">${actionresult}</span>
 
@@ -342,11 +337,28 @@ File upload and unzip to current directory
 
 </c:if>
 
+<table>
+<tbody>
+
+<tr>
+<td colspan="4" class="header-left">Options</td>
+</tr>
+<tr>
+<td class="row-center"><form name="options" action="${self}${path}"><input type="checkbox" <c:if test="${not empty options.showDotfiles}">checked="on"</c:if> name="showDotfiles" title="show dot files">show dot files
+<input type="submit" value="setoptions" /> </form>
+</td>
+</tr>
+
+</tbody>
+</table>
+
+
+
 <table border="0">
 <tbody>
 <tr>
 
-<td class="row-left"><small><a href="${jfmhome}" title="${jfmhome}">jFM ${version}</a>(${builddate}) Copyright &copy; 2004,2016 J&uuml;rgen Weber</small></td>
+<td class="row-left"><small><a href="${versionInfo.jfmHome}" title="${versionInfo.jfmHome}">jFM ${versionInfo.version}</a> (${versionInfo.buildDate}) Copyright &copy; ${versionInfo.copyRight}</small></td>
 
 <td class="row-right"><small>jFM running on Java ${javaversion}, ${serverInfo}</small></td>