Skip to content

Commit 9f7e06c

Browse files
Stypoxlitetex
Stypox
authored and
litetex
committed
[MediaCCC] Fix checkstyle issues
1 parent 3a94839 commit 9f7e06c

18 files changed

Lines changed: 177 additions & 132 deletions

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

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

3+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
4+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
5+
import static java.util.Arrays.asList;
6+
37
import org.schabi.newpipe.extractor.StreamingService;
48
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
59
import org.schabi.newpipe.extractor.comments.CommentsExtractor;
610
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
7-
import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
811
import org.schabi.newpipe.extractor.kiosk.KioskList;
912
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
1013
import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
@@ -14,16 +17,24 @@
1417
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
1518
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
1619
import org.schabi.newpipe.extractor.search.SearchExtractor;
17-
import org.schabi.newpipe.extractor.services.media_ccc.extractors.*;
18-
import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.*;
20+
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCConferenceExtractor;
21+
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCConferenceKiosk;
22+
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCLiveStreamExtractor;
23+
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCLiveStreamKiosk;
24+
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCParsingHelper;
25+
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCRecentKiosk;
26+
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCSearchExtractor;
27+
import org.schabi.newpipe.extractor.services.media_ccc.extractors.MediaCCCStreamExtractor;
28+
import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCConferenceLinkHandlerFactory;
29+
import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCConferencesListLinkHandlerFactory;
30+
import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCLiveListLinkHandlerFactory;
31+
import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCRecentListLinkHandlerFactory;
32+
import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCSearchQueryHandlerFactory;
33+
import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCStreamLinkHandlerFactory;
1934
import org.schabi.newpipe.extractor.stream.StreamExtractor;
2035
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
2136
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
2237

