# HG changeset patch # User František Kučera # Date 1318371085 -7200 # Node ID aae4b46887005532ca0a69a5288ec9790dcccbd9 # Parent beb11d70f0eb4c5896b756e3bdcaf25511824459 Drupal: zprávy jsou multipart/alternative – jak prostý text, tak XHTML. TODO: filtry prostého textu a XHTML zatím se do všech zpráv vkládá stejný vycpávkový text. diff -r beb11d70f0eb -r aae4b4688700 src/org/sonews/storage/DrupalArticle.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/sonews/storage/DrupalArticle.java Wed Oct 12 00:11:25 2011 +0200 @@ -0,0 +1,46 @@ +/* + * SONEWS News Server + * see AUTHORS for the list of contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.sonews.storage; + +import java.io.IOException; +import java.util.Enumeration; +import javax.mail.Header; +import javax.mail.MessagingException; +import javax.mail.internet.InternetHeaders; + +/** + * + * @author František Kučera (frantovo.cz) + */ +public class DrupalArticle extends Article { + + public DrupalArticle(DrupalMessage msg) throws MessagingException, IOException { + headers = new InternetHeaders(); + + /** In order to have all headers (like MIME type) */ + msg.saveChanges(); + + for (Enumeration e = msg.getAllHeaders(); e.hasMoreElements();) { + final Header header = (Header) e.nextElement(); + this.headers.addHeader(header.getName(), header.getValue()); + } + + setBody(msg.getBody()); + validateHeaders(); + } +} diff -r beb11d70f0eb -r aae4b4688700 src/org/sonews/storage/DrupalMessage.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/sonews/storage/DrupalMessage.java Wed Oct 12 00:11:25 2011 +0200 @@ -0,0 +1,193 @@ +/* + * SONEWS News Server + * see AUTHORS for the list of contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.sonews.storage; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Date; +import java.util.Enumeration; +import javax.mail.Header; +import javax.mail.MessagingException; +import javax.mail.Multipart; +import javax.mail.Session; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; + +/** + * This is MimeMessage which enables custom Message-ID header + * (this header will not be overwritten by the default one like in MimeMessage). + * + * Also add header and body separate serialization. + * + * And can be deserialized from SQL ResultSet + * + * @author František Kučera (frantovo.cz) + */ +public class DrupalMessage extends MimeMessage { + + private static final String MESSAGE_ID_HEADER = "Message-ID"; + private static final String CRLF = "\r\n"; + public static final String CHARSET = "UTF-8"; + private static final String XHTML_CONTENT_TYPE = "text/html; charset=" + CHARSET; + private String messageID; + + /** + * Constructs MIME message from SQL result. + * @param rs ResultSet containing message data. No {@link ResultSet#next()} will be called, just values from current row will be read. + * @param constructBody true if whole message should be constructed | false if we need only message headers (body will be dummy). + */ + public DrupalMessage(ResultSet rs, String myDomain, boolean constructBody) throws SQLException, UnsupportedEncodingException, MessagingException { + super(Session.getDefaultInstance(System.getProperties())); + + addHeader("Message-id", constructMessageId(rs.getInt("id"), rs.getInt("group_id"), rs.getString("group_name"), myDomain)); + addHeader("Newsgroups", rs.getString("group_name")); + setFrom(new InternetAddress("anonym@example.com", rs.getString("sender_name"))); + setSubject(rs.getString("subject")); + setSentDate(new Date(rs.getLong("created"))); + + Integer parentID = rs.getInt("parent_id"); + if (parentID != null && parentID > 0) { + String parentMessageID = constructMessageId(parentID, rs.getInt("group_id"), rs.getString("group_name"), myDomain); + addHeader("In-Reply-To", parentMessageID); + addHeader("References", parentMessageID); + } + + if (constructBody) { + Multipart multipart = new MimeMultipart("alternative"); + setContent(multipart); + + /** TODO: Plain text part */ + MimeBodyPart textPart = new MimeBodyPart(); + multipart.addBodyPart(textPart); + textPart.setText(readPlainText(rs)); + + /** TODO: XHTML part */ + MimeBodyPart htmlPart = new MimeBodyPart(); + multipart.addBodyPart(htmlPart); + htmlPart.setContent(readXhtmlText(rs), XHTML_CONTENT_TYPE); + } else { + setText(""); + } + } + + private String readPlainText(ResultSet rs) { + /** + * TODO: převést na prostý text + */ + return "TODO: obyčejný text"; + } + + private String readXhtmlText(ResultSet rs) { + /** + * TODO: převést na XHTML + */ + return "TODO: tady bude nějaký (X)HTML"; + } + + private static String constructMessageId(int articleID, int groupID, String groupName, String domainName) { + StringBuilder sb = new StringBuilder(); + sb.append("<"); + sb.append(articleID); + sb.append("-"); + sb.append(groupID); + sb.append("-"); + sb.append(groupName); + sb.append("@"); + sb.append(domainName); + sb.append(">"); + return sb.toString(); + } + + @Override + public void setHeader(String name, String value) throws MessagingException { + super.setHeader(name, value); + + if (MESSAGE_ID_HEADER.equalsIgnoreCase(name)) { + messageID = value; + } + } + + @Override + public final void addHeader(String name, String value) throws MessagingException { + super.addHeader(name, value); + + if (MESSAGE_ID_HEADER.equalsIgnoreCase(name)) { + messageID = value; + } + } + + @Override + public void removeHeader(String name) throws MessagingException { + super.removeHeader(name); + + if (MESSAGE_ID_HEADER.equalsIgnoreCase(name)) { + messageID = null; + } + } + + public void setMessageID(String messageID) { + this.messageID = messageID; + } + + @Override + protected void updateMessageID() throws MessagingException { + if (messageID == null) { + super.updateMessageID(); + } else { + setHeader(MESSAGE_ID_HEADER, messageID); + } + } + + /** + * Call {@link #saveChanges()} before this method, if you want all headers including such ones like: + * + * 
MIME-Version: 1.0
+	 *Content-Type: multipart/alternative;
+ * + * @return serialized headers + * @throws MessagingException if getAllHeaders() fails + */ + public String getHeaders() throws MessagingException { + StringBuilder sb = new StringBuilder(); + for (Enumeration eh = getAllHeaderLines(); eh.hasMoreElements();) { + sb.append(eh.nextElement()); + sb.append(CRLF); + } + return sb.toString(); + } + + public byte[] getBody() throws IOException, MessagingException { + saveChanges(); + + ArrayList skipHeaders = new ArrayList(); + for (Enumeration eh = getAllHeaders(); eh.hasMoreElements();) { + Header h = (Header) eh.nextElement(); + skipHeaders.add(h.getName()); + } + + ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); + writeTo(baos, skipHeaders.toArray(new String[skipHeaders.size()])); + return baos.toByteArray(); + } +} diff -r beb11d70f0eb -r aae4b4688700 src/org/sonews/storage/impl/DrupalDatabase.java --- a/src/org/sonews/storage/impl/DrupalDatabase.java Tue Oct 11 16:34:17 2011 +0200 +++ b/src/org/sonews/storage/impl/DrupalDatabase.java Wed Oct 12 00:11:25 2011 +0200 @@ -17,29 +17,26 @@ */ package org.sonews.storage.impl; -import java.io.UnsupportedEncodingException; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.sql.Statement; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; -import java.util.Date; import java.util.List; import java.util.Locale; import java.util.logging.Level; import java.util.logging.Logger; -import javax.mail.internet.MailDateFormat; -import javax.mail.internet.MimeUtility; -import org.apache.commons.codec.net.BCodec; +import javax.mail.Message; import org.apache.commons.codec.net.QuotedPrintableCodec; import org.sonews.config.Config; import org.sonews.feed.Subscription; import org.sonews.storage.Article; import org.sonews.storage.ArticleHead; +import org.sonews.storage.DrupalArticle; +import org.sonews.storage.DrupalMessage; import org.sonews.storage.Group; import org.sonews.storage.Storage; import org.sonews.storage.StorageBackendException; @@ -54,14 +51,11 @@ private static final Logger log = Logger.getLogger(DrupalDatabase.class.getName()); public static final String CHARSET = "UTF-8"; public static final String CRLF = "\r\n"; - public static final int MAX_RESTARTS = 2; - /** How many times the database connection was reinitialized */ - protected int restarts = 0; protected Connection conn = null; private QuotedPrintableCodec qpc = new QuotedPrintableCodec(CHARSET); private SimpleDateFormat RFC822_DATE = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z", Locale.US); // TODO: správná doména - private String myDomain = "kinderporno.cz"; + private String myDomain = "nntp.i1984.cz"; public DrupalDatabase() throws StorageBackendException { connectDatabase(); @@ -137,73 +131,12 @@ return null; } else { return Long.parseLong(localPart[1]); + // If needed: + // parseGroupName() will be same as this method, just with: + // return localPart[2]; } } - private static String parseGroupName(String messageID) { - String[] localPart = parseMessageID(messageID); - if (localPart == null) { - return null; - } else { - return localPart[2]; - } - } - - private static String constructMessageId(int articleID, int groupID, String groupName, String domainName) { - StringBuilder sb = new StringBuilder(); - sb.append("<"); - sb.append(articleID); - sb.append("-"); - sb.append(groupID); - sb.append("-"); - sb.append(groupName); - sb.append("@"); - sb.append(domainName); - sb.append(">"); - return sb.toString(); - } - - /** - * - * @param sb header list to be appended with new header. List must be terminated by line end. - * @param key header name (without : and space) - * @param value header value - * @param encode true if value should be encoded/escaped before appending - * @throws UnsupportedEncodingException - */ - private static void addHeader(StringBuilder sb, String key, String value, boolean encode) throws UnsupportedEncodingException { - sb.append(key); - sb.append(": "); - if (encode) { - sb.append(MimeUtility.encodeWord(value)); - } else { - sb.append(value); - } - sb.append(CRLF); - } - - private String constructHeaders(ResultSet rs) throws SQLException, UnsupportedEncodingException { - StringBuilder sb = new StringBuilder(); - - addHeader(sb, "Message-id", constructMessageId(rs.getInt("id"), rs.getInt("group_id"), rs.getString("group_name"), myDomain), false); - addHeader(sb, "From", MimeUtility.encodeWord(rs.getString("sender_name")) + " <>", false); - addHeader(sb, "Subject", rs.getString("subject"), true); - /** TODO: správný formát data: */ - addHeader(sb, "Date", RFC822_DATE.format(new Date(rs.getLong("created"))), false); - addHeader(sb, "Content-Type", "text/html; charset=" + CHARSET, false); - addHeader(sb, "Content-Transfer-Encoding", "quoted-printable", false); - //addHeader(sb, "Content-Transfer-Encoding", "base64", false); - - Integer parentID = rs.getInt("parent_id"); - if (parentID != null && parentID > 0) { - String parentMessageID = constructMessageId(parentID, rs.getInt("group_id"), rs.getString("group_name"), myDomain); - addHeader(sb, "In-Reply-To", parentMessageID, false); - addHeader(sb, "References", parentMessageID, false); - } - - return sb.toString(); - } - @Override public List getGroups() throws StorageBackendException { PreparedStatement ps = null; @@ -275,13 +208,8 @@ rs = ps.executeQuery(); if (rs.next()) { - String headers = constructHeaders(rs); - // TODO: fold? - BCodec bc = new BCodec(CHARSET); - byte[] body = qpc.encode(rs.getString("text")).getBytes(); - //byte[] body = bc.encode(rs.getString("text")).getBytes(); - - return new Article(headers, body); + DrupalMessage m = new DrupalMessage(rs, myDomain, true); + return new DrupalArticle(m); } else { return null; } @@ -297,7 +225,6 @@ PreparedStatement ps = null; ResultSet rs = null; try { - // TODO: je nutné řazení? ps = conn.prepareStatement("SELECT * FROM nntp_article WHERE group_id = ? AND id >= ? AND id <= ? ORDER BY id"); ps.setLong(1, group.getInternalID()); ps.setLong(2, first); @@ -307,7 +234,8 @@ List> heads = new ArrayList>(); while (rs.next()) { - String headers = constructHeaders(rs); + DrupalMessage m = new DrupalMessage(rs, myDomain, false); + String headers = m.getHeaders(); heads.add(new Pair(rs.getLong("id"), new ArticleHead(headers))); } @@ -320,13 +248,6 @@ } @Override - public List> getArticleHeaders(Group group, long start, long end, String header, String pattern) throws StorageBackendException { - log.log(Level.SEVERE, "TODO: getArticleHeaders {0} / {1} / {2} / {3} / {4}", new Object[]{group, start, end, header, pattern}); - /** TODO: */ - return Collections.emptyList(); - } - - @Override public long getArticleIndex(Article article, Group group) throws StorageBackendException { Long id = parseArticleID(article.getMessageID()); if (id == null) { @@ -416,24 +337,6 @@ } } - // - // --- zatím neimplementovat --- - // - @Override - public void addArticle(Article art) throws StorageBackendException { - log.log(Level.SEVERE, "TODO: addArticle {0}", new Object[]{art}); - } - - @Override - public void addEvent(long timestamp, int type, long groupID) throws StorageBackendException { - log.log(Level.SEVERE, "TODO: addEvent {0} / {1} / {2}", new Object[]{timestamp, type, groupID}); - } - - @Override - public void addGroup(String groupname, int flags) throws StorageBackendException { - log.log(Level.SEVERE, "TODO: addGroup {0} / {1}", new Object[]{groupname, flags}); - } - @Override public int countArticles() throws StorageBackendException { PreparedStatement ps = null; @@ -467,6 +370,45 @@ } @Override + public int getPostingsCount(String groupname) throws StorageBackendException { + PreparedStatement ps = null; + ResultSet rs = null; + try { + ps = conn.prepareStatement("SELECT count(*) FROM nntp_article WHERE group_name = ?"); + ps.setString(1, groupname); + rs = ps.executeQuery(); + rs.next(); + return rs.getInt(1); + } catch (Exception e) { + throw new StorageBackendException(e); + } finally { + close(null, ps, rs); + } + } + + @Override + public List> getArticleHeaders(Group group, long start, long end, String header, String pattern) throws StorageBackendException { + log.log(Level.SEVERE, "TODO: getArticleHeaders {0} / {1} / {2} / {3} / {4}", new Object[]{group, start, end, header, pattern}); + /** TODO: */ + return Collections.emptyList(); + } + + @Override + public void addArticle(Article art) throws StorageBackendException { + log.log(Level.SEVERE, "TODO: addArticle {0}", new Object[]{art}); + } + + @Override + public void addEvent(long timestamp, int type, long groupID) throws StorageBackendException { + log.log(Level.SEVERE, "TODO: addEvent {0} / {1} / {2}", new Object[]{timestamp, type, groupID}); + } + + @Override + public void addGroup(String groupname, int flags) throws StorageBackendException { + log.log(Level.SEVERE, "TODO: addGroup {0} / {1}", new Object[]{groupname, flags}); + } + + @Override public void delete(String messageID) throws StorageBackendException { log.log(Level.SEVERE, "TODO: delete {0}", new Object[]{messageID}); } @@ -478,6 +420,11 @@ } @Override + public void setConfigValue(String key, String value) throws StorageBackendException { + log.log(Level.SEVERE, "TODO: setConfigValue {0} = {1}", new Object[]{key, value}); + } + + @Override public int getEventsCount(int eventType, long startTimestamp, long endTimestamp, Group group) throws StorageBackendException { log.log(Level.SEVERE, "TODO: getEventsCount {0} / {1} / {2} / {3}", new Object[]{eventType, startTimestamp, endTimestamp, group}); return 0; @@ -508,23 +455,6 @@ } @Override - public int getPostingsCount(String groupname) throws StorageBackendException { - PreparedStatement ps = null; - ResultSet rs = null; - try { - ps = conn.prepareStatement("SELECT count(*) FROM nntp_article WHERE group_name = ?"); - ps.setString(1, groupname); - rs = ps.executeQuery(); - rs.next(); - return rs.getInt(1); - } catch (Exception e) { - throw new StorageBackendException(e); - } finally { - close(null, ps, rs); - } - } - - @Override public List getSubscriptions(int type) throws StorageBackendException { log.log(Level.SEVERE, "TODO: getSubscriptions {0}", new Object[]{type}); return Collections.emptyList(); @@ -536,11 +466,6 @@ } @Override - public void setConfigValue(String key, String value) throws StorageBackendException { - log.log(Level.SEVERE, "TODO: setConfigValue {0} = {1}", new Object[]{key, value}); - } - - @Override public boolean update(Article article) throws StorageBackendException { log.log(Level.SEVERE, "TODO: update {0}", new Object[]{article}); throw new StorageBackendException("Not implemented yet.");