Skip to content

Commit 70a40e7

Browse files
committed
Description: rm constructor by serviceId
1 parent 26c65b2 commit 70a40e7

5 files changed

Lines changed: 9 additions & 26 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public String getThumbnailUrl() throws ParsingException {
4949
@Nonnull
5050
@Override
5151
public Description getDescription() throws ParsingException {
52-
return new Description(getServiceId(), data.getString("description"));
52+
return new Description(data.getString("description"), Description.PLAIN_TEXT);
5353
}
5454

5555
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public Description getDescription() throws ParsingException {
8383
e.printStackTrace();
8484
}
8585
}
86-
return new Description(getServiceId(), text);
86+
return new Description(text, Description.MARKDOWN);
8787
}
8888

8989
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public String getThumbnailUrl() {
7676

7777
@Override
7878
public Description getDescription() {
79-
return new Description(getServiceId(), track.getString("description"));
79+
return new Description(track.getString("description"), Description.PLAIN_TEXT);
8080
}
8181

8282
@Override

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public Description getDescription() throws ParsingException {
184184
assertPageFetched();
185185
try {
186186
// first try to get html-formatted description
187-
return new Description(getServiceId(), parseHtmlAndGetFullLinks(doc.select("p[id=\"eow-description\"]").first().html()));
187+
return new Description(parseHtmlAndGetFullLinks(doc.select("p[id=\"eow-description\"]").first().html()), Description.HTML);
188188
} catch (Exception e) {
189189
try {
190190
// fallback to raw non-html description

extractor/src/main/java/org/schabi/newpipe/extractor/stream/Description.java

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,24 @@
11
package org.schabi.newpipe.extractor.stream;
22

3-
import static org.schabi.newpipe.extractor.ServiceList.PeerTube;
4-
import static org.schabi.newpipe.extractor.ServiceList.YouTube;
5-
63
public class Description {
7-
private String content;
8-
private int type;
94

105
public static final int HTML = 1;
116
public static final int MARKDOWN = 2;
127
public static final int PLAIN_TEXT = 3;
13-
public static final Description emptyDescription = new Description(PLAIN_TEXT, "");
8+
public static final Description emptyDescription = new Description("", PLAIN_TEXT);
149

15-
public Description(int serviceID, String content) {
16-
if (serviceID == PeerTube.getServiceId()) {
17-
this.type = MARKDOWN;
18-
} else if (serviceID == YouTube.getServiceId()) {
19-
this.type = HTML;
20-
} else {
21-
this.type = PLAIN_TEXT;
22-
}
23-
setContent(content);
24-
}
10+
private String content;
11+
private int type;
2512

26-
private void setContent(String content) {
13+
public Description(String content, int type) {
14+
this.type = type;
2715
if (content == null) {
2816
this.content = "";
2917
} else {
3018
this.content = content;
3119
}
3220
}
3321

34-
public Description(String content, int type) {
35-
this.type = type;
36-
setContent(content);
37-
}
38-
3922
public String getContent() {
4023
return content;
4124
}

0 commit comments

Comments
 (0)