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

bypass our server directly for feed favicons

Browse Source
This commit is contained in:
Athou
2013-04-28 15:15:59 +02:00
parent 06f86a992a
commit c3d826eb74
5 changed files with 146 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/CommaFeedApplication.java
View File

@@ -39,7 +39,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.frontend.pages.DemoLoginPage;
import com.commafeed.frontend.pages.FaviconPage;
import com.commafeed.frontend.pages.GoogleImportCallbackPage;
import com.commafeed.frontend.pages.GoogleImportRedirectPage;
import com.commafeed.frontend.pages.HomePage;
@@ -69,7 +68,6 @@ public class CommaFeedApplication extends AuthenticatedWebApplication {
mountPage("demo", DemoLoginPage.class);
mountPage("logout", LogoutPage.class);
mountPage("error", DisplayExceptionPage.class);
mountPage("favicon", FaviconPage.class);
mountPage("google/import/redirect", GoogleImportRedirectPage.class);
mountPage(GoogleImportCallbackPage.PAGE_PATH,
GoogleImportCallbackPage.class);

105
src/main/java/com/commafeed/frontend/pages/FaviconPage.java
View File

@@ -1,105 +0,0 @@
package com.commafeed.frontend.pages;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.impl.cookie.DateUtils;
import org.apache.wicket.request.IRequestCycle;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.commafeed.backend.HttpGetter;
import com.commafeed.backend.HttpGetter.HttpResult;
import com.commafeed.backend.StartupBean;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.frontend.SecurityCheck;
import com.google.common.net.HttpHeaders;
@SuppressWarnings("serial")
@SecurityCheck(Role.USER)
public class FaviconPage extends BasePage {
private static final Logger log = LoggerFactory
.getLogger(FaviconPage.class);
@Inject
HttpGetter getter;
@Inject
StartupBean startupBean;
public FaviconPage(PageParameters params) {
final String url = params.get("url").toString();
getRequestCycle().scheduleRequestHandlerAfterCurrent(
new IRequestHandler() {
@Override
public void respond(IRequestCycle requestCycle) {
WebResponse response = (WebResponse) requestCycle
.getResponse();
response.setLastModifiedTime(Time.millis(startupBean
.getStartupTime()));
response.setContentType("image/x-icon");
long expiresAfter = TimeUnit.DAYS.toMillis(7);
response.setHeader(
HttpHeaders.EXPIRES,
DateUtils.formatDate(new Date(startupBean
.getStartupTime() + expiresAfter)));
response.write(getImage(url));
}
@Override
public void detach(IRequestCycle requestCycle) {
}
});
}
private byte[] getImage(String url) {
byte[] img = null;
try {
if (StringUtils.isNotBlank(url)) {
int index = Math.max(url.length(), url.lastIndexOf("?"));
url = url.substring(0, index);
String iconUrl = "http://g.etfv.co/"
+ URLEncoder.encode(url, "UTF-8") + "?defaulticon=none";
HttpResult result = getter.getBinary(iconUrl);
if (result != null) {
img = result.getContent();
}
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
if (img == null) {
img = getDefaultIcon();
}
return img;
}
private byte[] getDefaultIcon() {
byte[] bytes = null;
InputStream is = null;
try {
is = getClass().getResourceAsStream("/favicon.gif");
bytes = IOUtils.toByteArray(is);
} catch (IOException e) {
log.error(e.getMessage(), e);
} finally {
IOUtils.closeQuietly(is);
}
return bytes;
}
}