Skip to content

Commit 4e0adbe

Browse files
yausernameyausername
committed
[peertube] use baseUrl instead of global instance url
1 parent 8a7aa6b commit 4e0adbe

5 files changed

Lines changed: 22 additions & 24 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.io.IOException;
44

55
import org.jsoup.helper.StringUtil;
6-
import org.schabi.newpipe.extractor.ServiceList;
76
import org.schabi.newpipe.extractor.StreamingService;
87
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
98
import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -35,9 +34,11 @@ public class PeertubeChannelExtractor extends ChannelExtractor {
3534
private long total;
3635

3736
private JsonObject json;
37+
private final String baseUrl;
3838

39-
public PeertubeChannelExtractor(StreamingService service, ListLinkHandler linkHandler) {
39+
public PeertubeChannelExtractor(StreamingService service, ListLinkHandler linkHandler) throws ParsingException {
4040
super(service, linkHandler);
41+
this.baseUrl = Utils.getBaseUrl(getUrl());
4142
}
4243

4344
@Override
@@ -48,7 +49,7 @@ public String getAvatarUrl() throws ParsingException {
4849
}catch(Exception e) {
4950
value = "/client/assets/images/default-avatar.png";
5051
}
51-
return ServiceList.PeerTube.getBaseUrl() + value;
52+
return baseUrl + value;
5253
}
5354

5455
@Override
@@ -90,7 +91,6 @@ private void collectStreamsFrom(StreamInfoItemsCollector collector, JsonObject j
9091
throw new ParsingException("unable to extract channel streams", e);
9192
}
9293

93-
String baseUrl = Utils.getBaseUrl(getUrl());
9494
for(Object c: contents) {
9595
if(c instanceof JsonObject) {
9696
final JsonObject item = (JsonObject) c;
@@ -183,7 +183,7 @@ public String getName() throws ParsingException {
183183

184184
@Override
185185
public String getOriginalUrl() throws ParsingException {
186-
return ServiceList.PeerTube.getBaseUrl() + "/accounts/" + getId();
186+
return baseUrl + "/accounts/" + getId();
187187
}
188188

189189
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.schabi.newpipe.extractor.exceptions.ParsingException;
88
import org.schabi.newpipe.extractor.localization.DateWrapper;
99
import org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper;
10-
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeChannelLinkHandlerFactory;
1110
import org.schabi.newpipe.extractor.utils.JsonUtils;
1211
import org.schabi.newpipe.extractor.utils.Utils;
1312

@@ -18,10 +17,12 @@ public class PeertubeCommentsInfoItemExtractor implements CommentsInfoItemExtrac
1817

1918
private final JsonObject item;
2019
private final String url;
20+
private final String baseUrl;
2121

22-
public PeertubeCommentsInfoItemExtractor(JsonObject item, String url) {
22+
public PeertubeCommentsInfoItemExtractor(JsonObject item, String url) throws ParsingException {
2323
this.item = item;
2424
this.url = url;
25+
this.baseUrl = Utils.getBaseUrl(url);
2526
}
2627

2728
@Override
@@ -37,7 +38,7 @@ public String getThumbnailUrl() throws ParsingException {
3738
}catch(Exception e) {
3839
value = "/client/assets/images/default-avatar.png";
3940
}
40-
return ServiceList.PeerTube.getBaseUrl() + value;
41+
return baseUrl + value;
4142
}
4243

4344
@Override
@@ -58,7 +59,7 @@ public DateWrapper getPublishedTime() throws ParsingException {
5859

5960
@Override
6061
public int getLikeCount() throws ParsingException {
61-
return 0;
62+
return -1;
6263
}
6364

6465
@Override
@@ -86,7 +87,7 @@ public String getAuthorThumbnail() throws ParsingException {
8687
}catch(Exception e) {
8788
value = "/client/assets/images/default-avatar.png";
8889
}
89-
return ServiceList.PeerTube.getBaseUrl() + value;
90+
return baseUrl + value;
9091
}
9192

9293
@Override
@@ -98,8 +99,7 @@ public String getAuthorName() throws ParsingException {
9899
public String getAuthorEndpoint() throws ParsingException {
99100
String name = JsonUtils.getString(item, "account.name");
100101
String host = JsonUtils.getString(item, "account.host");
101-
String baseUrl = Utils.getBaseUrl(url);
102102
return ServiceList.PeerTube.getChannelLHFactory().fromId(name + "@" + host, baseUrl).getUrl();
103103
}
104104

105-
}
105+
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ public class PeertubeStreamExtractor extends StreamExtractor {
4141

4242
private JsonObject json;
4343
private List<SubtitlesStream> subtitles = new ArrayList<>();
44+
private final String baseUrl;
4445

45-
public PeertubeStreamExtractor(StreamingService service, LinkHandler linkHandler) {
46+
public PeertubeStreamExtractor(StreamingService service, LinkHandler linkHandler) throws ParsingException {
4647
super(service, linkHandler);
48+
this.baseUrl = Utils.getBaseUrl(getUrl());
4749
}
4850

4951
@Override
@@ -64,7 +66,7 @@ public DateWrapper getUploadDate() throws ParsingException {
6466

6567
@Override
6668
public String getThumbnailUrl() throws ParsingException {
67-
return ServiceList.PeerTube.getBaseUrl() + JsonUtils.getString(json, "thumbnailPath");
69+
return baseUrl + JsonUtils.getString(json, "thumbnailPath");
6870
}
6971

7072
@Override
@@ -115,7 +117,6 @@ public long getDislikeCount() throws ParsingException {
115117
public String getUploaderUrl() throws ParsingException {
116118
String name = JsonUtils.getString(json, "account.name");
117119
String host = JsonUtils.getString(json, "account.host");
118-
String baseUrl = Utils.getBaseUrl(getUrl());
119120
return getService().getChannelLHFactory().fromId(name + "@" + host, baseUrl).getUrl();
120121
}
121122

@@ -132,7 +133,7 @@ public String getUploaderAvatarUrl() throws ParsingException {
132133
}catch(Exception e) {
133134
value = "/client/assets/images/default-avatar.png";
134135
}
135-
return ServiceList.PeerTube.getBaseUrl() + value;
136+
return baseUrl + value;
136137
}
137138

138139
@Override
@@ -233,7 +234,7 @@ private List<String> getTags(){
233234
}
234235

235236
private String getRelatedStreamsUrl(List<String> tags) throws UnsupportedEncodingException {
236-
String url = ServiceList.PeerTube.getBaseUrl() + PeertubeSearchQueryHandlerFactory.SEARCH_ENDPOINT;
237+
String url = baseUrl + PeertubeSearchQueryHandlerFactory.SEARCH_ENDPOINT;
237238
StringBuilder params = new StringBuilder();
238239
params.append("start=0&count=8&sort=-createdAt");
239240
for(String tag : tags) {
@@ -267,7 +268,6 @@ private void collectStreamsFrom(StreamInfoItemsCollector collector, JsonObject j
267268
throw new ParsingException("unable to extract related videos", e);
268269
}
269270

270-
String baseUrl = Utils.getBaseUrl(getUrl());
271271
for(Object c: contents) {
272272
if(c instanceof JsonObject) {
273273
final JsonObject item = (JsonObject) c;
@@ -316,7 +316,7 @@ private void loadSubtitles() {
316316
for(Object c: captions) {
317317
if(c instanceof JsonObject) {
318318
JsonObject caption = (JsonObject)c;
319-
String url = ServiceList.PeerTube.getBaseUrl() + JsonUtils.getString(caption, "captionPath");
319+
String url = baseUrl + JsonUtils.getString(caption, "captionPath");
320320
String languageCode = JsonUtils.getString(caption, "language.id");
321321
String ext = url.substring(url.lastIndexOf(".") + 1);
322322
MediaFormat fmt = MediaFormat.getFromSuffix(ext);
@@ -336,7 +336,7 @@ public String getName() throws ParsingException {
336336

337337
@Override
338338
public String getOriginalUrl() throws ParsingException {
339-
return ServiceList.PeerTube.getBaseUrl() + "/videos/watch/" + getId();
339+
return baseUrl + "/videos/watch/" + getId();
340340
}
341341

342342
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import org.schabi.newpipe.extractor.exceptions.ParsingException;
55
import org.schabi.newpipe.extractor.localization.DateWrapper;
66
import org.schabi.newpipe.extractor.services.peertube.PeertubeParsingHelper;
7-
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeChannelLinkHandlerFactory;
8-
import org.schabi.newpipe.extractor.services.peertube.linkHandler.PeertubeStreamLinkHandlerFactory;
97
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
108
import org.schabi.newpipe.extractor.stream.StreamType;
119
import org.schabi.newpipe.extractor.utils.JsonUtils;
@@ -31,7 +29,7 @@ public String getUrl() throws ParsingException {
3129
@Override
3230
public String getThumbnailUrl() throws ParsingException {
3331
String value = JsonUtils.getString(item, "thumbnailPath");
34-
return ServiceList.PeerTube.getBaseUrl() + value;
32+
return baseUrl + value;
3533
}
3634

3735
@Override

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeCommentsExtractorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void testGetCommentsAllData() throws IOException, ExtractionException {
7373
assertFalse(StringUtil.isBlank(c.getTextualPublishedTime()));
7474
assertFalse(StringUtil.isBlank(c.getThumbnailUrl()));
7575
assertFalse(StringUtil.isBlank(c.getUrl()));
76-
assertFalse(c.getLikeCount() == -1);
76+
assertFalse(c.getLikeCount() != -1);
7777
}
7878
}
7979

0 commit comments

Comments
 (0)