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

Merge pull request #151 from icewind1991/chapter-recognition-fallback

Browse source 
Fix infinite loop when no chapter number is parsed
This commit is contained in:
inorichi 2016-02-16 20:41:34 +01:00
commit ff46c61f63
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/eu/kanade/tachiyomi/util/ChapterRecognition.java
View file

@ -111,6 +111,8 @@ public class ChapterRecognition {
} }
// Strip anything after "part xxx" and try that // Strip anything after "part xxx" and try that
matcher = pPart.matcher(name);
if (matcher.find()) {
name = pPart.matcher(name).replaceAll("$1"); name = pPart.matcher(name).replaceAll("$1");
dummyChapter.name = name; dummyChapter.name = name;
parseChapterNumber(dummyChapter, manga); parseChapterNumber(dummyChapter, manga);
@ -119,6 +121,7 @@ public class ChapterRecognition {
return; return;
} }
} }
}
/** /**
* x.a -> x.1, x.b -> x.2, etc * x.a -> x.1, x.b -> x.2, etc

7
app/src/test/java/eu/kanade/tachiyomi/ChapterRecognitionTest.java
View file

@ -172,4 +172,11 @@ public class ChapterRecognitionTest {
ChapterRecognition.parseChapterNumber(c, randomManga); ChapterRecognition.parseChapterNumber(c, randomManga);
assertThat(c.chapter_number).isEqualTo(027f); assertThat(c.chapter_number).isEqualTo(027f);
} }
@Test
public void testUnparsable() {
Chapter c = createChapter("Foo");
ChapterRecognition.parseChapterNumber(c, randomManga);
assertThat(c.chapter_number).isEqualTo(-1f);
}
} }