Skip to content

Commit 3fdb6ee

Browse files
authored
Merge pull request #1031 from petlyh/bandcamp-fix-radio-comments
[Bandcamp] Show comments as disabled on radio streams
2 parents 99ab977 + f7a7a23 commit 3fdb6ee

3 files changed

Lines changed: 10 additions & 1 deletion

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampCommentsExtractor.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,9 @@ public InfoItemsPage<CommentsInfoItem> getPage(final Page page)
5353
throws IOException, ExtractionException {
5454
return null;
5555
}
56+
57+
@Override
58+
public boolean isCommentsDisabled() throws ExtractionException {
59+
return BandcampExtractorHelper.isRadioUrl(getUrl());
60+
}
5661
}

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/linkHandler/BandcampCommentsLinkHandlerFactory.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ public String getId(final String url) throws ParsingException {
1919

2020
@Override
2121
public boolean onAcceptUrl(final String url) throws ParsingException {
22+
if (BandcampExtractorHelper.isRadioUrl(url)) {
23+
return true;
24+
}
25+
2226
// Don't accept URLs that don't point to a track
2327
if (!url.toLowerCase().matches("https?://.+\\..+/(track|album)/.+")) {
2428
return false;

extractor/src/test/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampCommentsLinkHandlerFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public void testAcceptUrl() throws ParsingException {
3232
assertFalse(linkHandler.acceptUrl("https://bandcamp.com"));
3333
assertFalse(linkHandler.acceptUrl("https://zachbenson.bandcamp.com/"));
3434
assertFalse(linkHandler.acceptUrl("https://example.com/track/sampletrack"));
35-
assertFalse(linkHandler.acceptUrl("http://bandcamP.com/?show=38"));
3635

36+
assertTrue(linkHandler.acceptUrl("http://bandcamP.com/?show=38"));
3737
assertTrue(linkHandler.acceptUrl("https://powertothequeerkids.bandcamp.com/album/power-to-the-queer-kids"));
3838
assertTrue(linkHandler.acceptUrl("https://zachbenson.bandcamp.com/track/kitchen"));
3939
assertTrue(linkHandler.acceptUrl("http://ZachBenson.Bandcamp.COM/Track/U-I-Tonite/"));

0 commit comments

Comments
 (0)