23-
import static java.util.Arrays.asList;
24-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
25-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
26-
2738
public class MediaCCCService extends StreamingService {
2839
public MediaCCCService(final int id) {
2940
super(id, "media.ccc.de", asList(AUDIO, VIDEO));
@@ -79,42 +90,42 @@ public SuggestionExtractor getSuggestionExtractor() {
7990

8091
@Override
8192
public KioskList getKioskList() throws ExtractionException {
82-
KioskList list = new KioskList(this);
93+
final KioskList list = new KioskList(this);
8394

8495
// add kiosks here e.g.:
8596
try {
86-
list.addKioskEntry(new KioskList.KioskExtractorFactory() {
87-
@Override
88-
public KioskExtractor createNewKiosk(final StreamingService streamingService,
89-
final String url, final String kioskId)
90-
throws ExtractionException {
91-
return new MediaCCCConferenceKiosk(MediaCCCService.this,
92-
new MediaCCCConferencesListLinkHandlerFactory().fromUrl(url), kioskId);
93-
}
94-
}, new MediaCCCConferencesListLinkHandlerFactory(), "conferences");
95-
96-
list.addKioskEntry(new KioskList.KioskExtractorFactory() {
97-
@Override
98-
public KioskExtractor createNewKiosk(final StreamingService streamingService,
99-
final String url, final String kioskId)
100-
throws ExtractionException {
101-
return new MediaCCCRecentKiosk(MediaCCCService.this,
102-
new MediaCCCRecentListLinkHandlerFactory().fromUrl(url), kioskId);
103-
}
104-
}, new MediaCCCRecentListLinkHandlerFactory(), "recent");
105-
106-
list.addKioskEntry(new KioskList.KioskExtractorFactory() {
107-
@Override
108-
public KioskExtractor createNewKiosk(final StreamingService streamingService,
109-
final String url, final String kioskId)
110-
throws ExtractionException {
111-
return new MediaCCCLiveStreamKiosk(MediaCCCService.this,
112-
new MediaCCCLiveListLinkHandlerFactory().fromUrl(url), kioskId);
113-
}
114-
}, new MediaCCCLiveListLinkHandlerFactory(), "live");
97+
list.addKioskEntry(
98+
(streamingService, url, kioskId) -> new MediaCCCConferenceKiosk(
99+
MediaCCCService.this,
100+
new MediaCCCConferencesListLinkHandlerFactory().fromUrl(url),
101+
kioskId
102+
),
103+
new MediaCCCConferencesListLinkHandlerFactory(),
104+
"conferences"
105+
);
106+
107+
list.addKioskEntry(
108+
(streamingService, url, kioskId) -> new MediaCCCRecentKiosk(
109+
MediaCCCService.this,
110+
new MediaCCCRecentListLinkHandlerFactory().fromUrl(url),
111+
kioskId
112+
),
113+
new MediaCCCRecentListLinkHandlerFactory(),
114+
"recent"
115+
);
116+
117+
list.addKioskEntry(
118+
(streamingService, url, kioskId) -> new MediaCCCLiveStreamKiosk(
119+
MediaCCCService.this,
120+
new MediaCCCLiveListLinkHandlerFactory().fromUrl(url),
121+
kioskId
122+
),
123+
new MediaCCCLiveListLinkHandlerFactory(),
124+
"live"
125+
);
115126

116127
list.setDefaultKiosk("recent");
117-
} catch (Exception e) {
128+
} catch (final Exception e) {
118129
throw new ExtractionException(e);
119130
}
120131

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,22 @@ public String getDescription() {
5353
}
5454

5555
@Override
56-
public String getParentChannelName() throws ParsingException {
56+
public String getParentChannelName() {
5757
return "";
5858
}
5959

6060
@Override
61-
public String getParentChannelUrl() throws ParsingException {
61+
public String getParentChannelUrl() {
6262
return "";
6363
}
6464

6565
@Override
66-
public String getParentChannelAvatarUrl() throws ParsingException {
66+
public String getParentChannelAvatarUrl() {
6767
return "";
6868
}
6969

7070
@Override
71-
public boolean isVerified() throws ParsingException {
71+
public boolean isVerified() {
7272
return false;
7373
}
7474

@@ -91,10 +91,11 @@ public InfoItemsPage<StreamInfoItem> getPage(final Page page) {
9191
@Override
9292
public void onFetchPage(@Nonnull final Downloader downloader)
9393
throws IOException, ExtractionException {
94-
final String conferenceUrl = MediaCCCConferenceLinkHandlerFactory.CONFERENCE_API_ENDPOINT + getId();
94+
final String conferenceUrl
95+
= MediaCCCConferenceLinkHandlerFactory.CONFERENCE_API_ENDPOINT + getId();
9596
try {
9697
conferenceData = JsonParser.object().from(downloader.get(conferenceUrl).responseBody());
97-
} catch (JsonParserException jpe) {
98+
} catch (final JsonParserException jpe) {
9899
throw new ExtractionException("Could not parse json returnd by url: " + conferenceUrl);
99100
}
100101
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public MediaCCCConferenceKiosk(final StreamingService streamingService,
3232
@Nonnull
3333
@Override
3434
public InfoItemsPage<ChannelInfoItem> getInitialPage() {
35-
JsonArray conferences = doc.getArray("conferences");
36-
ChannelInfoItemsCollector collector = new ChannelInfoItemsCollector(getServiceId());
35+
final JsonArray conferences = doc.getArray("conferences");
36+
final ChannelInfoItemsCollector collector = new ChannelInfoItemsCollector(getServiceId());
3737
for (int i = 0; i < conferences.size(); i++) {
3838
collector.commit(new MediaCCCConferenceInfoItemExtractor(conferences.getObject(i)));
3939
}
@@ -54,7 +54,7 @@ public void onFetchPage(@Nonnull final Downloader downloader)
5454
.responseBody();
5555
try {
5656
doc = JsonParser.object().from(site);
57-
} catch (JsonParserException jpe) {
57+
} catch (final JsonParserException jpe) {
5858
throw new ExtractionException("Could not parse json.", jpe);
5959
}
6060
}

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

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,51 @@
22

33
import com.grack.nanojson.JsonArray;
44
import com.grack.nanojson.JsonObject;
5+
56
import org.schabi.newpipe.extractor.MediaFormat;
6-
import org.schabi.newpipe.extractor.MetaInfo;
77
import org.schabi.newpipe.extractor.StreamingService;
88
import org.schabi.newpipe.extractor.downloader.Downloader;
99
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
1010
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1111
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
12-
import org.schabi.newpipe.extractor.localization.DateWrapper;
13-
import org.schabi.newpipe.extractor.stream.*;
12+
import org.schabi.newpipe.extractor.stream.AudioStream;
13+
import org.schabi.newpipe.extractor.stream.Description;
14+
import org.schabi.newpipe.extractor.stream.StreamExtractor;
15+
import org.schabi.newpipe.extractor.stream.StreamType;
16+
import org.schabi.newpipe.extractor.stream.VideoStream;
1417

15-
import javax.annotation.Nonnull;
16-
import javax.annotation.Nullable;
1718
import java.io.IOException;
1819
import java.util.ArrayList;
19-
import java.util.Collections;
2020
import java.util.List;
21-
import java.util.Locale;
21+
22+
import javax.annotation.Nonnull;
2223

2324
public class MediaCCCLiveStreamExtractor extends StreamExtractor {
24-
private JsonArray doc = null;
2525
private JsonObject conference = null;
2626
private String group = "";
2727
private JsonObject room = null;
2828

29-
public MediaCCCLiveStreamExtractor(StreamingService service, LinkHandler linkHandler) {
29+
public MediaCCCLiveStreamExtractor(final StreamingService service,
30+
final LinkHandler linkHandler) {
3031
super(service, linkHandler);
3132
}
3233

3334
@Override
34-
public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
35-
doc = MediaCCCParsingHelper.getLiveStreams(downloader, getExtractorLocalization());
35+
public void onFetchPage(@Nonnull final Downloader downloader)
36+
throws IOException, ExtractionException {
37+
final JsonArray doc =
38+
MediaCCCParsingHelper.getLiveStreams(downloader, getExtractorLocalization());
3639
// find correct room
3740
for (int c = 0; c < doc.size(); c++) {
38-
final JsonObject conference = doc.getObject(c);
41+
conference = doc.getObject(c);
3942
final JsonArray groups = conference.getArray("groups");
4043
for (int g = 0; g < groups.size(); g++) {
41-
final String group = groups.getObject(g).getString("group");
44+
group = groups.getObject(g).getString("group");
4245
final JsonArray rooms = groups.getObject(g).getArray("rooms");
4346
for (int r = 0; r < rooms.size(); r++) {
44-
final JsonObject room = rooms.getObject(r);
45-
if (getId().equals(conference.getString("slug") + "/" + room.getString("slug"))) {
46-
this.conference = conference;
47-
this.group = group;
48-
this.room = room;
47+
room = rooms.getObject(r);
48+
if (getId().equals(
49+
conference.getString("slug") + "/" + room.getString("slug"))) {
4950
return;
5051
}
5152
}
@@ -69,7 +70,8 @@ public String getThumbnailUrl() throws ParsingException {
6970
@Nonnull
7071
@Override
7172
public Description getDescription() throws ParsingException {
72-
return new Description(conference.getString("description") + " - " + group, Description.PLAIN_TEXT);
73+
return new Description(conference.getString("description")
74+
+ " - " + group, Description.PLAIN_TEXT);
7375
}
7476

7577
@Override
@@ -93,12 +95,11 @@ public String getUploaderName() throws ParsingException {
9395
@Override
9496
public String getHlsUrl() {
9597
// TODO: There are multiple HLS streams.
96-
// Make getHlsUrl() and getDashMpdUrl() return lists of VideoStreams, so the user can choose a resolution.
98+
// Make getHlsUrl() and getDashMpdUrl() return lists of VideoStreams,
99+
// so the user can choose a resolution.
97100
for (int s = 0; s < room.getArray("streams").size(); s++) {
98101
final JsonObject stream = room.getArray("streams").getObject(s);
99102
if (stream.getString("type").equals("video")) {
100-
final String resolution = stream.getArray("videoSize").getInt(0) + "x"
101-
+ stream.getArray("videoSize").getInt(1);
102103
if (stream.has("hls")) {
103104
return stream.getObject("urls").getObject("hls").getString("url");
104105
}
@@ -115,7 +116,8 @@ public List<AudioStream> getAudioStreams() throws IOException, ExtractionExcepti
115116
if (stream.getString("type").equals("audio")) {
116117
for (final String type : stream.getObject("urls").keySet()) {
117118
final JsonObject url = stream.getObject("urls").getObject(type);
118-
audioStreams.add(new AudioStream(url.getString("url"), MediaFormat.getFromSuffix(type), -1));
119+
audioStreams.add(new AudioStream(url.getString("url"),
120+
MediaFormat.getFromSuffix(type), -1));
119121
}
120122
}
121123
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,22 @@
1818
public class MediaCCCLiveStreamKiosk extends KioskExtractor<StreamInfoItem> {
1919
private JsonArray doc;
2020

21-
public MediaCCCLiveStreamKiosk(StreamingService streamingService, ListLinkHandler linkHandler, String kioskId) {
21+
public MediaCCCLiveStreamKiosk(final StreamingService streamingService,
22+
final ListLinkHandler linkHandler,
23+
final String kioskId) {
2224
super(streamingService, linkHandler, kioskId);
2325
}
2426

2527
@Override
26-
public void onFetchPage(@Nonnull Downloader downloader) throws IOException, ExtractionException {
28+
public void onFetchPage(@Nonnull final Downloader downloader)
29+
throws IOException, ExtractionException {
2730
doc = MediaCCCParsingHelper.getLiveStreams(downloader, getExtractorLocalization());
2831
}
2932

3033
@Nonnull
3134
@Override
3235
public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, ExtractionException {
33-
StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
36+
final StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
3437
for (int c = 0; c < doc.size(); c++) {
3538
final JsonObject conference = doc.getObject(c);
3639
final JsonArray groups = conference.getArray("groups");
@@ -48,7 +51,8 @@ public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, Extrac
4851
}
4952

5053
@Override
51-
public InfoItemsPage<StreamInfoItem> getPage(Page page) throws IOException, ExtractionException {
54+
public InfoItemsPage<StreamInfoItem> getPage(final Page page)
55+
throws IOException, ExtractionException {
5256
return InfoItemsPage.emptyPage();
5357
}
5458

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ public class MediaCCCLiveStreamKioskExtractor implements StreamInfoItemExtractor
1414
private final String group;
1515
private final JsonObject roomInfo;
1616

17-
public MediaCCCLiveStreamKioskExtractor(final JsonObject conferenceInfo, final String group,
17+
public MediaCCCLiveStreamKioskExtractor(final JsonObject conferenceInfo,
18+
final String group,
1819
final JsonObject roomInfo) {
1920
this.conferenceInfo = conferenceInfo;
2021
this.group = group;
@@ -39,7 +40,7 @@ public String getThumbnailUrl() throws ParsingException {
3940
@Override
4041
public StreamType getStreamType() throws ParsingException {
4142
boolean isVideo = false;
42-
for (Object stream : roomInfo.getArray("streams")) {
43+
for (final Object stream : roomInfo.getArray("streams")) {
4344
if ("video".equals(((JsonObject) stream).getString("type"))) {
4445
isVideo = true;
4546
break;
@@ -65,7 +66,8 @@ public long getViewCount() throws ParsingException {
6566

6667
@Override
6768
public String getUploaderName() throws ParsingException {
68-
return conferenceInfo.getString("conference") + " - " + group + " - " + roomInfo.getString("display");
69+
return conferenceInfo.getString("conference") + " - " + group
70+
+ " - " + roomInfo.getString("display");
6971
}
7072

7173
@Override

0 commit comments

Comments
 (0)