Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup: Remove old ways of getting YT dis/likes #755

Merged
merged 6 commits into from
Dec 27, 2021
Merged

Cleanup: Remove old ways of getting YT dis/likes #755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15b98ff
Remove old ways of getting YT dis/likes
litetex Nov 30, 2021
1e2e002
[StreamExtractor] Deduplicated a ton of code by using default methods
litetex Dec 27, 2021
65687f3
Removed YT dislike count as it no longer works
litetex Dec 27, 2021
a6961c5
Fixed NumberFormatException when processing likes
litetex Dec 27, 2021
4d0a689
Disabled dislike count in tests
litetex Dec 27, 2021
148ba66
Updated mock data
litetex Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...g/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,27 +149,24 @@ public List<StreamSegment> getStreamSegments() throws ParsingException {
@Nonnull
@Override
public String getLicence() {
// Contrary to other Bandcamp streams, radio streams don't have a license
return "";
}

@Nonnull
@Override
public String getCategory() {
// Contrary to other Bandcamp streams, radio streams don't have categories
return "";
}

@Nonnull
@Override
public List<String> getTags() {
// Contrary to other Bandcamp streams, radio streams don't have tags
return Collections.emptyList();
}

@Nonnull
@Override
public Privacy getPrivacy() {
return Privacy.PUBLIC;
}

@Override
public PlaylistInfoItemsCollector getRelatedItems() {
// Contrary to other Bandcamp streams, radio streams don't have related items
Expand Down
118 changes: 0 additions & 118 deletions ...va/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@ public String getUploaderName() {
return albumJson.getString("artist");
}

@Override
public boolean isUploaderVerified() throws ParsingException {
return false;
}

@Nullable
@Override
public String getTextualUploadDate() {
Expand Down Expand Up @@ -132,24 +127,6 @@ public String getUploaderAvatarUrl() {
}
}

@Nonnull
@Override
public String getSubChannelUrl() {
return "";
}

@Nonnull
@Override
public String getSubChannelName() {
return "";
}

@Nonnull
@Override
public String getSubChannelAvatarUrl() {
return "";
}

@Nonnull
@Override
public Description getDescription() {
Expand All @@ -164,48 +141,6 @@ public Description getDescription() {
return new Description(s, Description.PLAIN_TEXT);
}

@Override
public int getAgeLimit() {
return NO_AGE_LIMIT;
}

@Override
public long getLength() {
return 0;
}

@Override
public long getTimeStamp() {
return 0;
}

@Override
public long getViewCount() {
return -1;
}

@Override
public long getLikeCount() {
return -1;
}

@Override
public long getDislikeCount() {
return -1;
}

@Nonnull
@Override
public String getDashMpdUrl() {
return "";
}

@Nonnull
@Override
public String getHlsUrl() {
return "";
}

@Override
public List<AudioStream> getAudioStreams() {
final List<AudioStream> audioStreams = new ArrayList<>();
Expand All @@ -228,18 +163,6 @@ public List<VideoStream> getVideoOnlyStreams() {
return Collections.emptyList();
}

@Nonnull
@Override
public List<SubtitlesStream> getSubtitlesDefault() {
return Collections.emptyList();
}

@Nonnull
@Override
public List<SubtitlesStream> getSubtitles(MediaFormat format) {
return Collections.emptyList();
}

@Override
public StreamType getStreamType() {
return StreamType.AUDIO_STREAM;
Expand All @@ -259,23 +182,6 @@ public PlaylistInfoItemsCollector getRelatedItems() {
return collector;
}

@Override
public String getErrorMessage() {
return null;
}

@Nonnull
@Override
public String getHost() {
return "";
}

@Nonnull
@Override
public Privacy getPrivacy() {
return Privacy.PUBLIC;
}

@Nonnull
@Override
public String getCategory() {
Expand Down Expand Up @@ -315,12 +221,6 @@ public String getLicence() {
}
}

@Nullable
@Override
public Locale getLanguageInfo() {
return null;
}

@Nonnull
@Override
public List<String> getTags() {
Expand All @@ -334,22 +234,4 @@ public List<String> getTags() {

return tags;
}

@Nonnull
@Override
public String getSupportInfo() {
return "";
}

@Nonnull
@Override
public List<StreamSegment> getStreamSegments() throws ParsingException {
return Collections.emptyList();
}

@Nonnull
@Override
public List<MetaInfo> getMetaInfo() throws ParsingException {
return Collections.emptyList();
}
}
143 changes: 0 additions & 143 deletions ...g/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,6 @@ public String getName() throws ParsingException {
return room.getString("display");
}

@Nullable
@Override
public String getTextualUploadDate() throws ParsingException {
return null;
}

@Nullable
@Override
public DateWrapper getUploadDate() throws ParsingException {
return null;
}

@Nonnull
@Override
public String getThumbnailUrl() throws ParsingException {
Expand All @@ -84,36 +72,11 @@ public Description getDescription() throws ParsingException {
return new Description(conference.getString("description") + " - " + group, Description.PLAIN_TEXT);
}

@Override
public int getAgeLimit() {
return 0;
}

@Override
public long getLength() {
return 0;
}

@Override
public long getTimeStamp() throws ParsingException {
return 0;
}

@Override
public long getViewCount() {
return -1;
}

@Override
public long getLikeCount() {
return -1;
}

@Override
public long getDislikeCount() {
return -1;
}

@Nonnull
@Override
public String getUploaderUrl() throws ParsingException {
Expand All @@ -126,41 +89,6 @@ public String getUploaderName() throws ParsingException {
return conference.getString("conference");
}

@Override
public boolean isUploaderVerified() throws ParsingException {
return false;
}

@Nonnull
@Override
public String getUploaderAvatarUrl() {
return "";
}

@Nonnull
@Override
public String getSubChannelUrl() {
return "";
}

@Nonnull
@Override
public String getSubChannelName() {
return "";
}

@Nonnull
@Override
public String getSubChannelAvatarUrl() {
return "";
}

@Nonnull
@Override
public String getDashMpdUrl() throws ParsingException {
return "";
}

@Nonnull
@Override
public String getHlsUrl() {
Expand Down Expand Up @@ -221,85 +149,14 @@ public List<VideoStream> getVideoOnlyStreams() {
return null;
}

@Nonnull
@Override
public List<SubtitlesStream> getSubtitlesDefault() {
return Collections.emptyList();
}

@Nonnull
@Override
public List<SubtitlesStream> getSubtitles(MediaFormat format) {
return Collections.emptyList();
}

@Override
public StreamType getStreamType() throws ParsingException {
return StreamType.LIVE_STREAM; // TODO: video and audio only streams are both available
}

@Nullable
@Override
public StreamInfoItemsCollector getRelatedItems() {
return null;
}

@Override
public String getErrorMessage() {
return null;
}

@Nonnull
@Override
public String getHost() {
return "";
}

@Nonnull
@Override
public Privacy getPrivacy() {
return Privacy.PUBLIC;
}

@Nonnull
@Override
public String getCategory() {
return group;
}

@Nonnull
@Override
public String getLicence() {
return "";
}

@Nullable
@Override
public Locale getLanguageInfo() {
return null;
}

@Nonnull
@Override
public List<String> getTags() {
return Collections.emptyList();
}

@Nonnull
@Override
public String getSupportInfo() {
return "";
}

@Nonnull
@Override
public List<StreamSegment> getStreamSegments() {
return Collections.emptyList();
}

@Nonnull
@Override
public List<MetaInfo> getMetaInfo() {
return Collections.emptyList();
}
}
Loading