X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Fsupport%2FReddit.java;h=599bb91f3b66283ff4cc11c9104787d52f359115;hb=bce031dcb08744ec8812249435dc6c8879229308;hp=6ae1a6c0ed611b1ec24d7816fcc00525b13f7bc8;hpb=b19b36322d5453c1b01761dd76190a67465e0d53;p=gofetch.git
diff --git a/src/be/nikiroo/gofetch/support/Reddit.java b/src/be/nikiroo/gofetch/support/Reddit.java
index 6ae1a6c..599bb91 100644
--- a/src/be/nikiroo/gofetch/support/Reddit.java
+++ b/src/be/nikiroo/gofetch/support/Reddit.java
@@ -1,26 +1,24 @@
package be.nikiroo.gofetch.support;
-import be.nikiroo.gofetch.data.Story;
-import be.nikiroo.gofetch.data.Comment;
-
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.net.URL;
-import java.net.URLDecoder;
+import java.text.SimpleDateFormat;
import java.util.AbstractMap;
import java.util.ArrayList;
-import java.util.List;
+import java.util.Date;
+import java.util.HashMap;
import java.util.LinkedList;
-import java.util.Map.Entry;
+import java.util.List;
import java.util.Map;
-import java.util.HashMap;
-import java.util.Date;
+import java.util.Map.Entry;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
-import org.jsoup.nodes.Node;
import org.jsoup.select.Elements;
+import be.nikiroo.gofetch.data.Comment;
+import be.nikiroo.gofetch.data.Story;
+
/**
* Support https://www.reddit.com/.
*
@@ -36,55 +34,78 @@ public class Reddit extends BasicSupport {
protected List> getUrls() throws IOException {
List> urls = new ArrayList>();
String base = "https://www.reddit.com/r/";
- urls.add(new AbstractMap.SimpleEntry(
- new URL(base + "linux_gaming" + "/new/"), "linux_gaming"
- ));
+ urls.add(new AbstractMap.SimpleEntry(new URL(base
+ + "linux_gaming" + "/new/"), "linux_gaming"));
return urls;
}
@Override
protected List getArticles(Document doc) {
- return doc.getElementsByClass("thing");
+ List list = doc.getElementsByClass("thing");
+ if (list.isEmpty()) {
+ list = doc.getElementsByClass("Post");
+ }
+ if (list.isEmpty()) {
+ list = doc.getElementsByClass("scrollerItem");
+ }
+
+ return list;
}
@Override
protected String getArticleId(Document doc, Element article) {
- // Use the date, Luke
- return "";
+ String date = getArticleDate(doc, article);
+ String title = getArticleTitle(doc, article);
+
+ String id = (date + "_" + title).replaceAll("[^a-zA-Z0-9_-]", "_");
+ if (id.length() > 40) {
+ id = id.substring(0, 40);
+ }
+
+ return id;
}
@Override
protected String getArticleTitle(Document doc, Element article) {
- return article.getElementsByAttributeValue(
- "data-event-action", "title").first().text().trim();
+ Elements els = article.getElementsByAttributeValue("data-event-action",
+ "title");
+ if (els == null || els.isEmpty()) {
+ els = article.getElementsByTag("h2");
+ }
+
+ return els.first().text().trim();
}
-
+
@Override
protected String getArticleAuthor(Document doc, Element article) {
- return article.getElementsByAttributeValueStarting(
- "href", "/user/"
- ).text().trim();
+ return article.getElementsByAttributeValueStarting("href", "/user/")
+ .text().trim();
}
@Override
protected String getArticleDate(Document doc, Element article) {
- return article.getElementsByClass("live-timestamp")
- .attr("datetime").trim();
+ Element el = article.getElementsByClass("live-timestamp").first();
+ if (el == null) {
+ el = article.getElementsByAttributeValue("data-click-id",
+ "timestamp").first();
+ }
+
+ String dateAgo = el.text().trim();
+ return new SimpleDateFormat("yyyy-MM-dd_HH-mm")
+ .format(getDate(dateAgo));
}
@Override
protected String getArticleCategory(Document doc, Element article,
String currentCategory) {
- Elements categEls = article.getElementsByAttributeValueStarting(
- "href", "/r/" + currentCategory + "/search=?q=flair_name"
- );
-
+ Elements categEls = article.getElementsByAttributeValueStarting("href",
+ "/r/" + currentCategory + "/search=?q=flair_name");
+
if (categEls.size() > 0) {
- return currentCategory + ", "
- + categEls.first().text().trim();
+ return currentCategory + ", " + categEls.first().text().trim();
}
-
+
return currentCategory;
}
@@ -95,29 +116,51 @@ public class Reddit extends BasicSupport {
@Override
protected String getArticleIntUrl(Document doc, Element article) {
- return article.getElementsByClass("thing").first()
- .absUrl("data-permalink");
+ String url = article.absUrl("data-permalink");
+ if (url == null || url.isEmpty()) {
+ url = article
+ .getElementsByAttributeValue("data-click-id", "timestamp")
+ .first().absUrl("href");
+ }
+
+ return url;
}
@Override
protected String getArticleExtUrl(Document doc, Element article) {
- Element url = article.getElementsByAttributeValue(
- "data-event-action", "title").first();
+ Elements els = article.getElementsByAttributeValue("data-event-action",
+ "title");
+ if (els == null || els.isEmpty()) {
+ els = article.getElementsByAttributeValue("data-click-id", "body");
+ }
+
+ Element url = els.first();
if (!url.attr("href").trim().startsWith("/")) {
return url.absUrl("href");
}
-
+
return "";
}
@Override
protected String getArticleContent(Document doc, Element article) {
+ Elements els = article.getElementsByClass("h2");
+ if (els != null && !els.isEmpty()) {
+ return els.first().text().trim();
+ }
+
return "";
}
@Override
protected Element getFullArticle(Document doc) {
- return doc.getElementsByClass("ckueCN").first();
+ Element element = doc.getElementsByAttributeValue("data-click-id",
+ "body").first();
+ if (element == null) {
+ element = doc.getElementsByClass("ckueCN").first();
+ }
+
+ return element;
}
@Override
@@ -127,7 +170,15 @@ public class Reddit extends BasicSupport {
@Override
protected List getFullArticleCommentPosts(Document doc, URL intUrl) {
- return doc.getElementsByClass("jHfOJm");
+ Elements posts = doc.getElementsByClass("jHfOJm");
+ if (posts.isEmpty()) {
+ posts = doc.getElementsByClass("eCeBkc");
+ }
+ if (posts.isEmpty()) {
+ posts = doc.getElementsByClass("gxtxxZ");
+ }
+
+ return posts;
}
@Override
@@ -136,8 +187,20 @@ public class Reddit extends BasicSupport {
List elements = new LinkedList();
for (Element el : container.children()) {
elements.addAll(el.getElementsByClass("jHfOJm"));
+
}
-
+
+ if (elements.isEmpty()) {
+ for (Element el : container.children()) {
+ elements.addAll(el.getElementsByClass("s1ook3io-0"));
+ elements.addAll(el.getElementsByClass("s1ook3io-1"));
+ elements.addAll(el.getElementsByClass("s1ook3io-2"));
+ elements.addAll(el.getElementsByClass("s1ook3io-3"));
+ elements.addAll(el.getElementsByClass("s1ook3io-4"));
+ elements.addAll(el.getElementsByClass("s1ook3io-5"));
+ }
+ }
+
return elements;
}
@@ -145,15 +208,17 @@ public class Reddit extends BasicSupport {
protected String getCommentId(Element post) {
int level = 1;
Elements els = post.getElementsByClass("imyGpC");
- if (els.size() > 0) {
- String l = els.first().text().trim()
- .replace("level ", "");
+ if (els.isEmpty())
+ els.addAll(post.getElementsByClass("emJXdb"));
+
+ if (!els.isEmpty()) {
+ String l = els.first().text().trim().replace("level ", "");
try {
level = Integer.parseInt(l);
- } catch(NumberFormatException e) {
+ } catch (NumberFormatException e) {
}
}
-
+
return Integer.toString(level);
}
@@ -166,44 +231,51 @@ public class Reddit extends BasicSupport {
@Override
protected String getCommentTitle(Element post) {
// Since we have no title, we switch with author
- Elements els = post.getElementsByClass("RVnoX");
- if (els.size() > 0) {
- return els.first().text().trim();
- }
-
- els = post.getElementsByClass("kzePTH");
- if (els.size() > 0) {
- return els.first().text().trim();
- }
-
+
+ Element authorEl = post.getElementsByClass("RVnoX").first();
+ if (authorEl == null)
+ authorEl = post.getElementsByClass("kzePTH").first();
+ if (authorEl == null)
+ authorEl = post.getElementsByClass("jczTlv").first();
+
+ if (authorEl != null)
+ return authorEl.text().trim();
+
return "";
}
@Override
protected String getCommentDate(Element post) {
- return post.getElementsByClass("hJDlLH")
- .first().text().trim();
+ Element elAgo = post.getElementsByClass("hJDlLH").first();
+ if (elAgo == null)
+ elAgo = post.getElementsByClass("hDplaG").first();
+
+ if (elAgo != null) {
+ String dateAgo = elAgo.text().trim();
+ return new SimpleDateFormat("yyyy-MM-dd_HH-mm")
+ .format(getDate(dateAgo));
+ }
+
+ return "";
}
@Override
protected Element getCommentContentElement(Element post) {
- return post.getElementsByClass("ckueCN")
- .first();
+ return post.getElementsByClass("ckueCN").first();
}
@Override
protected ElementProcessor getElementProcessorComment() {
return new BasicElementProcessor();
}
-
+
@Override
public void fetch(Story story) throws IOException {
super.fetch(story);
-
+
List comments = new LinkedList();
- Map lastOfLevel =
- new HashMap();
-
+ Map lastOfLevel = new HashMap();
+
for (Comment c : story.getComments()) {
int level = Integer.parseInt(c.getId());
lastOfLevel.put(level, c);
@@ -211,7 +283,7 @@ public class Reddit extends BasicSupport {
comments.add(c);
} else {
Comment parent = lastOfLevel.get(level - 1);
- if (parent != null ){
+ if (parent != null) {
parent.add(c);
} else {
// bad data
@@ -219,7 +291,30 @@ public class Reddit extends BasicSupport {
}
}
}
-
+
story.setComments(comments);
}
+
+ // 2 hours ago -> 18/10/2018 21:00
+ private Date getDate(String dateAgo) {
+ int h = 0;
+ if (dateAgo.endsWith("hour ago")) {
+ h = 1;
+ } else if (dateAgo.endsWith("hours ago")) {
+ dateAgo = dateAgo.replace("hours ago", "").trim();
+ h = Integer.parseInt(dateAgo);
+ } else if (dateAgo.endsWith("day ago")) {
+ h = 24;
+ } else if (dateAgo.endsWith("days ago")) {
+ dateAgo = dateAgo.replace("days ago", "").trim();
+ h = Integer.parseInt(dateAgo) * 24;
+ }
+
+ long now = new Date().getTime(); // in ms since 1970
+ now = now / (1000l * 60l * 60l); // in hours since 1970
+ long then = now - h; // in hours since 1970
+ then = then * (1000l * 60l * 60l); // in ms since 1970
+
+ return new Date(then);
+ }
}