Skip to content

Commit 3dadf63

Browse files
yausernameyausername
committed
refactored comments capability
1 parent a97b6df commit 3dadf63

4 files changed

Lines changed: 31 additions & 35 deletions

File tree

‎extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public List<MediaCapability> getMediaCapabilities() {
6666
}
6767

6868
public enum MediaCapability {
69-
AUDIO, VIDEO, LIVE
69+
AUDIO, VIDEO, LIVE, COMMENTS
7070
}
7171
}
7272

@@ -296,9 +296,6 @@ public CommentsExtractor getCommentsExtractor(String url) throws ExtractionExcep
296296
return getCommentsExtractor(llhf.fromUrl(url), NewPipe.getPreferredLocalization());
297297
}
298298

299-
public abstract boolean isCommentsSupported();
300-
301-
302299

303300
/**
304301
* Figures out where the link is pointing to (a channel, a video, a playlist, etc.)

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
package org.schabi.newpipe.extractor.services.media_ccc;
22

3+
import static java.util.Arrays.asList;
4+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
5+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
6+
7+
import java.io.IOException;
8+
39
import org.schabi.newpipe.extractor.StreamingService;
410
import org.schabi.newpipe.extractor.SuggestionExtractor;
511
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
612
import org.schabi.newpipe.extractor.comments.CommentsExtractor;
713
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
814
import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
915
import org.schabi.newpipe.extractor.kiosk.KioskList;
10-
import org.schabi.newpipe.extractor.linkhandler.*;
16+
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
17+
import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
18+
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
19+
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
20+
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandler;
21+
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
1122
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
1223
import org.schabi.newpipe.extractor.search.SearchExtractor;
1324
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCConferenceExtractor;
@@ -22,11 +33,6 @@
2233
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
2334
import org.schabi.newpipe.extractor.utils.Localization;
2435

25-
import java.io.IOException;
26-
27-
import static java.util.Arrays.asList;
28-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.*;
29-
3036
public class MediaCCCService extends StreamingService {
3137
public MediaCCCService(int id) {
3238
super(id, "MediaCCC", asList(AUDIO, VIDEO));
@@ -117,8 +123,4 @@ public CommentsExtractor getCommentsExtractor(ListLinkHandler linkHandler, Local
117123
return null;
118124
}
119125

120-
@Override
121-
public boolean isCommentsSupported() {
122-
return false;
123-
}
124126
}

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
11
package org.schabi.newpipe.extractor.services.soundcloud;
22

3-
import org.schabi.newpipe.extractor.*;
4-
import org.schabi.newpipe.extractor.linkhandler.*;
3+
import static java.util.Collections.singletonList;
4+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
5+
6+
import org.schabi.newpipe.extractor.StreamingService;
7+
import org.schabi.newpipe.extractor.SuggestionExtractor;
58
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
69
import org.schabi.newpipe.extractor.comments.CommentsExtractor;
710
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
811
import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
912
import org.schabi.newpipe.extractor.kiosk.KioskList;
13+
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
14+
import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
15+
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
16+
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
17+
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandler;
18+
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
1019
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
1120
import org.schabi.newpipe.extractor.search.SearchExtractor;
1221
import org.schabi.newpipe.extractor.stream.StreamExtractor;
1322
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
1423
import org.schabi.newpipe.extractor.utils.Localization;
1524

16-
import static java.util.Collections.singletonList;
17-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
18-
1925
public class SoundcloudService extends StreamingService {
2026

2127
public SoundcloudService(int id) {
@@ -113,9 +119,4 @@ public CommentsExtractor getCommentsExtractor(ListLinkHandler linkHandler, Local
113119
return null;
114120
}
115121

116-
@Override
117-
public boolean isCommentsSupported() {
118-
return false;
119-
}
120-
121122
}

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package org.schabi.newpipe.extractor.services.youtube;
22

3+
import static java.util.Arrays.asList;
4+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
5+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
6+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.LIVE;
7+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
8+
39
import org.schabi.newpipe.extractor.StreamingService;
410
import org.schabi.newpipe.extractor.SuggestionExtractor;
511
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
@@ -33,11 +39,6 @@
3339
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
3440
import org.schabi.newpipe.extractor.utils.Localization;
3541

36-
import static java.util.Arrays.asList;
37-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
38-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.LIVE;
39-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
40-
4142
/*
4243
* Created by Christian Schabesberger on 23.08.15.
4344
*
@@ -61,7 +62,7 @@
6162
public class YoutubeService extends StreamingService {
6263

6364
public YoutubeService(int id) {
64-
super(id, "YouTube", asList(AUDIO, VIDEO, LIVE));
65+
super(id, "YouTube", asList(AUDIO, VIDEO, LIVE, COMMENTS));
6566
}
6667

6768
@Override
@@ -150,9 +151,4 @@ public CommentsExtractor getCommentsExtractor(ListLinkHandler urlIdHandler, Loca
150151
return new YoutubeCommentsExtractor(this, urlIdHandler, localization);
151152
}
152153

153-
@Override
154-
public boolean isCommentsSupported() {
155-
return true;
156-
}
157-
158154
}

0 commit comments

Comments
 (0)