From c02f76900882d57ebbaa3d94d87a0ce68a33df3b Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Fri, 10 Aug 2018 05:36:14 +0000
Subject: [PATCH] Doku ergaenzt
---
src/java/de/uhilger/filecms/pub/Catalog.java | 68 +++++++++++++--------------------
1 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/src/java/de/uhilger/filecms/pub/Catalog.java b/src/java/de/uhilger/filecms/pub/Catalog.java
index c7db6c4..453049c 100644
--- a/src/java/de/uhilger/filecms/pub/Catalog.java
+++ b/src/java/de/uhilger/filecms/pub/Catalog.java
@@ -19,12 +19,11 @@
package de.uhilger.filecms.pub;
import de.uhilger.filecms.api.Api;
-import de.uhilger.filecms.data.Bild;
+import de.uhilger.wbx.Bild;
import de.uhilger.filecms.data.FileRef;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import java.util.logging.Logger;
@@ -47,26 +46,7 @@
* @return Liste der Dateien und Ordner am Ort relPath
*/
public List<FileRef> list(String relPath) {
- Bild bild = new Bild();
- List<FileRef> files = new ArrayList();
- StringBuffer path = new StringBuffer(PUB_DIR_PATH); // www/
- path.append(relPath);
- File dir = new File(getBase().getAbsolutePath(), path.toString());
- if(dir.exists()) {
- File[] fileArray = dir.listFiles();
- for(int i = 0; i < fileArray.length; i++) {
- logger.fine(fileArray[i].toURI().toString());
- String fname = fileArray[i].toURI().toString().replace("file:/", "");
- if(fileArray[i].isDirectory()) {
- fname = fname.substring(0, fname.length() - 1);
- }
- logger.fine(fname);
- FileRef ref = new FileRef(fname, fileArray[i].isDirectory());
- ref.setMimetype(bild.getMimeType(fileArray[i]));
- files.add(ref);
- }
- }
- return files;
+ return listInt(relPath, null, null);
}
/**
@@ -80,29 +60,35 @@
* @return Liste der Dateien und Ordner am Ort relPath
*/
public List<FileRef> listOrdered(String relPath, String orderBy, String order) {
- Bild bild = new Bild();
+ return listInt(relPath, orderBy, order);
+ }
+
+ private List<FileRef> listInt(String relPath, String orderBy, String order) {
List<FileRef> files = new ArrayList();
- StringBuffer path = new StringBuffer(PUB_DIR_PATH); // www/
- path.append(relPath);
- File dir = new File(getBase().getAbsolutePath(), path.toString());
- if(dir.exists()) {
- File[] fileArray = dir.listFiles();
- if(orderBy != null && orderBy.equalsIgnoreCase("date")) {
- Arrays.sort(fileArray, new FileDateComparator(order));
- }
- for(int i = 0; i < fileArray.length; i++) {
- logger.fine(fileArray[i].toURI().toString());
- String fname = fileArray[i].toURI().toString().replace("file:/", "");
- if(fileArray[i].isDirectory()) {
- fname = fname.substring(0, fname.length() - 1);
+ if(!relPath.startsWith(".")) {
+ Bild bild = new Bild();
+ StringBuffer path = new StringBuffer(PUB_DIR_PATH); // www/
+ path.append(relPath);
+ File dir = new File(getBase().getAbsolutePath(), path.toString());
+ if(dir.exists()) {
+ File[] fileArray = dir.listFiles();
+ if(orderBy != null && orderBy.equalsIgnoreCase("date")) {
+ Arrays.sort(fileArray, new FileDateComparator(order));
}
- logger.fine(fname);
- FileRef ref = new FileRef(fname, fileArray[i].isDirectory());
- ref.setMimetype(bild.getMimeType(fileArray[i]));
- files.add(ref);
+ for(int i = 0; i < fileArray.length; i++) {
+ logger.fine(fileArray[i].toURI().toString());
+ String fname = fileArray[i].toURI().toString().replace("file:/", "");
+ if(fileArray[i].isDirectory()) {
+ fname = fname.substring(0, fname.length() - 1);
+ }
+ logger.fine(fname);
+ FileRef ref = new FileRef(fname, fileArray[i].isDirectory());
+ ref.setMimetype(bild.getMimeType(fileArray[i]));
+ files.add(ref);
+ }
}
}
return files;
- }
+ }
}
--
Gitblit v1.9.3