diff --git a/README.md b/README.md index 27ac13262..9d0982846 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@

A mobile video player, reader assistant and card creation toolkit tailored for language learners.

Latest GitHub Release:
-0.25.3-beta ๐Ÿ‡ฏ๐Ÿ‡ต โ†’ ๐Ÿ‡ฌ๐Ÿ‡ง
+0.25.4-beta ๐Ÿ‡ฏ๐Ÿ‡ต โ†’ ๐Ÿ‡ฌ๐Ÿ‡ง
0.16.8-beta ๐Ÿ‡ฐ๐Ÿ‡ท โ†’ ๐Ÿ‡ฌ๐Ÿ‡ง

@@ -34,7 +34,7 @@ 0.22 ยท 0.23 ยท 0.24 ยท - 0.25 + 0.25

# ๐Ÿ“š Uninterrupted language immersion at your fingertips diff --git a/pubspec.yaml b/pubspec.yaml index 22f5987a8..bccbf67a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: jidoujisho description: A mobile video player tailored for Japanese language learners. publish_to: none -version: 0.25.3+66 +version: 0.25.4+67 environment: sdk: ">=2.7.0 <3.0.0" diff --git a/subtitle_wrapper_package/lib/data/repository/subtitle_repository.dart b/subtitle_wrapper_package/lib/data/repository/subtitle_repository.dart index 20cc34b8f..ad3b5741f 100644 --- a/subtitle_wrapper_package/lib/data/repository/subtitle_repository.dart +++ b/subtitle_wrapper_package/lib/data/repository/subtitle_repository.dart @@ -155,7 +155,7 @@ class SubtitleDataRepository extends SubtitleRepository { ); } else if (subtitleType == SubtitleType.srt) { regExp = RegExp( - r'((\d{2}):(\d{2}):(\d{2})\,(\d+)) +--> +((\d{2}):(\d{2}):(\d{2})\,(\d{3})).*[\r\n]+\s*(^[\s\S]*?(?=\n{2,}))', + r'((\d{2}):(\d{2}):(\d{2})\,(\d+)) +--> +((\d{2}):(\d{2}):(\d{2})\,(\d{3})).*[\r\n]+\s*(.*(?:\r?\n(?!\r?\n).*)*)', caseSensitive: false, multiLine: true, ); @@ -164,6 +164,7 @@ class SubtitleDataRepository extends SubtitleRepository { } var matches = regExp.allMatches(subtitlesContent).toList(); + print(matches); List subtitleList = []; matches.forEach((RegExpMatch regExpMatch) { @@ -194,6 +195,7 @@ class SubtitleDataRepository extends SubtitleRepository { }); for (var i = 1; i < subtitleList.length; i++) { + print(subtitleList[i].text); var previousSubtitle = subtitleList[i - 1]; var currentSubtitle = subtitleList[i];