Browse Source

fix: Dédoublement des articles RSS

Martin Passard 7 years ago
parent
commit
a55060279a
2 changed files with 14 additions and 9 deletions
  1. 6 9
      src/rss/RSSChecker.java
  2. 8 0
      src/rss/RssData.java

+ 6 - 9
src/rss/RSSChecker.java

@@ -54,16 +54,12 @@ public class RSSChecker implements Runnable {
 		}
 	}
 
-	private void afficheArticle(Node article, String date) {
-		RssData rssdata = new RssData(article);
-		remainder.push(rssdata);
-		rssdata.setDate(date);
-		b.sendMessagesOnAllChannels(rssdata.toStringIRC());
-		
+	private void afficheArticle(RssData data) {
+		b.sendMessagesOnAllChannels(data.toStringIRC());
 	}
 
 	private void afficheArticle(Node article) {
-		afficheArticle(article, "");
+		afficheArticle(new RssData(article));
 	}
 
 	private void workOnEntry(NodeList nl) {
@@ -93,8 +89,9 @@ public class RSSChecker implements Runnable {
 								b.sendMessageOnAllChannels("Nouveautée sur planet.ffdn.org:");
 								
 							}
-							afficheArticle(article,Main.DATE_FORMAT_OUT.format(date));
-							remainder.push(new RssData(article));
+							RssData rs = new RssData(article, date);
+							remainder.push(rs);
+							afficheArticle(rs);
 							lastarticle = date;
 						}
 					} catch (DOMException | ParseException e) {

+ 8 - 0
src/rss/RssData.java

@@ -1,6 +1,7 @@
 package rss;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.w3c.dom.NamedNodeMap;
@@ -8,6 +9,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import main.AffichableSurIRC;
+import main.Main;
 
 public class RssData implements AffichableSurIRC{
 
@@ -24,6 +26,7 @@ public class RssData implements AffichableSurIRC{
 		this.lien = lien;
 	}
 	
+	
 	public RssData(Node item) {
 		this();
 		NodeList childs = item.getChildNodes();
@@ -50,6 +53,11 @@ public class RssData implements AffichableSurIRC{
 		}
 		}
 	}
+	
+	public RssData(Node item, Date date) {
+		this(item);
+		this.setDate(Main.DATE_FORMAT_OUT.format(date));
+	}
 
 
 	public RssData() {