garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

support for single quotes (#681)

Browse Source
This commit is contained in:
Athou
2014-11-26 14:19:08 +01:00
parent ed81fc576a
commit 77c3ec0bbe
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/backend/feed/FeedUtils.java
View File

@@ -185,12 +185,12 @@ public class FeedUtils {
} }
String pi = new String(ArrayUtils.subarray(bytes, 0, index + 1)); String pi = new String(ArrayUtils.subarray(bytes, 0, index + 1));
index = StringUtils.indexOf(pi, "encoding=\""); index = StringUtils.indexOf(pi, "encoding=");
if (index == -1) { if (index == -1) {
return null; return null;
} }
String encoding = pi.substring(index + 10, pi.length()); String encoding = pi.substring(index + 10, pi.length());
encoding = encoding.substring(0, encoding.indexOf('"')); encoding = encoding.substring(0, Math.max(encoding.indexOf(' ') - 1, 0));
return encoding; return encoding;
} }

11
src/test/java/com/commafeed/backend/feed/FeedUtilsTest.java
View File

@@ -3,8 +3,6 @@ package com.commafeed.backend.feed;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import com.commafeed.backend.feed.FeedUtils;
public class FeedUtilsTest { public class FeedUtilsTest {
@Test @Test
@@ -55,4 +53,13 @@ public class FeedUtilsTest {
FeedUtils.toAbsoluteUrl("elisp_all_about_lines.html", "blog.xml", "http://ergoemacs.org/emacs/blog.xml")); FeedUtils.toAbsoluteUrl("elisp_all_about_lines.html", "blog.xml", "http://ergoemacs.org/emacs/blog.xml"));
} }
@Test
public void testExtractDeclaredEncoding() {
Assert.assertNull(FeedUtils.extractDeclaredEncoding("<?xml ?>".getBytes()));
Assert.assertNull(FeedUtils.extractDeclaredEncoding("<feed></feed>".getBytes()));
Assert.assertEquals("UTF-8", FeedUtils.extractDeclaredEncoding("<?xml encoding=\"UTF-8\" ?>".getBytes()));
Assert.assertEquals("UTF-8", FeedUtils.extractDeclaredEncoding("<?xml encoding='UTF-8' ?>".getBytes()));
}
} }