Skip to content

Commit 10f6cc7

Browse files
authored
Merge pull request #755 from litetex/clean-up-yt-dis-likes
Cleanup: Remove old ways of getting YT dis/likes
2 parents fe43242 + 148ba66 commit 10f6cc7

File tree

89 files changed

+2871
-5270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+2871
-5270
lines changed

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,27 +149,24 @@ public List<StreamSegment> getStreamSegments() throws ParsingException {
149149
@Nonnull
150150
@Override
151151
public String getLicence() {
152+
// Contrary to other Bandcamp streams, radio streams don't have a license
152153
return "";
153154
}
154155

155156
@Nonnull
156157
@Override
157158
public String getCategory() {
159+
// Contrary to other Bandcamp streams, radio streams don't have categories
158160
return "";
159161
}
160162

161163
@Nonnull
162164
@Override
163165
public List<String> getTags() {
166+
// Contrary to other Bandcamp streams, radio streams don't have tags
164167
return Collections.emptyList();
165168
}
166169

167-
@Nonnull
168-
@Override
169-
public Privacy getPrivacy() {
170-
return Privacy.PUBLIC;
171-
}
172-
173170
@Override
174171
public PlaylistInfoItemsCollector getRelatedItems() {
175172
// Contrary to other Bandcamp streams, radio streams don't have related items

extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampStreamExtractor.java

Lines changed: 0 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@ public String getUploaderName() {
9898
return albumJson.getString("artist");
9999
}
100100

101-
@Override
102-
public boolean isUploaderVerified() throws ParsingException {
103-
return false;
104-
}
105-
106101
@Nullable
107102
@Override
108103
public String getTextualUploadDate() {
@@ -132,24 +127,6 @@ public String getUploaderAvatarUrl() {
132127
}
133128
}
134129

135-
@Nonnull
136-
@Override
137-
public String getSubChannelUrl() {
138-
return "";
139-
}
140-
141-
@Nonnull
142-
@Override
143-
public String getSubChannelName() {
144-
return "";
145-
}
146-
147-
@Nonnull
148-
@Override
149-
public String getSubChannelAvatarUrl() {
150-
return "";
151-
}
152-
153130
@Nonnull
154131
@Override
155132
public Description getDescription() {
@@ -164,48 +141,6 @@ public Description getDescription() {
164141
return new Description(s, Description.PLAIN_TEXT);
165142
}
166143

167-
@Override
168-
public int getAgeLimit() {
169-
return NO_AGE_LIMIT;
170-
}
171-
172-
@Override
173-
public long getLength() {
174-
return 0;
175-
}
176-
177-
@Override
178-
public long getTimeStamp() {
179-
return 0;
180-
}
181-
182-
@Override
183-
public long getViewCount() {
184-
return -1;
185-
}
186-
187-
@Override
188-
public long getLikeCount() {
189-
return -1;
190-
}
191-
192-
@Override
193-
public long getDislikeCount() {
194-
return -1;
195-
}
196-
197-
@Nonnull
198-
@Override
199-
public String getDashMpdUrl() {
200-
return "";
201-
}
202-
203-
@Nonnull
204-
@Override
205-
public String getHlsUrl() {
206-
return "";
207-
}
208-
209144
@Override
210145
public List<AudioStream> getAudioStreams() {
211146
final List<AudioStream> audioStreams = new ArrayList<>();
@@ -228,18 +163,6 @@ public List<VideoStream> getVideoOnlyStreams() {
228163
return Collections.emptyList();
229164
}
230165

231-
@Nonnull
232-
@Override
233-
public List<SubtitlesStream> getSubtitlesDefault() {
234-
return Collections.emptyList();
235-
}
236-
237-
@Nonnull
238-
@Override
239-
public List<SubtitlesStream> getSubtitles(MediaFormat format) {
240-
return Collections.emptyList();
241-
}
242-
243166
@Override
244167
public StreamType getStreamType() {
245168
return StreamType.AUDIO_STREAM;
@@ -259,23 +182,6 @@ public PlaylistInfoItemsCollector getRelatedItems() {
259182
return collector;
260183
}
261184

262-
@Override
263-
public String getErrorMessage() {
264-
return null;
265-
}
266-
267-
@Nonnull
268-
@Override
269-
public String getHost() {
270-
return "";
271-
}
272-
273-
@Nonnull
274-
@Override
275-
public Privacy getPrivacy() {
276-
return Privacy.PUBLIC;
277-
}
278-
279185
@Nonnull
280186
@Override
281187
public String getCategory() {
@@ -315,12 +221,6 @@ public String getLicence() {
315221
}
316222
}
317223

318-
@Nullable
319-
@Override
320-
public Locale getLanguageInfo() {
321-
return null;
322-
}
323-
324224
@Nonnull
325225
@Override
326226
public List<String> getTags() {
@@ -334,22 +234,4 @@ public List<String> getTags() {
334234

335235
return tags;
336236
}
337-
338-
@Nonnull
339-
@Override
340-
public String getSupportInfo() {
341-
return "";
342-
}
343-
344-
@Nonnull
345-
@Override
346-
public List<StreamSegment> getStreamSegments() throws ParsingException {
347-
return Collections.emptyList();
348-
}
349-
350-
@Nonnull
351-
@Override
352-
public List<MetaInfo> getMetaInfo() throws ParsingException {
353-
return Collections.emptyList();
354-
}
355237
}

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

Lines changed: 0 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,6 @@ public String getName() throws ParsingException {
6060
return room.getString("display");
6161
}
6262

63-
@Nullable
64-
@Override
65-
public String getTextualUploadDate() throws ParsingException {
66-
return null;
67-
}
68-
69-
@Nullable
70-
@Override
71-
public DateWrapper getUploadDate() throws ParsingException {
72-
return null;
73-
}
74-
7563
@Nonnull
7664
@Override
7765
public String getThumbnailUrl() throws ParsingException {
@@ -84,36 +72,11 @@ public Description getDescription() throws ParsingException {
8472
return new Description(conference.getString("description") + " - " + group, Description.PLAIN_TEXT);
8573
}
8674

87-
@Override
88-
public int getAgeLimit() {
89-
return 0;
90-
}
91-
92-
@Override
93-
public long getLength() {
94-
return 0;
95-
}
96-
97-
@Override
98-
public long getTimeStamp() throws ParsingException {
99-
return 0;
100-
}
101-
10275
@Override
10376
public long getViewCount() {
10477
return -1;
10578
}
10679

107-
@Override
108-
public long getLikeCount() {
109-
return -1;
110-
}
111-
112-
@Override
113-
public long getDislikeCount() {
114-
return -1;
115-
}
116-
11780
@Nonnull
11881
@Override
11982
public String getUploaderUrl() throws ParsingException {
@@ -126,41 +89,6 @@ public String getUploaderName() throws ParsingException {
12689
return conference.getString("conference");
12790
}
12891

129-
@Override
130-
public boolean isUploaderVerified() throws ParsingException {
131-
return false;
132-
}
133-
134-
@Nonnull
135-
@Override
136-
public String getUploaderAvatarUrl() {
137-
return "";
138-
}
139-
140-
@Nonnull
141-
@Override
142-
public String getSubChannelUrl() {
143-
return "";
144-
}
145-
146-
@Nonnull
147-
@Override
148-
public String getSubChannelName() {
149-
return "";
150-
}
151-
152-
@Nonnull
153-
@Override
154-
public String getSubChannelAvatarUrl() {
155-
return "";
156-
}
157-
158-
@Nonnull
159-
@Override
160-
public String getDashMpdUrl() throws ParsingException {
161-
return "";
162-
}
163-
16492
@Nonnull
16593
@Override
16694
public String getHlsUrl() {
@@ -221,85 +149,14 @@ public List<VideoStream> getVideoOnlyStreams() {
221149
return null;
222150
}
223151

224-
@Nonnull
225-
@Override
226-
public List<SubtitlesStream> getSubtitlesDefault() {
227-
return Collections.emptyList();
228-
}
229-
230-
@Nonnull
231-
@Override
232-
public List<SubtitlesStream> getSubtitles(MediaFormat format) {
233-
return Collections.emptyList();
234-
}
235-
236152
@Override
237153
public StreamType getStreamType() throws ParsingException {
238154
return StreamType.LIVE_STREAM; // TODO: video and audio only streams are both available
239155
}
240156

241-
@Nullable
242-
@Override
243-
public StreamInfoItemsCollector getRelatedItems() {
244-
return null;
245-
}
246-
247-
@Override
248-
public String getErrorMessage() {
249-
return null;
250-
}
251-
252-
@Nonnull
253-
@Override
254-
public String getHost() {
255-
return "";
256-
}
257-
258-
@Nonnull
259-
@Override
260-
public Privacy getPrivacy() {
261-
return Privacy.PUBLIC;
262-
}
263-
264157
@Nonnull
265158
@Override
266159
public String getCategory() {
267160
return group;
268161
}
269-
270-
@Nonnull
271-
@Override
272-
public String getLicence() {
273-
return "";
274-
}
275-
276-
@Nullable
277-
@Override
278-
public Locale getLanguageInfo() {
279-
return null;
280-
}
281-
282-
@Nonnull
283-
@Override
284-
public List<String> getTags() {
285-
return Collections.emptyList();
286-
}
287-
288-
@Nonnull
289-
@Override
290-
public String getSupportInfo() {
291-
return "";
292-
}
293-
294-
@Nonnull
295-
@Override
296-
public List<StreamSegment> getStreamSegments() {
297-
return Collections.emptyList();
298-
}
299-
300-
@Nonnull
301-
@Override
302-
public List<MetaInfo> getMetaInfo() {
303-
return Collections.emptyList();
304-
}
305162
}

0 commit comments

Comments
 (0)