file-cms.git - Ulrich Hilger Code Repository

parent: 6413b48b | patch | commit | show whitespace

Thumbnails werden nun im jeweiligen Bildordner mit abgelegt und nicht jedes...

ulrich

2020-01-17 332c058bd407c4b6fb30e6bf32b634a72bc68e05

Thumbnails werden nun im jeweiligen Bildordner mit abgelegt und nicht jedesmal 'on the fly' erzeugt.

2 files added

3 files modified

	src/java/de/uhilger/filecms/api/FileMgr.java	5 ●●●●● patch \| view \| raw \| blame \| history
	src/java/de/uhilger/filecms/pub/Catalog.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/java/de/uhilger/filecms/pub/ImgFileFilter.java	29 ●●●●● patch \| view \| raw \| blame \| history
	src/java/logging.properties	6 ●●●●● patch \| view \| raw \| blame \| history
	web/test.jsp	25 ●●●●● patch \| view \| raw \| blame \| history

 src/java/de/uhilger/filecms/api/FileMgr.java

@@ -21,12 +21,15 @@
import de.uhilger.filecms.data.FileRef;
import de.uhilger.filecms.pub.AbstractComparator;
import de.uhilger.filecms.pub.FileNameComparator;
import de.uhilger.filecms.pub.ImgFileFilter;
import de.uhilger.wbx.Bild;
import de.uhilger.wbx.WbxUtils;
import static de.uhilger.wbx.WbxUtils.EMPTY_STRING;
import static de.uhilger.wbx.WbxUtils.WBX_FILE_BASE;
import de.uhilger.wbx.data.Inhalt;
import de.uhilger.wbx.web.TNServlet;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -124,7 +127,7 @@
        logger.fine("listing path: " + path);
        File dir = new File(path);
        if (dir.exists()) {
          File[] fileArray = dir.listFiles();
          File[] fileArray = dir.listFiles(new ImgFileFilter());
          if (orderBy != null && orderBy.equalsIgnoreCase("name")) {
            Arrays.sort(fileArray, new FileNameComparator(order));
          } else {

 src/java/de/uhilger/filecms/pub/Catalog.java

@@ -71,7 +71,7 @@
      path.append(relPath);
      File dir = new File(getBase().getAbsolutePath(), path.toString());
      if(dir.exists()) {
        File[] fileArray = dir.listFiles();
        File[] fileArray = dir.listFiles(new ImgFileFilter());
        if(orderBy != null && orderBy.equalsIgnoreCase("date")) {
          Arrays.sort(fileArray, new FileDateComparator(order));
        }

 src/java/de/uhilger/filecms/pub/ImgFileFilter.java

New file
@@ -0,0 +1,29 @@
/*
 * To change this license header, choose License Headers in Project Properties.
 * To change this template file, choose Tools | Templates
 * and open the template in the editor.
 */
package de.uhilger.filecms.pub;

import de.uhilger.wbx.web.TNServlet;
import java.io.File;
import java.io.FileFilter;

/**
 *
 * @author ulrich
 */
public class ImgFileFilter implements FileFilter {
    @Override
    public boolean accept(File pathname) {
      boolean pass = true;
      String fname = pathname.getName().toLowerCase();
      if(fname.endsWith(TNServlet.JPEG) || fname.endsWith(TNServlet.JPG) || fname.endsWith(TNServlet.PNG)) {
        if(fname.contains(TNServlet.GR) || fname.contains(TNServlet.KL) || fname.contains(TNServlet.MT) || 
                fname.contains(TNServlet.SM) || fname.contains(TNServlet.TN)) {
          pass = false;
        }
      }
      return pass;
    }
}

 src/java/logging.properties

@@ -27,7 +27,7 @@
# Note that the ConsoleHandler also has a separate level

# setting to limit messages printed to the console.

# .level= FINE

.level = OFF

.level = NONE


############################################################

# Handler specific properties.

@@ -65,4 +65,6 @@
# messages:

# com.xyz.foo.level = SEVERE

de.uhilger.filecms.handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler

de.uhilger.filecms.level = INFO

de.uhilger.filecms.level = FINEST
de.uhilger.wbx.handlers = java.util.logging.ConsoleHandler
de.uhilger.wbx.level = FINEST

 web/test.jsp

New file
@@ -0,0 +1,25 @@
<%-- 
    Document   : test
    Created on : 17.01.2020, 07:46:52
    Author     : ulrich
--%>

<%@page contentType="text/html" pageEncoding="UTF-8"%>
<%@ page import = "java.io.*,java.util.*"%>
<!DOCTYPE html>
<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <title>Test</title>
  </head>
  <body>
    <p>Testseite</p>
    <p>
        Catalina Home: <%= System.getProperty("catalina.home")%><br/>
        Catalina Base: <%= System.getProperty("catalina.base")%>
    </p>
    <p>
        <img src="/home/test/bilder/278103-14-r_tn.jpg" />    
    </p>
  </body>
</html>

			@@ -21,12 +21,15 @@
			import de.uhilger.filecms.data.FileRef;
			import de.uhilger.filecms.pub.AbstractComparator;
			import de.uhilger.filecms.pub.FileNameComparator;
			import de.uhilger.filecms.pub.ImgFileFilter;
			import de.uhilger.wbx.Bild;
			import de.uhilger.wbx.WbxUtils;
			import static de.uhilger.wbx.WbxUtils.EMPTY_STRING;
			import static de.uhilger.wbx.WbxUtils.WBX_FILE_BASE;
			import de.uhilger.wbx.data.Inhalt;
			import de.uhilger.wbx.web.TNServlet;
			import java.io.File;
			import java.io.FileFilter;
			import java.io.FileInputStream;
			import java.io.FileNotFoundException;
			import java.io.FileOutputStream;
			@@ -124,7 +127,7 @@
			logger.fine("listing path: " + path);
			File dir = new File(path);
			if (dir.exists()) {
			File[] fileArray = dir.listFiles();
			File[] fileArray = dir.listFiles(new ImgFileFilter());
			if (orderBy != null && orderBy.equalsIgnoreCase("name")) {
			Arrays.sort(fileArray, new FileNameComparator(order));
			} else {

			@@ -71,7 +71,7 @@
			path.append(relPath);
			File dir = new File(getBase().getAbsolutePath(), path.toString());
			if(dir.exists()) {
			File[] fileArray = dir.listFiles();
			File[] fileArray = dir.listFiles(new ImgFileFilter());
			if(orderBy != null && orderBy.equalsIgnoreCase("date")) {
			Arrays.sort(fileArray, new FileDateComparator(order));
			}

New file
			@@ -0,0 +1,29 @@
			/*
			* To change this license header, choose License Headers in Project Properties.
			* To change this template file, choose Tools \| Templates
			* and open the template in the editor.
			*/
			package de.uhilger.filecms.pub;

			import de.uhilger.wbx.web.TNServlet;
			import java.io.File;
			import java.io.FileFilter;

			/**
			*
			* @author ulrich
			*/
			public class ImgFileFilter implements FileFilter {
			@Override
			public boolean accept(File pathname) {
			boolean pass = true;
			String fname = pathname.getName().toLowerCase();
			if(fname.endsWith(TNServlet.JPEG) \|\| fname.endsWith(TNServlet.JPG) \|\| fname.endsWith(TNServlet.PNG)) {
			if(fname.contains(TNServlet.GR) \|\| fname.contains(TNServlet.KL) \|\| fname.contains(TNServlet.MT) \|\|
			fname.contains(TNServlet.SM) \|\| fname.contains(TNServlet.TN)) {
			pass = false;
			}
			}
			return pass;
			}
			}

			@@ -27,7 +27,7 @@
			# Note that the ConsoleHandler also has a separate level
			# setting to limit messages printed to the console.
			# .level= FINE
			.level = OFF
			.level = NONE

			############################################################
			# Handler specific properties.
			@@ -65,4 +65,6 @@
			# messages:
			# com.xyz.foo.level = SEVERE
			de.uhilger.filecms.handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler
			de.uhilger.filecms.level = INFO
			de.uhilger.filecms.level = FINEST
			de.uhilger.wbx.handlers = java.util.logging.ConsoleHandler
			de.uhilger.wbx.level = FINEST

New file
			@@ -0,0 +1,25 @@
			<%--
			Document : test
			Created on : 17.01.2020, 07:46:52
			Author : ulrich
			--%>

			<%@page contentType="text/html" pageEncoding="UTF-8"%>
			<%@ page import = "java.io.,java.util."%>
			<!DOCTYPE html>
			<html>
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
			<title>Test</title>
			</head>
			<body>
			<p>Testseite</p>
			<p>
			Catalina Home: <%= System.getProperty("catalina.home")%><br/>
			Catalina Base: <%= System.getProperty("catalina.base")%>
			</p>
			<p>
			<img src="/home/test/bilder/278103-14-r_tn.jpg" />
			</p>
			</body>
			</html>