From 92d86e5568b8313725ac709d28e32377eba890b4 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Sun, 01 Apr 2018 10:59:08 +0000
Subject: [PATCH] Feed-Servlet hier entfernt und aus wbx-lib eingebunden
---
/dev/null | 248 -------------------------------------------------
web/META-INF/daten/www/WEB-INF/web.xml | 8 +
2 files changed, 8 insertions(+), 248 deletions(-)
diff --git a/src/java/de/uhilger/filecms/web/FeedServlet.java b/src/java/de/uhilger/filecms/web/FeedServlet.java
deleted file mode 100644
index 0a02770..0000000
--- a/src/java/de/uhilger/filecms/web/FeedServlet.java
+++ /dev/null
@@ -1,248 +0,0 @@
-
-package de.uhilger.filecms.web;
-
-import static de.uhilger.filecms.web.Initialiser.FILE_BASE;
-import de.vogella.rss.model.Feed;
-import de.vogella.rss.model.FeedMessage;
-import de.vogella.rss.write.RSSStreamFeedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.servlets.DefaultServlet;
-
-/**
- * Das FeedServlet erstellt Feeds von Ordnern der WebBox
- *
- * Eine Maximaltiefe als Parameter soll regeln, wie viele Ordner tief
- * Dateien gesucht werden
- *
- */
-public class FeedServlet extends DefaultServlet {
-
- private static final Logger logger = Logger.getLogger(FeedServlet.class.getName());
- private int maxTiefe = 3;
- private int maxBeitraege = 5;
-
- @Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
- ServletOutputStream out = response.getOutputStream();
- response.setContentType("text/xml");
- String url = request.getRequestURL().toString();
- logger.fine(url);
- String dataUrl = url.replace("feed/", "data/");
- logger.fine(dataUrl);
- int pos = dataUrl.indexOf("data/");
- String zielPfad = dataUrl.substring(pos);
- logger.fine(zielPfad);
- ServletContext ctx = request.getServletContext();
- Object o = ctx.getAttribute(FILE_BASE);
- if(o instanceof String) {
- String basis = o.toString();
- logger.fine(basis);
- StringBuffer pfad = new StringBuffer();
- pfad.append(basis);
- pfad.append(zielPfad.replace("data/", "/www/"));
- logger.fine(pfad.toString());
- File dir = new File(pfad.toString());
- if(dir.isDirectory()) {
- List beitraege = new ArrayList();
- collectFiles(dir, 0, beitraege);
- Iterator i = beitraege.iterator();
- while(i.hasNext()) {
- File f = (File) i.next();
- logger.fine(f.getAbsolutePath() + " " + f.lastModified());
- }
- writeFeed("Newsfeed", "Neueste Inhalte von Ulrich Hilger", out, beitraege, basis, pfad.toString());
- } else {
- logger.fine(dir.getAbsolutePath() + " ist kein Ordner.");
- }
- }
- }
-
- /**
- * Diese Methode funktioniert nur, wenn entweder ein Ordner uebergeben
- * wird, der keine Unterordner enthaelt wie zum Beispiel der Ordner 'neu'
- * der Bildersammlung oder ein Ordner, dessen Unterordner
- * nach dem Schema Jahr, Monat benannt sind wie bei einem Journal, das
- * die Beitraege wie folgt enthaelt:
- * Journal-Ordner
- * 2018
- * 12
- * 11
- * 10
- * usw.
- * 2017
- * 12
- * 11
- * 10
- * usw.
- *
- * @param out
- * @param dir
- * @param tiefe
- * @param dateizaehler
- */
- private void collectFiles(File dir, int tiefe, List beitraege) {
- List dirs = new ArrayList();
- List beitraegeHier = new ArrayList();
- File[] files = dir.listFiles();
- for(int i = 0; i < files.length; i++) {
- if(files[i].isDirectory()) {
- if(tiefe < maxTiefe) {
- dirs.add(files[i]);
- }
- } else {
- beitraegeHier.add(files[i]);
- }
- }
- if(dirs.size() > 0) {
- // hier zuvor die Verzeichnissse absteigend nach Name sortieren
- Collections.sort(dirs, new Comparator<File>() {
- @Override
- public int compare(File o1, File o2) {
- return o2.getName().compareTo(o1.getName());
- }
- });
- Iterator i = dirs.iterator();
- while(i.hasNext() && beitraege.size() < maxBeitraege) {
- collectFiles((File) i.next(), tiefe+1, beitraege);
- }
- }
- if(beitraegeHier.size() > 0) {
- // hier zuvor die Liste der Beitraege dieses Ordners nach lastModified absteigend sortieren
- // dann die neuesten in beitraege aufnehmen, bis die maximale Zahl gesuchter
- // neuer Beitraege erreicht ist.
-
- Collections.sort(beitraegeHier, new Comparator<File>() {
- @Override
- public int compare(File o1, File o2) {
- int ergebnis;
- if(o1.lastModified() > o2.lastModified()) {
- ergebnis = -1;
- } else if(o2.lastModified() > o1.lastModified()) {
- ergebnis = 1;
- } else {
- ergebnis = 0;
- }
- return ergebnis;
- }
- });
-
- Iterator i = beitraegeHier.iterator();
- while(i.hasNext() && beitraege.size() < maxBeitraege) {
- File bf = (File) i.next();
- String nm = bf.getName().toLowerCase();
- if(nm.endsWith(".htmi") || nm.endsWith(".html") || nm.endsWith(".htm") ||
- nm.endsWith(".jpg") || nm.endsWith(".jpeg") || nm.endsWith(".png") ||
- nm.endsWith(".txt")) {
- beitraege.add(bf);
- }
- }
-
- }
- }
-
- public void writeFeed(String feedTitel, String beschr, ServletOutputStream s, List beitraege, String basis, String pfad) {
- String copyright = "Copyright (c) 2018 Ulrich Hilger";
- String title = feedTitel;
- String description = beschr;
- String language = "de";
- String link = "https://www.uhilger.de";
- Calendar cal = new GregorianCalendar();
- Date creationDate = cal.getTime();
- SimpleDateFormat date_format = new SimpleDateFormat(
- "EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z", Locale.US);
- String pubdate = date_format.format(creationDate);
- Feed rssFeed = new Feed(title, link, description, language,
- copyright, pubdate);
-
- Iterator i = beitraege.iterator();
- while (i.hasNext()) {
- File f = (File) i.next();
- FeedMessage feedEintrag = new FeedMessage();
- feedEintrag.setTitle(f.getName());
- //feedEintrag.setDescription("Beschreibung hier");
- feedEintrag.setAuthor("ulrich Punkt hilger bei web Punkt de (Ulrich Hilger)");
-
- String urlStr = f.getAbsolutePath();
- urlStr = urlStr.replace(basis, "https://uhilger.de");
- urlStr = urlStr.replace("www/", "data/");
-
- logger.fine(urlStr);
-
- feedEintrag.setGuid(urlStr);
- feedEintrag.setLink(urlStr);
- logger.fine(f.getName());
- feedEintrag.setDescription(readFilePart(f, urlStr));
- rssFeed.getMessages().add(feedEintrag);
- }
-
- RSSStreamFeedWriter writer = new RSSStreamFeedWriter(rssFeed, s);
- //RSSFeedWriter writer = new RSSFeedWriter(rssFeed, pfad + "/articles.rss");
- //ByteArrayOutputStream bs = new ByteArrayOutputStream();
- //RSSByteFeedWriter wr = new RSSByteFeedWriter(rssFeed, bs);
- try {
- writer.write();
- //s.print(bs.toString());
- } catch (Exception e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
- }
- }
-
- private String readFilePart(File f, String urlStr) {
- StringBuffer buf = new StringBuffer();
- Reader reader = null;
- try {
- String fn = f.getName().toLowerCase();
- if(fn.endsWith(".jpg") || fn.endsWith(".jpeg") || fn.endsWith(".png")) {
- String noExt;
- String ext;
- int dotpos = urlStr.lastIndexOf('.');
- if(dotpos > -1) {
- noExt = urlStr.substring(0, dotpos);
- ext = urlStr.substring(dotpos);
- } else {
- noExt = "";
- ext = "";
- }
- buf.append("<a href='");
- buf.append(urlStr);
- buf.append("'><img src='");
- buf.append(noExt);
- buf.append("_kl");
- buf.append(ext);
- buf.append("'></a>");
- } else {
- reader = new FileReader(f);
- char[] readBuffer = new char[1024];
- int charsRead = reader.read(readBuffer);
- buf.append(readBuffer);
- reader.close();
- }
- return buf.toString();
- } catch (Exception ex) {
- logger.log(Level.SEVERE, null, ex);
- return buf.toString();
- }
- }
-
-
-}
diff --git a/web/META-INF/daten/www/WEB-INF/web.xml b/web/META-INF/daten/www/WEB-INF/web.xml
index b63d894..918ecba 100644
--- a/web/META-INF/daten/www/WEB-INF/web.xml
+++ b/web/META-INF/daten/www/WEB-INF/web.xml
@@ -26,6 +26,10 @@
<servlet-name>TNServlet</servlet-name>
<servlet-class>de.uhilger.wbx.web.TNServlet</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>feed</servlet-name>
+ <servlet-class>de.uhilger.wbx.web.FeedServlet</servlet-class>
+ </servlet>
<servlet-mapping>
<servlet-name>view</servlet-name>
<url-pattern>*.htmi</url-pattern>
@@ -37,6 +41,10 @@
<url-pattern>*.jpeg</url-pattern>
<url-pattern>*.jpg</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>feed</servlet-name>
+ <url-pattern>*.rss</url-pattern>
+ </servlet-mapping>
<mime-mapping>
<extension>htmi</extension>
<mime-type>text/html</mime-type>
--
Gitblit v1.9.3