Skip to content

Commit 0cfefe2

Browse files
committed
Revert "[media.ccc.de] Get conference name from API URL"
This reverts commit d1a0686.
1 parent d1a0686 commit 0cfefe2

2 files changed

Lines changed: 5 additions & 41 deletions

File tree

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.grack.nanojson.JsonObject;
55
import com.grack.nanojson.JsonParser;
66
import com.grack.nanojson.JsonParserException;
7-
87
import org.schabi.newpipe.extractor.Page;
98
import org.schabi.newpipe.extractor.StreamingService;
109
import org.schabi.newpipe.extractor.downloader.Downloader;
@@ -15,16 +14,12 @@
1514
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
1615
import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
1716

18-
import java.io.IOException;
19-
import java.util.HashMap;
20-
import java.util.Map;
21-
2217
import javax.annotation.Nonnull;
18+
import java.io.IOException;
2319

2420
public class MediaCCCRecentKiosk extends KioskExtractor<StreamInfoItem> {
2521

2622
private JsonObject doc;
27-
private final Map<String, String> conferenceNames = new HashMap<>();
2823

2924
public MediaCCCRecentKiosk(StreamingService streamingService, ListLinkHandler linkHandler, String kioskId) {
3025
super(streamingService, linkHandler, kioskId);
@@ -46,9 +41,8 @@ public void onFetchPage(@Nonnull Downloader downloader) throws IOException, Extr
4641
public InfoItemsPage<StreamInfoItem> getInitialPage() throws IOException, ExtractionException {
4742
final JsonArray events = doc.getArray("events");
4843
StreamInfoItemsCollector collector = new StreamInfoItemsCollector(getServiceId());
49-
5044
for (int i = 0; i < events.size(); i++) {
51-
collector.commit(new MediaCCCRecentKioskExtractor(events.getObject(i), conferenceNames));
45+
collector.commit(new MediaCCCRecentKioskExtractor(events.getObject(i)));
5246
}
5347
return new InfoItemsPage<>(collector, null);
5448
}

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

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,22 @@
11
package org.schabi.newpipe.extractor.services.media_ccc.extractors;
22

33
import com.grack.nanojson.JsonObject;
4-
5-
import org.schabi.newpipe.extractor.ServiceList;
6-
import org.schabi.newpipe.extractor.channel.ChannelExtractor;
7-
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
84
import org.schabi.newpipe.extractor.exceptions.ParsingException;
95
import org.schabi.newpipe.extractor.localization.DateWrapper;
106
import org.schabi.newpipe.extractor.services.media_ccc.linkHandler.MediaCCCConferenceLinkHandlerFactory;
117
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
128
import org.schabi.newpipe.extractor.stream.StreamType;
139

14-
import java.io.IOException;
10+
import javax.annotation.Nullable;
1511
import java.time.ZonedDateTime;
1612
import java.time.format.DateTimeFormatter;
17-
import java.util.Map;
18-
19-
import javax.annotation.Nullable;
20-
21-
import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
2213

2314
public class MediaCCCRecentKioskExtractor implements StreamInfoItemExtractor {
2415

2516
private final JsonObject event;
26-
private final Map<String, String> conferenceNames;
2717

28-
public MediaCCCRecentKioskExtractor(final JsonObject event,
29-
final Map<String, String> conferenceNames) {
18+
public MediaCCCRecentKioskExtractor(final JsonObject event) {
3019
this.event = event;
31-
this.conferenceNames = conferenceNames;
3220
}
3321

3422
@Override
@@ -68,25 +56,7 @@ public long getViewCount() throws ParsingException {
6856

6957
@Override
7058
public String getUploaderName() throws ParsingException {
71-
final String conferenceApiUrl = event.getString("conference_url");
72-
if (isNullOrEmpty(conferenceApiUrl)) {
73-
throw new ParsingException("conference url is empty");
74-
}
75-
76-
if (conferenceNames.containsKey(conferenceApiUrl)) {
77-
return conferenceNames.get(conferenceApiUrl);
78-
}
79-
80-
// get conference name from API.
81-
try {
82-
ChannelExtractor extractor = ServiceList.MediaCCC.getChannelExtractor(
83-
new MediaCCCConferenceLinkHandlerFactory().fromUrl(conferenceApiUrl));
84-
extractor.fetchPage();
85-
conferenceNames.put(conferenceApiUrl, extractor.getName());
86-
return extractor.getName();
87-
} catch (IOException | ExtractionException e) {
88-
throw new ParsingException("Could not get conference name from conference API URL", e);
89-
}
59+
return "";
9060
}
9161

9262
@Override

0 commit comments

Comments
 (0)