From aefe7b176abcbce64dcd75725cb59ef4f8a536bc Mon Sep 17 00:00:00 2001
From: Bram van de Kerkhof <github@hackpoint.nl>
Date: Mon, 31 Jul 2017 20:04:14 +0200
Subject: [PATCH] Fixes case where manga name ends with s. (#919)

---
 .../eu/kanade/tachiyomi/util/ChapterRecognition.kt    |  2 +-
 .../tachiyomi/data/database/ChapterRecognitionTest.kt | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/ChapterRecognition.kt b/app/src/main/java/eu/kanade/tachiyomi/util/ChapterRecognition.kt
index 16df65b598..9c5b495037 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/ChapterRecognition.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/ChapterRecognition.kt
@@ -29,7 +29,7 @@ object ChapterRecognition {
      * Regex used to remove unwanted tags
      * Example Prison School 12 v.1 vol004 version1243 volume64 -R> Prison School 12
      */
-    private val unwanted = Regex("""(?:(v|ver|vol|version|volume|season|s).?[0-9]+)""")
+    private val unwanted = Regex("""(?<![a-z])(v|ver|vol|version|volume|season|s).?[0-9]+""")
 
     /**
      * Regex used to remove unwanted whitespace
diff --git a/app/src/test/java/eu/kanade/tachiyomi/data/database/ChapterRecognitionTest.kt b/app/src/test/java/eu/kanade/tachiyomi/data/database/ChapterRecognitionTest.kt
index 59712b7c6d..e5e4516bb1 100644
--- a/app/src/test/java/eu/kanade/tachiyomi/data/database/ChapterRecognitionTest.kt
+++ b/app/src/test/java/eu/kanade/tachiyomi/data/database/ChapterRecognitionTest.kt
@@ -440,4 +440,15 @@ class ChapterRecognitionTest {
         ChapterRecognition.parseChapterNumber(chapter, manga)
         assertThat(chapter.chapter_number).isEqualTo(20f)
     }
+
+    /**
+     * Test for chapters ending with s
+     */
+    @Test fun chaptersEndingWithS() {
+        createManga("One Outs")
+
+        createChapter("One Outs 001")
+        ChapterRecognition.parseChapterNumber(chapter, manga)
+        assertThat(chapter.chapter_number).isEqualTo(1f)
+    }
 }