Skip to content

Commit 5bf2e95

Browse files
committed
Renaming and new fields/methods
- Mainly in PlaylistInfoItem and the collector
1 parent b1eefa0 commit 5bf2e95

16 files changed

Lines changed: 19 additions & 15 deletions

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,12 @@ public enum InfoType {
2929
USER
3030
}
3131

32+
public final InfoType info_type;
33+
3234
public InfoItem(InfoType infoType) {
3335
this.info_type = infoType;
3436
}
3537

36-
public final InfoType info_type;
3738
public int service_id = -1;
3839
public String url;
3940
public String name;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ public enum MediaFormat {
3838
MP3 (0x5, "MP3", "mp3", "audio/mpeg");
3939

4040
public final int id;
41-
@SuppressWarnings("WeakerAccess")
4241
public final String name;
43-
@SuppressWarnings("WeakerAccess")
4442
public final String suffix;
4543
public final String mimeType;
4644

src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItem.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
public class PlaylistInfoItem extends InfoItem {
66

7+
public String uploader_name;
78
public String thumbnail_url;
89
/**
910
* How many streams this playlist have

src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemCollector.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ public PlaylistInfoItem extract(PlaylistInfoItemExtractor extractor) throws Pars
1515
resultItem.service_id = getServiceId();
1616
resultItem.url = extractor.getWebPageUrl();
1717

18+
try {
19+
resultItem.uploader_name = extractor.getUploaderName();
20+
} catch (Exception e) {
21+
addError(e);
22+
}
1823
try {
1924
resultItem.thumbnail_url = extractor.getThumbnailUrl();
2025
} catch (Exception e) {

src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemExtractor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
public interface PlaylistInfoItemExtractor {
66
String getThumbnailUrl() throws ParsingException;
7+
String getUploaderName() throws ParsingException;
78
String getPlaylistName() throws ParsingException;
89
String getWebPageUrl() throws ParsingException;
910
long getStreamCount() throws ParsingException;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public int getDuration() {
2929
}
3030

3131
@Override
32-
public String getUploader() {
32+
public String getUploaderName() {
3333
return searchResult.getJSONObject("user").getString("username");
3434
}
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public int getDuration() throws ParsingException {
239239
}
240240

241241
@Override
242-
public String getUploader() throws ParsingException {
242+
public String getUploaderName() throws ParsingException {
243243
return li.select("div[class=pl-video-owner] a").text();
244244
}
245245

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ public int getDuration() throws ParsingException {
829829
}
830830

831831
@Override
832-
public String getUploader() throws ParsingException {
832+
public String getUploaderName() throws ParsingException {
833833
return li.select("span.g-hovercard").first().text();
834834
}
835835

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public int getDuration() throws ParsingException {
7171
}
7272

7373
@Override
74-
public String getUploader() throws ParsingException {
74+
public String getUploaderName() throws ParsingException {
7575
try {
7676
return item.select("div[class=\"yt-lockup-byline\"]").first()
7777
.select("a").first()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public int getDuration() throws ParsingException {
247247
}
248248

249249
@Override
250-
public String getUploader() throws ParsingException {
250+
public String getUploaderName() throws ParsingException {
251251
return getUserName();
252252
}
253253

0 commit comments

Comments
 (0)