yetangitu/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

Merge bb45634089 into fd3f030d0b

Browse source
This commit is contained in:
cp90 2025-09-10 18:46:24 +06:00 • committed by GitHub
commit 5e963e5e5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

42
app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
View file

@ -40,10 +40,12 @@ import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage;
import org.schabi.newpipe.extractor.MetaInfo;
import org.schabi.newpipe.extractor.NewPipe;
import org.schabi.newpipe.extractor.Page;
import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.channel.ChannelInfo;
import org.schabi.newpipe.extractor.channel.tabs.ChannelTabInfo;
import org.schabi.newpipe.extractor.comments.CommentsInfo;
import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
import org.schabi.newpipe.extractor.kiosk.KioskInfo;
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
@ -53,6 +55,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
import org.schabi.newpipe.util.text.TextLinkifier;
import java.lang.reflect.Constructor;
import java.util.Collections;
import java.util.List;
@ -194,7 +197,17 @@ public final class ExtractorHelper {
final String url,
final boolean forceLoad) {
return checkCache(forceLoad, serviceId, url, InfoCache.Type.KIOSK,
Single.fromCallable(() -> KioskInfo.getInfo(NewPipe.getService(serviceId), url)));
Single.fromCallable(() -> {
try {
return KioskInfo.getInfo(NewPipe.getService(serviceId), url);
} catch (final Exception e) {
if (e.getMessage() != null
&& e.getMessage().contains("Could not get channel name")) {
return getKioskInfoFallback(serviceId, url);
}
throw e;
}
}));
}
public static Single<InfoItemsPage<StreamInfoItem>> getMoreKioskItems(final int serviceId,
@ -204,6 +217,33 @@ public final class ExtractorHelper {
KioskInfo.getMoreItems(NewPipe.getService(serviceId), url, nextPage));
}
private static KioskInfo getKioskInfoFallback(final int serviceId, final String url)
throws Exception {
final StreamingService service = NewPipe.getService(serviceId);
final KioskExtractor extractor = service.getKioskList().getExtractorByUrl(url, null);
extractor.fetchPage();
String name;
try {
name = extractor.getName();
} catch (final Exception ignored) {
name = extractor.getId();
}
final Constructor<KioskInfo> constructor = KioskInfo.class
.getDeclaredConstructor(int.class, ListLinkHandler.class, String.class);
constructor.setAccessible(true);
final KioskInfo info = constructor.newInstance(extractor.getServiceId(),
extractor.getLinkHandler(), name);
final org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage<StreamInfoItem> itemsPage =
org.schabi.newpipe.extractor.utils.ExtractorHelper
.getItemsPageOrLogError(info, extractor);
info.setRelatedItems(itemsPage.getItems());
info.setNextPage(itemsPage.getNextPage());
return info;
}
/*//////////////////////////////////////////////////////////////////////////
// Cache
//////////////////////////////////////////////////////////////////////////*/