Skip to content

Commit 9ab32cb

Browse files
Stypoxlitetex
Stypox
authored and
litetex
committed
[Peertube] Fix checkstyle issues
1 parent 9f7e06c commit 9ab32cb

18 files changed

Lines changed: 378 additions & 243 deletions

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeInstance.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.grack.nanojson.JsonParserException;
66

77
import org.schabi.newpipe.extractor.NewPipe;
8-
import org.schabi.newpipe.extractor.downloader.Downloader;
98
import org.schabi.newpipe.extractor.downloader.Response;
109
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1110
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
@@ -18,14 +17,15 @@ public class PeertubeInstance {
1817

1918
private final String url;
2019
private String name;
21-
public static final PeertubeInstance defaultInstance = new PeertubeInstance("https://framatube.org", "FramaTube");
20+
public static final PeertubeInstance DEFAULT_INSTANCE
21+
= new PeertubeInstance("https://framatube.org", "FramaTube");
2222

23-
public PeertubeInstance(String url) {
23+
public PeertubeInstance(final String url) {
2424
this.url = url;
2525
this.name = "PeerTube";
2626
}
2727

28-
public PeertubeInstance(String url, String name) {
28+
public PeertubeInstance(final String url, final String name) {
2929
this.url = url;
3030
this.name = name;
3131
}
@@ -35,11 +35,9 @@ public String getUrl() {
3535
}
3636

3737
public void fetchInstanceMetaData() throws Exception {
38-
Downloader downloader = NewPipe.getDownloader();
39-
Response response = null;
40-
38+
final Response response;
4139
try {
42-
response = downloader.get(url + "/api/v1/config");
40+
response = NewPipe.getDownloader().get(url + "/api/v1/config");
4341
} catch (ReCaptchaException | IOException e) {
4442
throw new Exception("unable to configure instance " + url, e);
4543
}
@@ -49,7 +47,7 @@ public void fetchInstanceMetaData() throws Exception {
4947
}
5048

5149
try {
52-
JsonObject json = JsonParser.object().from(response.responseBody());
50+
final JsonObject json = JsonParser.object().from(response.responseBody());
5351
this.name = JsonUtils.getString(json, "instance.name");
5452
} catch (JsonParserException | ParsingException e) {
5553
throw new Exception("unable to parse instance config", e);

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/PeertubeParsingHelper.java‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.time.ZoneOffset;
1818
import java.time.format.DateTimeParseException;
1919

20-
public class PeertubeParsingHelper {
20+
public final class PeertubeParsingHelper {
2121
public static final String START_KEY = "start";
2222
public static final String COUNT_KEY = "count";
2323
public static final int ITEMS_PER_PAGE = 12;
@@ -33,10 +33,11 @@ public static void validate(final JsonObject json) throws ContentNotAvailableExc
3333
}
3434
}
3535

36-
public static OffsetDateTime parseDateFrom(final String textualUploadDate) throws ParsingException {
36+
public static OffsetDateTime parseDateFrom(final String textualUploadDate)
37+
throws ParsingException {
3738
try {
3839
return OffsetDateTime.ofInstant(Instant.parse(textualUploadDate), ZoneOffset.UTC);
39-
} catch (DateTimeParseException e) {
40+
} catch (final DateTimeParseException e) {
4041
throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"", e);
4142
}
4243
}
@@ -45,25 +46,31 @@ public static Page getNextPage(final String prevPageUrl, final long total) {
4546
final String prevStart;
4647
try {
4748
prevStart = Parser.matchGroup1(START_PATTERN, prevPageUrl);
48-
} catch (Parser.RegexException e) {
49+
} catch (final Parser.RegexException e) {
4950
return null;
5051
}
51-
if (Utils.isBlank(prevStart)) return null;
52+
if (Utils.isBlank(prevStart)) {
53+
return null;
54+
}
55+
5256
final long nextStart;
5357
try {
5458
nextStart = Long.parseLong(prevStart) + ITEMS_PER_PAGE;
55-
} catch (NumberFormatException e) {
59+
} catch (final NumberFormatException e) {
5660
return null;
5761
}
5862

5963
if (nextStart >= total) {
6064
return null;
6165
} else {
62-
return new Page(prevPageUrl.replace(START_KEY + "=" + prevStart, START_KEY + "=" + nextStart));
66+
return new Page(prevPageUrl.replace(
67+
START_KEY + "=" + prevStart, START_KEY + "=" + nextStart));
6368
}
6469
}
6570

66-
public static void collectStreamsFrom(final InfoItemsCollector collector, final JsonObject json, final String baseUrl) throws ParsingException {
71+
public static void collectStreamsFrom(final InfoItemsCollector collector,
72+
final JsonObject json,
73+
final String baseUrl) throws ParsingException {
6774
collectStreamsFrom(collector, json, baseUrl, false);
6875
}
6976

@@ -74,13 +81,15 @@ public static void collectStreamsFrom(final InfoItemsCollector collector, final
7481
* @param json the file to retrieve data from
7582
* @param baseUrl the base Url of the instance
7683
* @param sepia if we should use PeertubeSepiaStreamInfoItemExtractor
77-
* @throws ParsingException
7884
*/
79-
public static void collectStreamsFrom(final InfoItemsCollector collector, final JsonObject json, final String baseUrl, boolean sepia) throws ParsingException {
85+
public static void collectStreamsFrom(final InfoItemsCollector collector,
86+
final JsonObject json,
87+
final String baseUrl,
88+
final boolean sepia) throws ParsingException {
8089
final JsonArray contents;
8190
try {
8291
contents = (JsonArray) JsonUtils.getValue(json, "data");
83-
} catch (Exception e) {
92+
} catch (final Exception e) {
8493
throw new ParsingException("Unable to extract list info", e);
8594
}
8695

@@ -93,7 +102,7 @@ public static void collectStreamsFrom(final InfoItemsCollector collector, final
93102
item = item.getObject("video");
94103
}
95104

96-
PeertubeStreamInfoItemExtractor extractor;
105+
final PeertubeStreamInfoItemExtractor extractor;
97106
if (sepia) {
98107
extractor = new PeertubeSepiaStreamInfoItemExtractor(item, baseUrl);
99108
} else {

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

Lines changed: 46 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,51 @@
11
package org.schabi.newpipe.extractor.services.peertube;
22

3+
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
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;
9-
import org.schabi.newpipe.extractor.linkhandler.*;
12+
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
13+
import org.schabi.newpipe.extractor.linkhandler.LinkHandlerFactory;
14+
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
15+
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandlerFactory;
16+
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandler;
17+
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
1018
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
1119
import org.schabi.newpipe.extractor.search.SearchExtractor;
12-
import org.schabi.newpipe.extractor.services.peertube.extractors.*;
13-
import org.schabi.newpipe.extractor.services.peertube.linkHandler.*;
20+
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeAccountExtractor;
21+
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeChannelExtractor;
22+
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeCommentsExtractor;
23+
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubePlaylistExtractor;
24+
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeSearchExtractor;
25+
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeStreamExtractor;
26+
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeSuggestionExtractor;
27+
import org.schabi.newpipe.extractor.services.peertube.extractors.PeertubeTrendingExtractor;
28+
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeChannelLinkHandlerFactory;
29+
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeCommentsLinkHandlerFactory;
30+
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubePlaylistLinkHandlerFactory;
31+
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeSearchQueryHandlerFactory;
32+
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeStreamLinkHandlerFactory;
33+
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeTrendingLinkHandlerFactory;
1434
import org.schabi.newpipe.extractor.stream.StreamExtractor;
1535
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
1636
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
1737

1838
import java.util.List;
1939

20-
import static java.util.Arrays.asList;
21-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.COMMENTS;
22-
import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
23-
2440
public class PeertubeService extends StreamingService {
2541

2642
private PeertubeInstance instance;
2743

28-
public PeertubeService(int id) {
29-
this(id, PeertubeInstance.defaultInstance);
44+
public PeertubeService(final int id) {
45+
this(id, PeertubeInstance.DEFAULT_INSTANCE);
3046
}
3147

32-
public PeertubeService(int id, PeertubeInstance instance) {
48+
public PeertubeService(final int id, final PeertubeInstance instance) {
3349
super(id, "PeerTube", asList(VIDEO, COMMENTS));
3450
this.instance = instance;
3551
}
@@ -60,13 +76,10 @@ public ListLinkHandlerFactory getCommentsLHFactory() {
6076
}
6177

6278
@Override
63-
public SearchExtractor getSearchExtractor(SearchQueryHandler queryHandler) {
79+
public SearchExtractor getSearchExtractor(final SearchQueryHandler queryHandler) {
6480
final List<String> contentFilters = queryHandler.getContentFilters();
65-
boolean external = false;
66-
if (!contentFilters.isEmpty() && contentFilters.get(0).startsWith("sepia_")) {
67-
external = true;
68-
}
69-
return new PeertubeSearchExtractor(this, queryHandler, external);
81+
return new PeertubeSearchExtractor(this, queryHandler,
82+
!contentFilters.isEmpty() && contentFilters.get(0).startsWith("sepia_"));
7083
}
7184

7285
@Override
@@ -80,7 +93,7 @@ public SubscriptionExtractor getSubscriptionExtractor() {
8093
}
8194

8295
@Override
83-
public ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler)
96+
public ChannelExtractor getChannelExtractor(final ListLinkHandler linkHandler)
8497
throws ExtractionException {
8598

8699
if (linkHandler.getUrl().contains("/video-channels/")) {
@@ -91,19 +104,19 @@ public ChannelExtractor getChannelExtractor(ListLinkHandler linkHandler)
91104
}
92105

93106
@Override
94-
public PlaylistExtractor getPlaylistExtractor(ListLinkHandler linkHandler)
107+
public PlaylistExtractor getPlaylistExtractor(final ListLinkHandler linkHandler)
95108
throws ExtractionException {
96109
return new PeertubePlaylistExtractor(this, linkHandler);
97110
}
98111

99112
@Override
100-
public StreamExtractor getStreamExtractor(LinkHandler linkHandler)
113+
public StreamExtractor getStreamExtractor(final LinkHandler linkHandler)
101114
throws ExtractionException {
102115
return new PeertubeStreamExtractor(this, linkHandler);
103116
}
104117

105118
@Override
106-
public CommentsExtractor getCommentsExtractor(ListLinkHandler linkHandler)
119+
public CommentsExtractor getCommentsExtractor(final ListLinkHandler linkHandler)
107120
throws ExtractionException {
108121
return new PeertubeCommentsExtractor(this, linkHandler);
109122
}
@@ -117,34 +130,31 @@ public PeertubeInstance getInstance() {
117130
return this.instance;
118131
}
119132

120-
public void setInstance(PeertubeInstance instance) {
133+
public void setInstance(final PeertubeInstance instance) {
121134
this.instance = instance;
122135
}
123136

124137
@Override
125138
public KioskList getKioskList() throws ExtractionException {
126-
KioskList.KioskExtractorFactory kioskFactory = new KioskList.KioskExtractorFactory() {
127-
@Override
128-
public KioskExtractor createNewKiosk(StreamingService streamingService,
129-
String url,
130-
String id)
131-
throws ExtractionException {
132-
return new PeertubeTrendingExtractor(PeertubeService.this,
133-
new PeertubeTrendingLinkHandlerFactory().fromId(id), id);
134-
}
135-
};
136-
137-
KioskList list = new KioskList(this);
139+
final KioskList.KioskExtractorFactory kioskFactory = (streamingService, url, id) ->
140+
new PeertubeTrendingExtractor(
141+
PeertubeService.this,
142+
new PeertubeTrendingLinkHandlerFactory().fromId(id),
143+
id
144+
);
145+
146+
final KioskList list = new KioskList(this);
138147

139148
// add kiosks here e.g.:
140149
final PeertubeTrendingLinkHandlerFactory h = new PeertubeTrendingLinkHandlerFactory();
141150
try {
142151
list.addKioskEntry(kioskFactory, h, PeertubeTrendingLinkHandlerFactory.KIOSK_TRENDING);
143-
list.addKioskEntry(kioskFactory, h, PeertubeTrendingLinkHandlerFactory.KIOSK_MOST_LIKED);
152+
list.addKioskEntry(kioskFactory, h,
153+
PeertubeTrendingLinkHandlerFactory.KIOSK_MOST_LIKED);
144154
list.addKioskEntry(kioskFactory, h, PeertubeTrendingLinkHandlerFactory.KIOSK_RECENT);
145155
list.addKioskEntry(kioskFactory, h, PeertubeTrendingLinkHandlerFactory.KIOSK_LOCAL);
146156
list.setDefaultKiosk(PeertubeTrendingLinkHandlerFactory.KIOSK_TRENDING);
147-
} catch (Exception e) {
157+
} catch (final Exception e) {
148158
throw new ExtractionException(e);
149159
}
150160

0 commit comments

Comments
 (0)