- Nuiton-rss-commits - mailman.cloud.codelutin.com

[Lutinweb-commits] r73 - in trunk/lutinrss/src: main/java/org/codelutin/rss test/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 30, 2008

May 30, 2008

Author: tchemit Date: 2008-05-30 14:05:16 +0000 (Fri, 30 May 2008) New Revision: 73 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java Log: tests sur la creation des items Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java 2008-05-30 09:51:30 UTC (rev 72) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java 2008-05-30 14:05:16 UTC (rev 73) @@ -40,7 +40,7 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static final Log log = LogFactory.getLog(RSSGeneratorHelper.class); /** date formater use to save date in feed and entries */ - static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy"); + static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); /** shared jvm instance */ protected static RSSGeneratorHelper instance; /** dictonnary of field <-> property for feed */ @@ -77,16 +77,20 @@ /** * * @param url location where to create the file + * @param type fromat of feed to create * @param values properties of the feed + * @throws ParseException if pb while parsing date + * @throws IOException if io pb + * @throws FeedException if pb while creating feed */ public void createFeedFile(URL url, FeedType type, Map<Field, Object> values) throws IOException, FeedException, ParseException { - if (url==null) { + if (url == null) { throw new NullPointerException("can not create a feed with null url"); } - if (type==null) { + if (type == null) { throw new NullPointerException("can not create a feed with null feedtype"); } - if (values==null || values.isEmpty()) { + if (values == null || values.isEmpty()) { //TODO Should check mandatory values (title, link,...) throw new NullPointerException("can not create a feed with null nor empty values dictonnary"); } @@ -109,9 +113,8 @@ RSSIOUtil.saveFeed(f, feed); } finally { - releaseLock(f,lock); + releaseLock(f, lock); } - } /** @@ -120,12 +123,15 @@ * @param url location of feed to used * @param nbEntries number of maximum entries to be written in feed file * @param values dictionnary of properties to write + * @throws FeedException if feed pb + * @throws IOException if io pb + * @throws ParseException if dateparser pb */ - public void addItemToFeedFile(URL url, int nbEntries, Map<Field, Object> values) throws FileNotFoundException, IOException, IllegalArgumentException, FeedException, ParseException { - if (url==null) { + public void addItemToFeedFile(URL url, int nbEntries, Map<Field, Object> values) throws IOException, FeedException, ParseException { + if (url == null) { throw new NullPointerException("can not add a feed's entry with null url"); } - if (values==null || values.isEmpty()) { + if (values == null || values.isEmpty()) { //TODO Should check mandatory values (title, link,...) throw new NullPointerException("can not add a feed's entry with null nor empty values dictonnary"); } @@ -138,25 +144,21 @@ // block until can acquire lock FileLock lock = acquireLock(f); - // temporary file where to write feed - - File tmpFile = null; - try { - + // get feed and add the new item SyndFeed feed = addItemToFeed(url, nbEntries, values); // save feed into a tmp file + File tmpFile = new File(f.getAbsolutePath() + "-tmp_" + System.nanoTime()); - tmpFile = new File(f.getParentFile(), "tmp_" + f.getName() + "_" + System.nanoTime() + ".xml"); - RSSIOUtil.saveFeed(tmpFile, feed); - + + //TODO use a read file lock, to prevent read pb while renaming ? + // move tmpFile to real file tmpFile.renameTo(f); - } finally { - releaseLock(f,lock); + releaseLock(f, lock); } } @@ -173,10 +175,10 @@ continue; } Object value = entry.getValue(); - Object realValue = null; + Object realValue; switch (field) { case TIME: - realValue = DATE_PARSER.parse((String)value); + realValue = DATE_PARSER.parse((String) value); break; default: realValue = value; @@ -201,16 +203,17 @@ continue; } Object value = entry.getValue(); - Object realValue = null; + Object realValue; switch (field) { case TIME: realValue = DATE_PARSER.parse((String) value); break; case DESCRIPTION: + //TODO Deal with xml content ? SyndContent description = new SyndContentImpl(); description.setType("text/plain"); - description.setValue(String.valueOf(value)); - realValue = description; + feedEntry.setDescription(description); + realValue = String.valueOf(value); break; default: realValue = value; @@ -221,18 +224,23 @@ return feedEntry; } + @SuppressWarnings({"unchecked"}) protected SyndFeed addItemToFeed(URL url, int nbEntries, Map<Field, Object> values) throws IOException, IllegalArgumentException, FeedException, ParseException { SyndFeed feed = RSSIOUtil.readFeed(url); - List entries = feed.getEntries(); - // always sort by publication date - java.util.Collections.sort(entries, new FeedEntryComparator()); - // keep only nbEntries -1 entries - while (entries.size() > nbEntries - 1) { - entries.remove(0); + List<SyndEntry> entries = feed.getEntries(); + if (!entries.isEmpty()) { + // always sort by publication date + java.util.Collections.sort(entries, new FeedEntryComparator()); + // keep only nbEntries -1 entries + while (entries.size() > nbEntries - 1) { + entries.remove(0); + } } SyndEntry item = createFeedItem(values); entries.add(item); - + if (log.isDebugEnabled()) { + log.debug("new item " + item); + } return feed; } @@ -245,35 +253,35 @@ */ protected File getFile(URL url) throws IllegalStateException { try { - File f = new File(url.toURI()); - - return f; + return new File(url.toURI()); } catch (URISyntaxException e) { throw new IllegalStateException("could not obtain file from url " + url, e); } } - protected FileLock acquireLock(File f) throws IOException, FileNotFoundException { - File lockFile = new File(f.getParentFile(), f.getName() + ".lock"); - + protected FileLock acquireLock(File f) throws IOException { + File lockFile = getWriteFileLock(f); + /*if (!lockFile.exists()) lockFile.createNewFile(); */ // open file for writing only FileChannel channel = new RandomAccessFile(lockFile, "rw").getChannel(); // block until can acquire lock - FileLock lock = channel.lock(); - // temporary file where to write feed - return lock; + return channel.lock(); } - protected void releaseLock(File f,FileLock lock) throws IOException { + protected File getWriteFileLock(File f) { + return new File(f.getParentFile(), f.getName() + ".wlock"); + } + + protected void releaseLock(File f, FileLock lock) throws IOException { // release lock lock.release(); // close channel lock.channel().close(); // delete file lock - File lockFile = new File(f.getParentFile(), f.getName() + ".lock"); + File lockFile = getWriteFileLock(f); lockFile.delete(); } Modified: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-05-30 09:51:30 UTC (rev 72) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-05-30 14:05:16 UTC (rev 73) @@ -2,11 +2,14 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ - package org.codelutin.rss; +import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; import java.io.File; +import java.net.MalformedURLException; +import java.text.ParseException; +import java.util.List; import java.util.Map; import junit.framework.TestCase; @@ -16,56 +19,172 @@ */ public class RSSGeneratorHelperTest extends TestCase { - RSSGeneratorHelper helper; + RSSGeneratorHelper helper; + static File f; - - @Override - protected void setUp() throws Exception { - super.setUp(); - helper = RSSGeneratorHelper.getInstance(); - } + public void testCreateFeed() throws Exception { - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - - public void testCreateFeed() throws Exception { - File f = getFeedFile(); - - try{ - Map<Field, Object> values = new java.util.HashMap<Field,Object>(); - values.put(Field.NAME, "feedName : "+f.getName()); - values.put(Field.DESCRIPTION, "feedDescription : "+f.getName()); - values.put(Field.LINK, f.toURI().toURL()); - values.put(Field.TIME,RSSGeneratorHelper.DATE_PARSER.format(new java.util.Date())); - + Map<Field, Object> values = new java.util.HashMap<Field, Object>(); + values.put(Field.NAME, "feedName : " + f.getName()); + values.put(Field.DESCRIPTION, "feedDescription : " + f.getName()); + values.put(Field.LINK, f.toURI().toURL() + ""); + values.put(Field.TIME, RSSGeneratorHelper.DATE_PARSER.format(new java.util.Date())); + assertFalse(f.exists()); - RSSGeneratorHelper.log.info("feedFile : "+f); - helper.createFeedFile(f.toURI().toURL(), FeedType.RSS_1_0, values); - // lock is delete - assertFalse(new File(f.getAbsolutePath()+".lock").exists()); + RSSGeneratorHelper.log.info("feedFile : " + f); + helper.createFeedFile(f.toURI().toURL(), RSSConfig.DEFAULT_GENERATOR_FORMAT, values); + // no lock + assertFalse(new File(f.getAbsolutePath() + ".lock").exists()); // file exist assertTrue(f.exists()); - //TODO test feed + SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); - RSSGeneratorHelper.log.info(feed); + + if (RSSGeneratorHelper.log.isDebugEnabled()) { + RSSGeneratorHelper.log.debug(feed); + } + + assertEquals(feed.getFeedType(), RSSConfig.DEFAULT_GENERATOR_FORMAT.getType()); + assertEquals(feed.getLink(), values.get(Field.LINK)); assertEquals(feed.getTitle(), values.get(Field.NAME)); assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); - assertEquals(feed.getPublishedDate(), RSSGeneratorHelper.DATE_PARSER.parse((String)values.get(Field.TIME))); + assertEquals(feed.getPublishedDate(), RSSGeneratorHelper.DATE_PARSER.parse((String) values.get(Field.TIME))); + + } + + public void testCreateFeedAlreadyExisting() throws Exception { + + Map<Field, Object> values = new java.util.HashMap<Field, Object>(); + values.put(Field.NAME, "feedName : " + f.getName()); + values.put(Field.DESCRIPTION, "feedDescription : " + f.getName()); + values.put(Field.LINK, f.toURI().toURL() + ""); + values.put(Field.TIME, RSSGeneratorHelper.DATE_PARSER.format(new java.util.Date())); + + assertTrue(f.exists()); + + try { + helper.createFeedFile(f.toURI().toURL(), FeedType.RSS_1_0, values); + // file already exist, can not reach this code + fail(); + } catch (IllegalStateException e) { + assertTrue(true); + } + // no write lock + assertFalse(helper.getWriteFileLock(f).exists()); + + } + + public void testAddFeedEntry() throws Exception { + assertTrue(f.exists()); + Map<Field, Object> values = createEntry(0); + + helper.addItemToFeedFile(f.toURI().toURL(), 2, values); + + SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + List entries = feed.getEntries(); + assertEquals(1, entries.size()); + + if (RSSGeneratorHelper.log.isDebugEnabled()) { + RSSGeneratorHelper.log.debug(feed); + } + + SyndEntry entry = (SyndEntry) entries.get(0); + + assertEntry(entry, values); + } + + public void testAddFeedEntryToMax() throws Exception { + + assertTrue(f.exists()); + SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + List entries = feed.getEntries(); + assertEquals(1, entries.size()); + SyndEntry firsEntry = (SyndEntry) entries.get(0); + + Map<Field, Object> values; + + int nbMaxEntries = 10; + + for (int i = 1; i < nbMaxEntries; i++) { + values = createEntry(i); + helper.addItemToFeedFile(f.toURI().toURL(), nbMaxEntries, values); + feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + entries = feed.getEntries(); + assertEquals(i + 1, entries.size()); + + SyndEntry entry = (SyndEntry) entries.get(i); + + assertEntry(entry, values); + } + + // feed file contains max items + + values = createEntry(nbMaxEntries); + + helper.addItemToFeedFile(f.toURI().toURL(), nbMaxEntries, values); + + feed = RSSIOUtil.readFeed(f.toURI().toURL()); + + entries = feed.getEntries(); + + assertEquals(nbMaxEntries, entries.size()); + + SyndEntry entry = (SyndEntry) entries.get(nbMaxEntries - 1); + + assertEntry(entry, values); + + // check orginal first entry is no more present + entry = (SyndEntry) entries.get(0); + assertFalse(firsEntry.getTitle().equals(entry.getTitle())); + } + + public void testCleanFile() throws Exception { + try { + assertNotNull(f); + assertTrue(f.exists()); + // lock is delete + assertFalse(helper.getWriteFileLock(f).exists()); } finally { - f.deleteOnExit(); + if (f != null) { + f.deleteOnExit(); + } } - } - - public void testAddFeed() throws Exception { - + + protected void assertEntry(SyndEntry entry, Map<Field, Object> values) throws ParseException { + assertEquals(entry.getLink(), values.get(Field.LINK)); + assertEquals(entry.getTitle(), values.get(Field.NAME)); + assertEquals(entry.getDescription().getValue(), values.get(Field.DESCRIPTION)); + assertEquals(entry.getPublishedDate(), RSSGeneratorHelper.DATE_PARSER.parse((String) values.get(Field.TIME))); } protected File getFeedFile() { - File feedFile = new File("/tmp/" + getClass().getSimpleName() + "-" + System.nanoTime() + ".xml"); - return feedFile; + return new File("/tmp/" + getClass().getSimpleName() + "-" + System.nanoTime() + ".xml"); } + protected Map<Field, Object> createEntry(int number) throws MalformedURLException { + Map<Field, Object> values = new java.util.HashMap<Field, Object>(); + values.put(Field.NAME, "entryName : " + f.getName() + "-" + number); + values.put(Field.DESCRIPTION, "entryDescription : " + f.getName() + "-" + number); + values.put(Field.LINK, f.toURI().toURL() + "/entry-" + number); + values.put(Field.TIME, RSSGeneratorHelper.DATE_PARSER.format(new java.util.Date())); + return values; + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + helper = RSSGeneratorHelper.getInstance(); + if (f == null) { + f = getFeedFile(); + } + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } }

1 0

[Lutinweb-commits] r72 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 30, 2008

May 30, 2008

Author: tchemit Date: 2008-05-30 09:51:30 +0000 (Fri, 30 May 2008) New Revision: 72 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java Log: test de coherence des param?\195?\168tres pass?\195?\169s (null,...) Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-05-29 21:42:11 UTC (rev 71) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-05-30 09:51:30 UTC (rev 72) @@ -22,6 +22,8 @@ public static int DEFAULT_GENERATOR_NB_ITEM = 100; + public static FeedType DEFAULT_GENERATOR_FORMAT = FeedType.RSS_2_0; + public static Class<? extends FeedRenderer> DEFAULT_RENDERER_CLASS = FeedHTMLRenderer.class; public static Class<? extends FeedURLResolver> DEFAULT_RESOLVER_CLASS = SimpleFeedURLResolver.class; @@ -49,6 +51,11 @@ public static void setDEFAULT_GENERATOR_NB_ITEM(int DEFAULT_GENERATOR_NB_ITEM) { RSSConfig.DEFAULT_GENERATOR_NB_ITEM = DEFAULT_GENERATOR_NB_ITEM; } + + public static void setDEFAULT_GENERATOR_FORMAT(FeedType DEFAULT_GENERATOR_FORMAT) { + RSSConfig.DEFAULT_GENERATOR_FORMAT = DEFAULT_GENERATOR_FORMAT; + } + /** * * @param T la classe sources de la configuration @@ -77,6 +84,7 @@ loadConfig(config, instance, prefixConfig, "DEFAULT_RENDERER_CLASS"); loadConfig(config, instance, prefixConfig, "DEFAULT_RESOLVER_CLASS"); loadConfig(config, instance, prefixConfig, "DEFAULT_GENERATOR_NB_ITEM"); + loadConfig(config, instance, prefixConfig, "DEFAULT_GENERATOR_FORMAT"); } protected void loadConfig(T config, RSSConfig instance, String prefix, String configName) { Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java 2008-05-29 21:42:11 UTC (rev 71) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java 2008-05-30 09:51:30 UTC (rev 72) @@ -80,6 +80,16 @@ * @param values properties of the feed */ public void createFeedFile(URL url, FeedType type, Map<Field, Object> values) throws IOException, FeedException, ParseException { + if (url==null) { + throw new NullPointerException("can not create a feed with null url"); + } + if (type==null) { + throw new NullPointerException("can not create a feed with null feedtype"); + } + if (values==null || values.isEmpty()) { + //TODO Should check mandatory values (title, link,...) + throw new NullPointerException("can not create a feed with null nor empty values dictonnary"); + } File f = getFile(url); if (f.exists()) { @@ -112,7 +122,13 @@ * @param values dictionnary of properties to write */ public void addItemToFeedFile(URL url, int nbEntries, Map<Field, Object> values) throws FileNotFoundException, IOException, IllegalArgumentException, FeedException, ParseException { - + if (url==null) { + throw new NullPointerException("can not add a feed's entry with null url"); + } + if (values==null || values.isEmpty()) { + //TODO Should check mandatory values (title, link,...) + throw new NullPointerException("can not add a feed's entry with null nor empty values dictonnary"); + } File f = getFile(url); if (!f.exists()) {

1 0

[Lutinweb-commits] r71 - in trunk/lutinrss/src: main/java/org/codelutin/rss test/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 29, 2008

May 29, 2008

Author: tchemit Date: 2008-05-29 21:42:11 +0000 (Thu, 29 May 2008) New Revision: 71 Added: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java Log: introduction class RSSGeneratorHelper pour g?\195?\169n?\195?\169rer des fedd dans un fichier TODO faire les tests sur l'ajout d'entr?\195?\169es dans les feeds Added: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java (rev 0) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSGeneratorHelper.java 2008-05-29 21:42:11 UTC (rev 71) @@ -0,0 +1,276 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.codelutin.rss; + +import com.sun.syndication.feed.synd.SyndContent; +import com.sun.syndication.feed.synd.SyndContentImpl; +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndEntryImpl; +import com.sun.syndication.feed.synd.SyndFeed; +import com.sun.syndication.feed.synd.SyndFeedImpl; +import com.sun.syndication.io.FeedException; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.channels.FileChannel; +import java.nio.channels.FileLock; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * helper class to write rss feeds in a file + * @author tony + */ +public class RSSGeneratorHelper { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static final Log log = LogFactory.getLog(RSSGeneratorHelper.class); + /** date formater use to save date in feed and entries */ + static final DateFormat DATE_PARSER = new SimpleDateFormat("dd/MM/yyyy"); + /** shared jvm instance */ + protected static RSSGeneratorHelper instance; + /** dictonnary of field <-> property for feed */ + protected final EnumMap<Field, String> feedProperties; + /** dictonnary of field <-> property for entry */ + protected final EnumMap<Field, String> itemProperties; + + public static RSSGeneratorHelper getInstance() { + if (instance == null) { + instance = new RSSGeneratorHelper(); + } + return instance; + } + + protected RSSGeneratorHelper() { + itemProperties = new EnumMap<Field, String>(Field.class); + feedProperties = new EnumMap<Field, String>(Field.class); + feedProperties.put(Field.NAME, "title"); + feedProperties.put(Field.LINK, "link"); + // cela engendre des NPE... + feedProperties.put(Field.IMAGE, "image.url"); + feedProperties.put(Field.DESCRIPTION, "description"); + feedProperties.put(Field.AUTHOR, "author"); + feedProperties.put(Field.TIME, "publishedDate"); + + itemProperties.put(Field.NAME, "title"); + itemProperties.put(Field.LINK, "link"); + itemProperties.put(Field.IMAGE, null); + itemProperties.put(Field.DESCRIPTION, "description.value"); + itemProperties.put(Field.AUTHOR, "author"); + itemProperties.put(Field.TIME, "publishedDate"); + } + + /** + * + * @param url location where to create the file + * @param values properties of the feed + */ + public void createFeedFile(URL url, FeedType type, Map<Field, Object> values) throws IOException, FeedException, ParseException { + File f = getFile(url); + + if (f.exists()) { + throw new IllegalStateException("file already existing in " + url); + } + + // make sure parent exists + f.getParentFile().mkdirs(); + + // block until can acquire lock + FileLock lock = acquireLock(f); + + try { + + SyndFeed feed = createFeed(type, values); + + RSSIOUtil.saveFeed(f, feed); + + } finally { + releaseLock(f,lock); + } + + } + + /** + * Add a item to an existing feed file. + * + * @param url location of feed to used + * @param nbEntries number of maximum entries to be written in feed file + * @param values dictionnary of properties to write + */ + public void addItemToFeedFile(URL url, int nbEntries, Map<Field, Object> values) throws FileNotFoundException, IOException, IllegalArgumentException, FeedException, ParseException { + + File f = getFile(url); + + if (!f.exists()) { + throw new FileNotFoundException("file not existing " + f); + } + + // block until can acquire lock + FileLock lock = acquireLock(f); + + // temporary file where to write feed + + File tmpFile = null; + + try { + + SyndFeed feed = addItemToFeed(url, nbEntries, values); + + // save feed into a tmp file + + tmpFile = new File(f.getParentFile(), "tmp_" + f.getName() + "_" + System.nanoTime() + ".xml"); + + RSSIOUtil.saveFeed(tmpFile, feed); + + // move tmpFile to real file + tmpFile.renameTo(f); + + } finally { + releaseLock(f,lock); + } + } + + protected SyndFeed createFeed(FeedType type, Map<Field, Object> values) throws ParseException { + SyndFeed feed = new SyndFeedImpl(); + feed.setFeedType(type.getType()); + feed.setEncoding("utf-8"); + for (Entry<Field, Object> entry : values.entrySet()) { + Field field = entry.getKey(); + String name = feedProperties.get(field); + if (name == null) { + // this field is not managed + log.warn("the field " + field + " is not managed in feed"); + continue; + } + Object value = entry.getValue(); + Object realValue = null; + switch (field) { + case TIME: + realValue = DATE_PARSER.parse((String)value); + break; + default: + realValue = value; + } + + setFieldValue(feed, name, realValue); + } + + return feed; + } + + protected SyndEntry createFeedItem(Map<Field, Object> values) throws ParseException { + + SyndEntry feedEntry = new SyndEntryImpl(); + + for (Entry<Field, Object> entry : values.entrySet()) { + Field field = entry.getKey(); + String name = itemProperties.get(field); + if (name == null) { + // this field is not managed + log.warn("the field " + field + " is not managed in item"); + continue; + } + Object value = entry.getValue(); + Object realValue = null; + switch (field) { + case TIME: + realValue = DATE_PARSER.parse((String) value); + break; + case DESCRIPTION: + SyndContent description = new SyndContentImpl(); + description.setType("text/plain"); + description.setValue(String.valueOf(value)); + realValue = description; + break; + default: + realValue = value; + } + setFieldValue(feedEntry, name, realValue); + } + + return feedEntry; + } + + protected SyndFeed addItemToFeed(URL url, int nbEntries, Map<Field, Object> values) throws IOException, IllegalArgumentException, FeedException, ParseException { + SyndFeed feed = RSSIOUtil.readFeed(url); + List entries = feed.getEntries(); + // always sort by publication date + java.util.Collections.sort(entries, new FeedEntryComparator()); + // keep only nbEntries -1 entries + while (entries.size() > nbEntries - 1) { + entries.remove(0); + } + SyndEntry item = createFeedItem(values); + entries.add(item); + + return feed; + } + + /** + * Obtain the file from his url location. + * + * @param url location of the file + * @return the file + * @throws java.lang.IllegalStateException if uri is not sytax valid + */ + protected File getFile(URL url) throws IllegalStateException { + try { + File f = new File(url.toURI()); + + return f; + } catch (URISyntaxException e) { + throw new IllegalStateException("could not obtain file from url " + url, e); + } + } + + protected FileLock acquireLock(File f) throws IOException, FileNotFoundException { + File lockFile = new File(f.getParentFile(), f.getName() + ".lock"); + + /*if (!lockFile.exists()) lockFile.createNewFile(); */ + // open file for writing only + FileChannel channel = new RandomAccessFile(lockFile, "rw").getChannel(); + + // block until can acquire lock + FileLock lock = channel.lock(); + + // temporary file where to write feed + return lock; + } + + protected void releaseLock(File f,FileLock lock) throws IOException { + // release lock + lock.release(); + // close channel + lock.channel().close(); + // delete file lock + File lockFile = new File(f.getParentFile(), f.getName() + ".lock"); + lockFile.delete(); + } + + protected void setFieldValue(Object dst, String name, Object value) { + if (value == null) { + // null value is not managed + log.warn("null value for field " + name + " is not managed"); + return; + } + try { + BeanUtils.setProperty(dst, name, value); + } catch (Exception ex) { + log.warn("could not access property " + name, ex); + } + } +} Added: trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java (rev 0) +++ trunk/lutinrss/src/test/java/org/codelutin/rss/RSSGeneratorHelperTest.java 2008-05-29 21:42:11 UTC (rev 71) @@ -0,0 +1,71 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package org.codelutin.rss; + +import com.sun.syndication.feed.synd.SyndFeed; +import java.io.File; +import java.util.Map; +import junit.framework.TestCase; + +/** + * + * @author tony + */ +public class RSSGeneratorHelperTest extends TestCase { + + RSSGeneratorHelper helper; + + + @Override + protected void setUp() throws Exception { + super.setUp(); + helper = RSSGeneratorHelper.getInstance(); + } + + @Override + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testCreateFeed() throws Exception { + File f = getFeedFile(); + + try{ + Map<Field, Object> values = new java.util.HashMap<Field,Object>(); + values.put(Field.NAME, "feedName : "+f.getName()); + values.put(Field.DESCRIPTION, "feedDescription : "+f.getName()); + values.put(Field.LINK, f.toURI().toURL()); + values.put(Field.TIME,RSSGeneratorHelper.DATE_PARSER.format(new java.util.Date())); + + assertFalse(f.exists()); + RSSGeneratorHelper.log.info("feedFile : "+f); + helper.createFeedFile(f.toURI().toURL(), FeedType.RSS_1_0, values); + // lock is delete + assertFalse(new File(f.getAbsolutePath()+".lock").exists()); + // file exist + assertTrue(f.exists()); + //TODO test feed + SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); + RSSGeneratorHelper.log.info(feed); + assertEquals(feed.getTitle(), values.get(Field.NAME)); + assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); + assertEquals(feed.getPublishedDate(), RSSGeneratorHelper.DATE_PARSER.parse((String)values.get(Field.TIME))); + } finally { + f.deleteOnExit(); + } + + } + + public void testAddFeed() throws Exception { + + } + + protected File getFeedFile() { + File feedFile = new File("/tmp/" + getClass().getSimpleName() + "-" + System.nanoTime() + ".xml"); + return feedFile; + } + +}

1 0

[Lutinweb-commits] r70 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 29, 2008

May 29, 2008

Author: tchemit Date: 2008-05-29 21:40:47 +0000 (Thu, 29 May 2008) New Revision: 70 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedType.java Log: add atom types Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedType.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedType.java 2008-05-29 20:51:03 UTC (rev 69) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedType.java 2008-05-29 21:40:47 UTC (rev 70) @@ -18,7 +18,9 @@ RSS_0_92("rss_0.92"), RSS_0_93("rss_0.93"), RSS_1_0("rss_1.0"), - RSS_2_0("rss_2.0"); + RSS_2_0("rss_2.0"), + ATOM_0_3("atom_0.3"), + ATOM_1_0("atom_1.0"); private String type; public String getType() {

1 0

[Lutinweb-commits] r69 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 29, 2008

May 29, 2008

Author: tchemit Date: 2008-05-29 20:51:03 +0000 (Thu, 29 May 2008) New Revision: 69 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java Log: ajout propriete DEFAULT_GENERATOR_NB_ITEM pour le nombre d'items maximum par defaut dans un feed genere Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-05-29 20:49:51 UTC (rev 68) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSConfig.java 2008-05-29 20:51:03 UTC (rev 69) @@ -20,6 +20,8 @@ public static int DEFAULT_NB_ITEM = 7; + public static int DEFAULT_GENERATOR_NB_ITEM = 100; + public static Class<? extends FeedRenderer> DEFAULT_RENDERER_CLASS = FeedHTMLRenderer.class; public static Class<? extends FeedURLResolver> DEFAULT_RESOLVER_CLASS = SimpleFeedURLResolver.class; @@ -44,6 +46,9 @@ RSSConfig.DEFAULT_RESOLVER_CLASS = DEFAULT_RESOLVER_CLASS; } + public static void setDEFAULT_GENERATOR_NB_ITEM(int DEFAULT_GENERATOR_NB_ITEM) { + RSSConfig.DEFAULT_GENERATOR_NB_ITEM = DEFAULT_GENERATOR_NB_ITEM; + } /** * * @param T la classe sources de la configuration @@ -71,6 +76,7 @@ loadConfig(config, instance, prefixConfig, "DEFAULT_NB_ITEM"); loadConfig(config, instance, prefixConfig, "DEFAULT_RENDERER_CLASS"); loadConfig(config, instance, prefixConfig, "DEFAULT_RESOLVER_CLASS"); + loadConfig(config, instance, prefixConfig, "DEFAULT_GENERATOR_NB_ITEM"); } protected void loadConfig(T config, RSSConfig instance, String prefix, String configName) {

1 0

[Lutinweb-commits] r68 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 29, 2008

May 29, 2008

Author: tchemit Date: 2008-05-29 20:49:51 +0000 (Thu, 29 May 2008) New Revision: 68 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java Log: utilisation RSSIOUtil Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-05-29 20:48:41 UTC (rev 67) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedData.java 2008-05-29 20:49:51 UTC (rev 68) @@ -1,9 +1,6 @@ package org.codelutin.rss; - import com.sun.syndication.feed.synd.SyndFeed; -import com.sun.syndication.io.SyndFeedInput; -import com.sun.syndication.io.XmlReader; import java.net.URL; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,7 +37,7 @@ public FeedData(URL url, int nbItem, String representation) { this(url); - this.nbItem = nbItem; + this.nbItem = nbItem; this.rendererConfig = new FeedRendererConfig(representation); } @@ -71,7 +68,7 @@ public void setNbItem(int nbItem) { this.nbItem = nbItem; } - + /** * Retourne la representation HTML du RSS * @@ -81,15 +78,14 @@ if (feed == null || lastRetrived + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) { forceRetrived(); } - + return feed; } - + synchronized protected void forceRetrived() { if (lastRetrived + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) { try { - SyndFeedInput input = new SyndFeedInput(); - feed = input.build(new XmlReader(url)); + feed = RSSIOUtil.readFeed(url); lastRetrived = System.currentTimeMillis(); } catch (Exception eee) { log.warn("Can't get feed: " + url, eee);

1 0

[Lutinweb-commits] r67 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 29, 2008

May 29, 2008

Author: tchemit Date: 2008-05-29 20:48:41 +0000 (Thu, 29 May 2008) New Revision: 67 Added: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedEntryComparator.java Log: introduction comparator sur FeddEntry base sur la date de publication (utilise lors de la generation de feed) Added: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedEntryComparator.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedEntryComparator.java (rev 0) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedEntryComparator.java 2008-05-29 20:48:41 UTC (rev 67) @@ -0,0 +1,20 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.codelutin.rss; + +import com.sun.syndication.feed.synd.SyndEntry; +import java.util.Comparator; + +/** + * Comparator of entry base on his publication date + * @author tony + */ +public class FeedEntryComparator implements Comparator<SyndEntry> { + + public int compare(SyndEntry o1, SyndEntry o2) { + return o1.getPublishedDate().compareTo(o2.getPublishedDate()); + } + +}

1 0

[Lutinweb-commits] r66 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 29, 2008

May 29, 2008

Author: tchemit Date: 2008-05-29 20:47:38 +0000 (Thu, 29 May 2008) New Revision: 66 Added: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java Log: introduction classe utilitaire pour la construction et la sauvegarde de feed Added: trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java (rev 0) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/RSSIOUtil.java 2008-05-29 20:47:38 UTC (rev 66) @@ -0,0 +1,58 @@ +package org.codelutin.rss; + +import com.sun.syndication.feed.synd.SyndFeed; +import com.sun.syndication.io.FeedException; +import com.sun.syndication.io.SyndFeedInput; +import com.sun.syndication.io.SyndFeedOutput; +import com.sun.syndication.io.XmlReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.net.URL; + +/** + * helper to read or save a feed + * @author tony + */ +public class RSSIOUtil { + + /** + * Load a feed from his url + * @param url location of feed + * @return the java pojo feed + * @throws java.lang.IllegalArgumentException + * @throws com.sun.syndication.io.FeedException + * @throws java.io.IOException + */ + public static SyndFeed readFeed(URL url) throws IllegalArgumentException, FeedException, IOException { + SyndFeedInput input = new SyndFeedInput(); + SyndFeed feed = input.build(new XmlReader(url)); + return feed; + } + + /** + * save a feed into a file. + * @param f + * @param feed + * @throws java.io.IOException + * @throws com.sun.syndication.io.FeedException + */ + public static void saveFeed(File f, SyndFeed feed) throws IOException, FeedException { + + Writer writer = new BufferedWriter(new FileWriter(f)); + try { + SyndFeedOutput output = new SyndFeedOutput(); + output.output(feed, writer); + } finally { + if (writer != null) { + writer.close(); + } + } + } + + protected RSSIOUtil() { + // no instance + } +}

1 0

[Lutinweb-commits] r65 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 29, 2008

May 29, 2008

Author: tchemit Date: 2008-05-29 20:46:26 +0000 (Thu, 29 May 2008) New Revision: 65 Added: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedType.java Log: ajout enum?\195?\169ration pour d?\195?\169finir l'ensemble des format supportees pour la generation de feed Added: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedType.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedType.java (rev 0) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedType.java 2008-05-29 20:46:26 UTC (rev 65) @@ -0,0 +1,31 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.codelutin.rss; + +/** + * Enumeration of known feed's type. + * + * Used to generate some feed files. + * + * @author tony + */ +public enum FeedType { + + RSS_0_90("rss_0.90"), + RSS_0_91("rss_0.91"), + RSS_0_92("rss_0.92"), + RSS_0_93("rss_0.93"), + RSS_1_0("rss_1.0"), + RSS_2_0("rss_2.0"); + private String type; + + public String getType() { + return type; + } + + private FeedType(String type) { + this.type = type; + } +}

1 0

[Lutinweb-commits] r64 - trunk/lutinrss/src/main/java/org/codelutin/rss
by tchemit＠users.labs.libre-entreprise.org May 29, 2008

May 29, 2008

Author: tchemit Date: 2008-05-29 20:28:25 +0000 (Thu, 29 May 2008) New Revision: 64 Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedRendererConfig.java Log: remove comment code Modified: trunk/lutinrss/src/main/java/org/codelutin/rss/FeedRendererConfig.java =================================================================== --- trunk/lutinrss/src/main/java/org/codelutin/rss/FeedRendererConfig.java 2008-05-28 23:14:21 UTC (rev 63) +++ trunk/lutinrss/src/main/java/org/codelutin/rss/FeedRendererConfig.java 2008-05-29 20:28:25 UTC (rev 64) @@ -48,23 +48,6 @@ if (field!=null) { result.add(field); } - /*switch (c) { - case 'n': - result.add(Field.NAME); - break; - case 'i': - result.add(Field.IMAGE); - break; - case 'd': - result.add(Field.DESCRIPTION); - break; - case 'a': - result.add(Field.AUTHOR); - break; - case 't': - result.add(Field.TIME); - break; - }*/ } return result; }

1 0