Skip to content

Commit 05e7b86

Browse files
committed
[duplicated subtitle][bug] Updated YoutubeStreamExtractor.java to integrate deduplicated subtitles, calling checkAndDeduplicate() to remove duplicates and store results in cache.
1 parent 631100b commit 05e7b86

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@
8282
import org.schabi.newpipe.extractor.utils.LocaleCompat;
8383
import org.schabi.newpipe.extractor.utils.Pair;
8484
import org.schabi.newpipe.extractor.utils.Parser;
85+
import org.schabi.newpipe.extractor.utils.SubtitleDeduplicator;
86+
import org.schabi.newpipe.extractor.utils.SubtitleOrigin;
8587
import org.schabi.newpipe.extractor.utils.Utils;
8688

8789
import java.io.IOException;
@@ -740,8 +742,17 @@ public List<SubtitlesStream> getSubtitles(final MediaFormat format) throws Parsi
740742
// Remove translation language
741743
.replaceAll("&tlang=[^&]*", "");
742744

745+
final String remoteSubtitleUrl = cleanUrl + "&fmt=" + format.getSuffix();
746+
String subtitleUrl = null;
747+
final SubtitleOrigin thisSubtitleOrigin = SubtitleDeduplicator.getSubtitleOrigin(
748+
isAutoGenerated,
749+
false);
750+
subtitleUrl = SubtitleDeduplicator.checkAndDeduplicate(remoteSubtitleUrl,
751+
format,
752+
thisSubtitleOrigin);
753+
743754
subtitlesToReturn.add(new SubtitlesStream.Builder()
744-
.setContent(cleanUrl + "&fmt=" + format.getSuffix(), true)
755+
.setContent(subtitleUrl, true)
745756
.setMediaFormat(format)
746757
.setLanguageCode(languageCode)
747758
.setAutoGenerated(isAutoGenerated)

0 commit comments

Comments
 (0)