github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'inorichi/master'

Browse source
This commit is contained in:
Yuri Revich 2015-11-30 22:53:48 +03:00
commit 93b7135380
2 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/eu/kanade/mangafeed/util/ChapterRecognition.java
View file

@ -12,6 +12,7 @@ public class ChapterRecognition {
private static Pattern p1 = Pattern.compile("ch.?(\\d+[\\.,]?\\d*)");
private static Pattern p2 = Pattern.compile("(\\d+[\\.,]?\\d*)");
private static Pattern p3 = Pattern.compile("(\\d+[\\.,]?\\d*:)");
public static void parseChapterNumber(Chapter chapter, Manga manga) {
if (chapter.chapter_number != -1)
@ -28,9 +29,19 @@ public class ChapterRecognition {
return;
}
List<Float> occurences;
// If there's only one number, use it
matcher = p2.matcher(name);
List<Float> occurences = getAllOccurrences(matcher);
occurences = getAllOccurrences(matcher);
if (occurences.size() == 1) {
chapter.chapter_number = occurences.get(0);
return;
}
// If it has a colon, the chapter number should be that one
matcher = p3.matcher(name);
occurences = getAllOccurrences(matcher);
if (occurences.size() == 1) {
chapter.chapter_number = occurences.get(0);
return;
@ -55,11 +66,17 @@ public class ChapterRecognition {
public static List<Float> getAllOccurrences(Matcher matcher) {
List<Float> occurences = new ArrayList<>();
while (matcher.find()) {
try {
float value = Float.parseFloat(matcher.group());
if (!occurences.contains(value))
occurences.add(value);
} catch (NumberFormatException e) { /* Do nothing */ }
// Match again to get only numbers from the captured text
String text = matcher.group();
Matcher m = p2.matcher(text);
if (m.find()) {
try {
Float value = Float.parseFloat(m.group());
if (!occurences.contains(value)) {
occurences.add(value);
}
} catch (NumberFormatException e) { /* Do nothing */ }
}
}
return occurences;
}

21
app/src/test/java/eu/kanade/mangafeed/ChapterRecognitionTest.java
View file

@ -84,4 +84,25 @@ public class ChapterRecognitionTest {
assertThat(c.chapter_number, is(96f));
}
@Test
public void testWithColonAtTheEnd() {
Chapter c = createChapter("Chapter 5: 365 days");
ChapterRecognition.parseChapterNumber(c, randomManga);
assertThat(c.chapter_number, is(5f));
}
@Test
public void testWithZeros() {
Chapter c = createChapter("Vol.001 Ch.003: Kaguya Doesn't Know Much");
ChapterRecognition.parseChapterNumber(c, randomManga);
assertThat(c.chapter_number, is(3f));
}
@Test
public void testRange() {
Chapter c = createChapter("Ch.191-200 Read Online");
ChapterRecognition.parseChapterNumber(c, randomManga);
assertThat(c.chapter_number, is(191f));
}
}