Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

change favicon rest method to accept a subscription id

Browse Source
This commit is contained in:
Athou
2013-06-11 13:01:12 +02:00
parent ee5422a585
commit ddd65f69bf
6 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/commafeed/backend/feeds/FaviconFetcher.java
View File

@@ -36,29 +36,45 @@ public class FaviconFetcher {
@Inject
HttpGetter getter;
public byte[] fetch(String targetPath) {
byte[] icon = getIconAtRoot(targetPath);
public byte[] fetch(String url) {
if (url == null) {
log.info("url is null");
return null;
}
int doubleSlash = url.indexOf("//");
if (doubleSlash == -1) {
doubleSlash = 0;
} else {
doubleSlash += 2;
}
int firstSlash = url.indexOf('/', doubleSlash);
if (firstSlash != -1) {
url = url.substring(0, firstSlash);
}
byte[] icon = getIconAtRoot(url);
if (icon == null) {
icon = getIconInPage(targetPath);
icon = getIconInPage(url);
}
return icon;
}
private byte[] getIconAtRoot(String targetPath) {
private byte[] getIconAtRoot(String url) {
byte[] bytes = null;
String contentType = null;
try {
String url = FeedUtils.removeTrailingSlash(targetPath)
+ "/favicon.ico";
log.debug("getting root icon at {}", url);
url = FeedUtils.removeTrailingSlash(url) + "/favicon.ico";
log.info("getting root icon at {}", url);
HttpResult result = getter.getBinary(url);
bytes = result.getContent();
contentType = result.getContentType();
} catch (Exception e) {
log.info("Failed to retrieve iconAtRoot: " + e.getMessage(), e);
log.debug("Failed to retrieve iconAtRoot: " + e.getMessage(), e);
}
if (!isValidIconResponse(bytes, contentType)) {
@@ -74,7 +90,7 @@ public class FaviconFetcher {
long length = content.length;
if (!contentType.isEmpty()) {
if (StringUtils.isNotBlank(contentType)) {
contentType = contentType.split(";")[0];
}
@@ -98,13 +114,12 @@ public class FaviconFetcher {
return true;
}
private byte[] getIconInPage(String targetPath) {
log.info("iconInPage, trying " + targetPath);
private byte[] getIconInPage(String url) {
Document doc;
Document doc = null;
try {
HttpResult result = getter.getBinary(targetPath);
doc = Jsoup.parse(new String(result.getContent()), targetPath);
HttpResult result = getter.getBinary(url);
doc = Jsoup.parse(new String(result.getContent()), url);
} catch (Exception e) {
log.info("Failed to retrieve page to find icon");
return null;
@@ -114,7 +129,7 @@ public class FaviconFetcher {
.select("link[rel~=(?i)^(shortcut|icon|shortcut icon)$]");
if (icons.isEmpty()) {
log.info("No icon found in page");
log.info("No icon found in page {}", url);
return null;
}

27
src/main/java/com/commafeed/backend/feeds/FeedUtils.java
View File

@@ -1,7 +1,5 @@
package com.commafeed.backend.feeds;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
@@ -22,6 +20,7 @@ import org.slf4j.LoggerFactory;
import com.commafeed.backend.model.Feed;
import com.commafeed.backend.model.FeedEntry;
import com.commafeed.backend.model.FeedSubscription;
import com.google.api.client.util.Lists;
import com.google.gwt.i18n.client.HasDirection.Direction;
import com.google.gwt.i18n.shared.BidiUtils;
@@ -263,25 +262,9 @@ public class FeedUtils {
return baseUrl + url;
}
public static String getFaviconUrl(String url, String publicUrl) {
String defaultIcon = removeTrailingSlash(publicUrl)
+ "/images/default_favicon.gif";
if (StringUtils.isBlank(url)) {
return defaultIcon;
}
int index = Math.max(url.length(), url.lastIndexOf('?'));
StringBuilder iconUrl = new StringBuilder(
"https://getfavicon.appspot.com/");
try {
iconUrl.append(URLEncoder.encode(url.substring(0, index), "UTF-8"));
} catch (UnsupportedEncodingException e) {
// never happens
log.error(e.getMessage(), e);
}
iconUrl.append("?defaulticon=none");
return iconUrl.toString();
public static String getFaviconUrl(FeedSubscription subscription,
String publicUrl) {
return removeTrailingSlash(publicUrl) + "/rest/feed/favicon?id="
+ subscription.getId();
}
}