X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=crawler%2Fkiss%2Fsrc%2Forg%2Fwamblee%2Fcrawler%2Fkiss%2Fmain%2FKissCrawler.java;h=5d7e85ca94868eb0a283b6e9739462bf3f06772a;hb=01c0abdc7d3339b36216665ff70c99ba3e50c180;hp=6cdaa17a55da35f9aec05a0794cb03c5e63441c5;hpb=8c5698be83dcb9542b3ae3efd4826020bcc56367;p=utils diff --git a/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java b/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java index 6cdaa17a..5d7e85ca 100644 --- a/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java +++ b/crawler/kiss/src/org/wamblee/crawler/kiss/main/KissCrawler.java @@ -16,7 +16,6 @@ package org.wamblee.crawler.kiss.main; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -25,26 +24,15 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.Properties; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.mail.MessagingException; -import javax.mail.Session; -import javax.mail.internet.InternetAddress; -import javax.xml.transform.TransformerException; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.commons.mail.EmailException; -import org.apache.commons.mail.HtmlEmail; -import org.apache.xml.serialize.OutputFormat; -import org.apache.xml.serialize.XMLSerializer; -import org.w3c.dom.Document; import org.wamblee.crawler.Action; import org.wamblee.crawler.Configuration; import org.wamblee.crawler.Crawler; @@ -60,8 +48,6 @@ import org.wamblee.crawler.kiss.guide.Time; import org.wamblee.crawler.kiss.guide.TimeInterval; import org.wamblee.crawler.kiss.notification.NotificationException; import org.wamblee.crawler.kiss.notification.Notifier; -import org.wamblee.io.FileResource; -import org.wamblee.xml.XSLT; /** * The KiSS crawler for automatic recording of interesting TV shows. @@ -183,7 +169,7 @@ public class KissCrawler { } executor.commit(); try { - aNotifier.send(executor.getXmlReport()); + aNotifier.send(executor.getReport()); } catch (NotificationException e) { throw new RuntimeException(e); } @@ -306,51 +292,4 @@ public class KissCrawler { } return new Channel(aChannel, programs); } - - /** - * Sends a summary mail to the user. - * - * @param aText - * Text of the mail. - * @throws MessagingException - * In case of problems sending mail. - */ - private void sendMail(ProgramActionExecutor aExecutor) throws MessagingException { - String textReport = aExecutor.getReport(); - System.out.println("Text report: \n" + textReport); - System.out.println("XML report:\n" + aExecutor.getXmlReport().asXML()); - - - Properties props = new Properties(); - props.put("mail.transport.protocol", "smtp"); - props.put("mail.smtp.host", "falcon"); - props.put("mail.smtp.port", "25"); - - Session mailSession = Session.getInstance(props); - InternetAddress from = new InternetAddress("erik@brakkee.org"); - - HtmlEmail mail = new HtmlEmail(); - mail.setMailSession(mailSession); - try { - mail.setFrom("erik@brakkee.org"); - mail.setTo(Arrays.asList(new InternetAddress[] { from })); - mail.setSentDate(new Date()); - mail.setSubject("KiSS Crawler Update"); - String html = aExecutor.getXmlReport().asXML(); - Document document = new XSLT().transform(html.getBytes(), new FileResource(new File("reportToHtml.xsl"))); - ByteArrayOutputStream xhtml = new ByteArrayOutputStream(); - XMLSerializer serializer = new XMLSerializer(xhtml, new OutputFormat()); - serializer.serialize(document); - mail.setHtmlMsg(xhtml.toString()); - mail.setTextMsg(textReport); - mail.send(); - } catch (EmailException e) { - throw new RuntimeException(e); - } catch (TransformerException e) { - throw new RuntimeException(e); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - }