X-Git-Url: https://wpitchoune.net/gitweb/?p=pnews.git;a=blobdiff_plain;f=war%2Fsrc%2Fmain%2Fjava%2Fpnews%2Fservlet%2FPnews.java;h=d15315e5491bc2ac4f25a8add53fd8ceade7cd5a;hp=f7175a101910345d85f7f4a911278ad824f0a104;hb=6225887c0f8a1c22754ac98941908f47281bb2d3;hpb=4fa446ebc4f1ffd2229cfb1eaf04432cf257e8ac

diff --git a/war/src/main/java/pnews/servlet/Pnews.java b/war/src/main/java/pnews/servlet/Pnews.java
index f7175a1..d15315e 100644
--- a/war/src/main/java/pnews/servlet/Pnews.java
+++ b/war/src/main/java/pnews/servlet/Pnews.java
@@ -1,8 +1,14 @@
 package pnews.servlet;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.io.Writer;
 import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -12,10 +18,17 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.rometools.rome.io.FeedException;
+
+import pnews.Article;
+import pnews.Category;
+import pnews.HTML;
+
 public class Pnews extends HttpServlet {
         private static final Logger LOG = Logger.getLogger(Pnews.class.getName());
         private static final long serialVersionUID = 1L;
-
+        private static final ArticleProvider provider = ArticleProvider.singleton;
+        
         private static String getQueryParameter(HttpServletRequest rq, String key)
                         throws UnsupportedEncodingException {
                 String[] params;
@@ -42,6 +55,8 @@ public class Pnews extends HttpServlet {
         private static void redirect(HttpServletRequest rq, HttpServletResponse rp) {
                 String redirectURL;
                 
+                LOG.entering(Pnews.class.getName(), "redirect");
+                
                 try {
                         redirectURL = getQueryParameter(rq, "url");
                                                
@@ -51,6 +66,7 @@ public class Pnews extends HttpServlet {
                                 rp.setHeader("Location", redirectURL);
                                 rp.setStatus(HttpServletResponse.SC_TEMPORARY_REDIRECT);
                         } else {
+                                LOG.severe("No redirection URL");
                                 rp.setStatus(HttpServletResponse.SC_NOT_FOUND);
                         }
 
@@ -59,11 +75,47 @@ public class Pnews extends HttpServlet {
                         LOG.log(Level.SEVERE, "redirect failure", e);
                         rp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
                 }                
+                
+                LOG.exiting(Pnews.class.getName(), "redirect");
+        }
+        
+        private void writeArticles(Category cat, HttpServletResponse rp) {
+                String html;
+                List<Article> articles;
+                
+                try {   
+                        articles = provider.getArticles(cat);
+                        if (articles != null) {
+                                html = HTML.toHTML(articles, cat);
+                                rp.setContentType("text/html");
+                                rp.getWriter().write(html);
+                        } else {
+                                LOG.severe("writeArticles cannot retrieve any articles");
+                                html = HTML.toHTML(new ArrayList<>(), cat);
+                                rp.setContentType("text/html");
+                                rp.getWriter().write(html);
+                        }
+                } catch (IOException | IllegalArgumentException | FeedException e) {
+                        LOG.log(Level.SEVERE, "writeArticles failure", e);
+                        rp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                }
+        }
+        
+        private void copy(InputStream in, Writer writer) throws IOException {
+                Reader r;
+                char[] buf;
+                int n;
+                
+                buf = new char[1024];
+                r = new InputStreamReader(in);
+                while ( (n = r.read(buf, 0, buf.length)) != -1)
+                        writer.write(buf, 0, n);                
         }
         
         @Override
-        protected void  doGet(HttpServletRequest req, HttpServletResponse resp) {
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
                 String path;
+                InputStream in;
                 
                 LOG.info("doGet " + req.getRequestURI());
 
@@ -71,14 +123,38 @@ public class Pnews extends HttpServlet {
                 
                 if (path.equals("/redirect")) {
                         redirect(req, resp);
-                } else {
+                        return ;
+                } 
+                
+                if (path.equals("/style.css")) {
                         try {
-                                resp.getWriter().write("Not found " + req.getPathInfo());
-                                resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                                in = HTML.class.getClassLoader().getResourceAsStream("style.css");
+                                copy(in, resp.getWriter());
+                                resp.setContentType("text/css");
+                                
+                                return ;
                         } catch (IOException e) {
                                 LOG.log(Level.SEVERE, "doGet failure", e);
+                                resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                                
+                                return ;
                         }
                 }
+                
+                for (Category cat: Category.values()) {
+                        if (path.equals('/' + cat.getId())) {
+                                writeArticles(cat, resp);
+                                return ;
+                        }
+                }
+                
+                try {
+                        resp.getWriter().write("Not found " + req.getPathInfo());
+                        resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+                } catch (IOException e) {
+                        LOG.log(Level.SEVERE, "doGet failure", e);
+                        resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                }
         }
         
         @Override