Skip to content

Commit 3b3a27a

Browse files
author
Yevhen Babiichuk (DustDFG)
committed
Use EnumSet instead of List for MediaCapabilities inside Service
1 parent d9e9911 commit 3b3a27a

6 files changed

Lines changed: 17 additions & 10 deletions

File tree

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import javax.annotation.Nullable;
2828
import java.util.Collections;
29+
import java.util.EnumSet;
2930
import java.util.List;
3031

3132
/*
@@ -54,23 +55,23 @@ public abstract class StreamingService {
5455
public static class ServiceInfo {
5556
private final String name;
5657

57-
private final List<MediaCapability> mediaCapabilities;
58+
private final EnumSet<MediaCapability> mediaCapabilities;
5859

5960
/**
6061
* Creates a new instance of a ServiceInfo
6162
* @param name the name of the service
6263
* @param mediaCapabilities the type of media this service can handle
6364
*/
64-
public ServiceInfo(final String name, final List<MediaCapability> mediaCapabilities) {
65+
public ServiceInfo(final String name, final EnumSet<MediaCapability> mediaCapabilities) {
6566
this.name = name;
66-
this.mediaCapabilities = Collections.unmodifiableList(mediaCapabilities);
67+
this.mediaCapabilities = mediaCapabilities;
6768
}
6869

6970
public String getName() {
7071
return name;
7172
}
7273

73-
public List<MediaCapability> getMediaCapabilities() {
74+
public EnumSet<MediaCapability> getMediaCapabilities() {
7475
return mediaCapabilities;
7576
}
7677

@@ -104,7 +105,7 @@ public enum LinkType {
104105
*/
105106
public StreamingService(final int id,
106107
final String name,
107-
final List<ServiceInfo.MediaCapability> capabilities) {
108+
final EnumSet<ServiceInfo.MediaCapability> capabilities) {
108109
this.serviceId = id;
109110
this.serviceInfo = new ServiceInfo(name, capabilities);
110111
}

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/BandcampService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@
4848
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
4949

5050
import java.util.Arrays;
51+
import java.util.EnumSet;
5152

5253
public class BandcampService extends StreamingService {
5354

5455
public BandcampService(final int id) {
55-
super(id, "Bandcamp", Arrays.asList(AUDIO, COMMENTS));
56+
super(id, "Bandcamp", EnumSet.of(AUDIO, COMMENTS));
5657
}
5758

5859
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@
3838
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
3939
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
4040

41+
import java.util.EnumSet;
42+
4143
public class MediaCCCService extends StreamingService {
4244
public MediaCCCService(final int id) {
43-
super(id, "media.ccc.de", asList(AUDIO, VIDEO));
45+
super(id, "media.ccc.de", EnumSet.of(AUDIO, VIDEO));
4446
}
4547

4648
@Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
3939
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
4040

41+
import java.util.EnumSet;
4142
import java.util.List;
4243

4344
public class PeertubeService extends StreamingService {
@@ -49,7 +50,7 @@ public PeertubeService(final int id) {
4950
}
5051

5152
public PeertubeService(final int id, final PeertubeInstance instance) {
52-
super(id, "PeerTube", asList(VIDEO, COMMENTS));
53+
super(id, "PeerTube", EnumSet.of(VIDEO, COMMENTS));
5354
this.instance = instance;
5455
}
5556

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@
3838
import org.schabi.newpipe.extractor.stream.StreamExtractor;
3939
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
4040

41+
import java.util.EnumSet;
4142
import java.util.List;
4243

4344
public class SoundcloudService extends StreamingService {
4445

4546
public SoundcloudService(final int id) {
46-
super(id, "SoundCloud", asList(AUDIO, COMMENTS));
47+
super(id, "SoundCloud", EnumSet.of(AUDIO, COMMENTS));
4748
}
4849

4950
@Override

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
5858
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
5959

60+
import java.util.EnumSet;
6061
import java.util.List;
6162

6263
import javax.annotation.Nonnull;
@@ -84,7 +85,7 @@
8485
public class YoutubeService extends StreamingService {
8586

8687
public YoutubeService(final int id) {
87-
super(id, "YouTube", asList(AUDIO, VIDEO, LIVE, COMMENTS));
88+
super(id, "YouTube", EnumSet.of(AUDIO, VIDEO, LIVE, COMMENTS));
8889
}
8990

9091
@Override

0 commit comments

Comments
 (0)