Skip to content

Use EnumSet instead of List for MediaCapabilities inside Service #1449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TobiGr merged 2 commits into from
Feb 21, 2026
Merged

Use EnumSet instead of List for MediaCapabilities inside Service #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
857c181
Use EnumSet instead of List for MediaCapabilities inside Service
dustdfg Jan 30, 2026
a5aa7a0
Don't specify implementation, just the interface
TobiGr Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import javax.annotation.Nullable;
import java.util.Collections;
import java.util.List;
import java.util.Set;

/*
* Copyright (C) 2018 Christian Schabesberger <[email protected]>
Expand Down Expand Up @@ -54,23 +55,23 @@ public abstract class StreamingService {
public static class ServiceInfo {
private final String name;

private final List<MediaCapability> mediaCapabilities;
private final Set<MediaCapability> mediaCapabilities;

/**
* Creates a new instance of a ServiceInfo
* @param name the name of the service
* @param mediaCapabilities the type of media this service can handle
*/
public ServiceInfo(final String name, final List<MediaCapability> mediaCapabilities) {
public ServiceInfo(final String name, final Set<MediaCapability> mediaCapabilities) {
this.name = name;
this.mediaCapabilities = Collections.unmodifiableList(mediaCapabilities);
this.mediaCapabilities = mediaCapabilities;
}

public String getName() {
return name;
}

public List<MediaCapability> getMediaCapabilities() {
public Set<MediaCapability> getMediaCapabilities() {
return mediaCapabilities;
}

Expand Down Expand Up @@ -104,7 +105,7 @@ public enum LinkType {
*/
public StreamingService(final int id,
final String name,
final List<ServiceInfo.MediaCapability> capabilities) {
final Set<ServiceInfo.MediaCapability> capabilities) {
this.serviceId = id;
this.serviceInfo = new ServiceInfo(name, capabilities);
}
Expand Down
4 changes: 2 additions & 2 deletions extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;

import java.util.Arrays;
import java.util.EnumSet;

public class BandcampService extends StreamingService {

public BandcampService(final int id) {
super(id, "Bandcamp", Arrays.asList(AUDIO, COMMENTS));
super(id, "Bandcamp", EnumSet.of(AUDIO, COMMENTS));
}

@Override
Expand Down
5 changes: 3 additions & 2 deletions extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
import static java.util.Arrays.asList;

import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
Expand Down Expand Up @@ -38,9 +37,11 @@
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;

import java.util.EnumSet;

public class MediaCCCService extends StreamingService {
public MediaCCCService(final int id) {
super(id, "media.ccc.de", asList(AUDIO, VIDEO));
super(id, "media.ccc.de", EnumSet.of(AUDIO, VIDEO));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
import static java.util.Arrays.asList;

import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
Expand Down Expand Up @@ -38,6 +37,7 @@
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;

import java.util.EnumSet;
import java.util.List;

public class PeertubeService extends StreamingService {
Expand All @@ -49,7 +49,7 @@ public PeertubeService(final int id) {
}

public PeertubeService(final int id, final PeertubeInstance instance) {
super(id, "PeerTube", asList(VIDEO, COMMENTS));
super(id, "PeerTube", EnumSet.of(VIDEO, COMMENTS));
this.instance = instance;
}

Expand Down
4 changes: 2 additions & 2 deletions ...tor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
import static java.util.Arrays.asList;

import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
Expand Down Expand Up @@ -38,12 +37,13 @@
import org.schabi.newpipe.extractor.stream.StreamExtractor;
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;

import java.util.EnumSet;
import java.util.List;

public class SoundcloudService extends StreamingService {

public SoundcloudService(final int id) {
super(id, "SoundCloud", asList(AUDIO, COMMENTS));
super(id, "SoundCloud", EnumSet.of(AUDIO, COMMENTS));
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.LIVE;
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
import static java.util.Arrays.asList;

import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
Expand Down Expand Up @@ -57,6 +56,7 @@
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;

import java.util.EnumSet;
import java.util.List;

import javax.annotation.Nonnull;
Expand Down Expand Up @@ -84,7 +84,7 @@
public class YoutubeService extends StreamingService {

public YoutubeService(final int id) {
super(id, "YouTube", asList(AUDIO, VIDEO, LIVE, COMMENTS));
super(id, "YouTube", EnumSet.of(AUDIO, VIDEO, LIVE, COMMENTS));
}

@Override
Expand Down