Merge pull request #8531 from litetex/fix-extractor-compile-errors-846

Updated extractor to latest revision and fix compile errors
2024-11-22 02:53:09 +01:00 · 2022-07-04 23:16:55 +02:00 · 2022-07-04 23:16:55 +02:00 · 81369d7e04
commit 81369d7e04
parent 45d2492bcb ad97b3d995
10 changed files with 70 additions and 68 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -190,7 +190,7 @@ dependencies {
    // name and the commit hash with the commit hash of the (pushed) commit you want to test
    // This works thanks to JitPack: https://jitpack.io/
    implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:1b51eab664ec7cbd2295c96d8b43000379cd1b7b'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:a26bcc55c47f169e21c994f28b22f8edcb6f19bf'

 /** Checkstyle **/
    checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
--- a/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorInfo.kt
@ -7,13 +7,13 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.Info
-import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
 import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException
 import org.schabi.newpipe.extractor.exceptions.ExtractionException
 import org.schabi.newpipe.extractor.services.youtube.extractors.YoutubeStreamExtractor.DeobfuscateException
 import org.schabi.newpipe.ktx.isNetworkRelated
+import org.schabi.newpipe.util.ServiceHelper
 import java.io.PrintWriter
 import java.io.StringWriter

@ -65,7 +65,7 @@ class ErrorInfo(
    constructor(throwable: Throwable, userAction: UserAction, request: String) :
        this(throwable, userAction, SERVICE_NONE, request)
    constructor(throwable: Throwable, userAction: UserAction, request: String, serviceId: Int) :
-        this(throwable, userAction, NewPipe.getNameOfService(serviceId), request)
+        this(throwable, userAction, ServiceHelper.getNameOfServiceById(serviceId), request)
    constructor(throwable: Throwable, userAction: UserAction, request: String, info: Info?) :
        this(throwable, userAction, getInfoServiceName(info), request)

@ -73,7 +73,7 @@ class ErrorInfo(
    constructor(throwable: List<Throwable>, userAction: UserAction, request: String) :
        this(throwable, userAction, SERVICE_NONE, request)
    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, serviceId: Int) :
-        this(throwable, userAction, NewPipe.getNameOfService(serviceId), request)
+        this(throwable, userAction, ServiceHelper.getNameOfServiceById(serviceId), request)
    constructor(throwable: List<Throwable>, userAction: UserAction, request: String, info: Info?) :
        this(throwable, userAction, getInfoServiceName(info), request)

@ -95,7 +95,7 @@ class ErrorInfo(
            Array(throwable.size) { i -> getStackTrace(throwable[i]) }

        private fun getInfoServiceName(info: Info?) =
-            if (info == null) SERVICE_NONE else NewPipe.getNameOfService(info.serviceId)
+            if (info == null) SERVICE_NONE else ServiceHelper.getNameOfServiceById(info.serviceId)

        @StringRes
        private fun getMessageStringId(
--- a/app/src/main/java/org/schabi/newpipe/error/ErrorPanelHelper.kt
+++ b/app/src/main/java/org/schabi/newpipe/error/ErrorPanelHelper.kt
@ -15,7 +15,6 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.disposables.Disposable
 import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.R
-import org.schabi.newpipe.extractor.NewPipe
 import org.schabi.newpipe.extractor.exceptions.AccountTerminatedException
 import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException
@ -106,7 +105,7 @@ class ErrorPanelHelper(
            if (!isNullOrEmpty((errorInfo.throwable as AccountTerminatedException).message)) {
                errorServiceInfoTextView.text = context.resources.getString(
                    R.string.service_provides_reason,
-                    NewPipe.getNameOfService(ServiceHelper.getSelectedServiceId(context))
+                    ServiceHelper.getSelectedService(context)?.serviceInfo?.name ?: "<unknown>"
                )
                errorServiceInfoTextView.isVisible = true

--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java
@ -11,12 +11,12 @@ import androidx.core.content.ContextCompat;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.views.AnimatedProgressBar;

 import java.time.format.DateTimeFormatter;
@ -59,7 +59,7 @@ public class LocalPlaylistStreamItemHolder extends LocalItemHolder {
        itemVideoTitleView.setText(item.getStreamEntity().getTitle());
        itemAdditionalDetailsView.setText(Localization
                .concatenateStrings(item.getStreamEntity().getUploader(),
-                        NewPipe.getNameOfService(item.getStreamEntity().getServiceId())));
+                        ServiceHelper.getNameOfServiceById(item.getStreamEntity().getServiceId())));

        if (item.getStreamEntity().getDuration() > 0) {
            itemDurationView.setText(Localization
--- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java
@ -11,12 +11,12 @@ import androidx.core.content.ContextCompat;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.stream.StreamStatisticsEntry;
-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.ktx.ViewUtils;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.views.AnimatedProgressBar;

 import java.time.format.DateTimeFormatter;
@ -70,11 +70,12 @@ public class LocalStatisticStreamItemHolder extends LocalItemHolder {

    private String getStreamInfoDetailLine(final StreamStatisticsEntry entry,
                                           final DateTimeFormatter dateTimeFormatter) {
-        final String watchCount = Localization
-                .shortViewCount(itemBuilder.getContext(), entry.getWatchCount());
-        final String uploadDate = dateTimeFormatter.format(entry.getLatestAccessDate());
-        final String serviceName = NewPipe.getNameOfService(entry.getStreamEntity().getServiceId());
-        return Localization.concatenateStrings(watchCount, uploadDate, serviceName);
+        return Localization.concatenateStrings(
+                // watchCount
+                Localization.shortViewCount(itemBuilder.getContext(), entry.getWatchCount()),
+                dateTimeFormatter.format(entry.getLatestAccessDate()),
+                // serviceName
+                ServiceHelper.getNameOfServiceById(entry.getStreamEntity().getServiceId()));
    }

    @Override
--- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java
@ -5,11 +5,11 @@ import android.view.ViewGroup;

 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity;
-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.local.LocalItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.ServiceHelper;

 import java.time.format.DateTimeFormatter;

@ -39,9 +39,9 @@ public class RemotePlaylistItemHolder extends PlaylistItemHolder {
        // Here is where the uploader name is set in the bookmarked playlists library
        if (!TextUtils.isEmpty(item.getUploader())) {
            itemUploaderView.setText(Localization.concatenateStrings(item.getUploader(),
-                    NewPipe.getNameOfService(item.getServiceId())));
+                    ServiceHelper.getNameOfServiceById(item.getServiceId())));
        } else {
-            itemUploaderView.setText(NewPipe.getNameOfService(item.getServiceId()));
+            itemUploaderView.setText(ServiceHelper.getNameOfServiceById(item.getServiceId()));
        }

        PicassoHelper.loadPlaylistThumbnail(item.getThumbnailUrl()).into(itemThumbnailView);
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java
@ -1,5 +1,11 @@
 package org.schabi.newpipe.local.subscription;

+import static org.schabi.newpipe.extractor.subscription.SubscriptionExtractor.ContentSource.CHANNEL_URL;
+import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.CHANNEL_URL_MODE;
+import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.INPUT_STREAM_MODE;
+import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE;
+import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@ -40,12 +46,6 @@ import java.util.List;

 import icepick.State;

-import static org.schabi.newpipe.extractor.subscription.SubscriptionExtractor.ContentSource.CHANNEL_URL;
-import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.CHANNEL_URL_MODE;
-import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.INPUT_STREAM_MODE;
-import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_MODE;
-import static org.schabi.newpipe.local.subscription.services.SubscriptionsImportService.KEY_VALUE;
-
 public class SubscriptionsImportFragment extends BaseFragment {
    @State
    int currentServiceId = Constants.NO_SERVICE_ID;
@ -89,7 +89,7 @@ public class SubscriptionsImportFragment extends BaseFragment {
        if (supportedSources.isEmpty() && currentServiceId != Constants.NO_SERVICE_ID) {
            ErrorUtil.showSnackbar(activity,
                    new ErrorInfo(new String[]{}, UserAction.SUBSCRIPTION_IMPORT_EXPORT,
-                            NewPipe.getNameOfService(currentServiceId),
+                            ServiceHelper.getNameOfServiceById(currentServiceId),
                            "Service does not support importing subscriptions",
                            R.string.general_error));
            activity.finish();
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemBuilder.java
@ -5,9 +5,9 @@ import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;

-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.PicassoHelper;
+import org.schabi.newpipe.util.ServiceHelper;

 public class PlayQueueItemBuilder {
    private static final String TAG = PlayQueueItemBuilder.class.toString();
@ -25,7 +25,7 @@ public class PlayQueueItemBuilder {
            holder.itemVideoTitleView.setText(item.getTitle());
        }
        holder.itemAdditionalDetailsView.setText(Localization.concatenateStrings(item.getUploader(),
-                NewPipe.getNameOfService(item.getServiceId())));
+                ServiceHelper.getNameOfServiceById(item.getServiceId())));

        if (item.getDuration() > 0) {
            holder.itemDurationView.setText(Localization.getDurationString(item.getDuration()));
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
@ -1,5 +1,8 @@
 package org.schabi.newpipe.settings.tabs;

+import static org.schabi.newpipe.settings.tabs.Tab.typeFrom;
+import static org.schabi.newpipe.util.ServiceHelper.getNameOfServiceById;
+
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.content.Context;
@ -28,7 +31,6 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorInfo;
 import org.schabi.newpipe.error.ErrorUtil;
 import org.schabi.newpipe.error.UserAction;
-import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.settings.SelectChannelFragment;
 import org.schabi.newpipe.settings.SelectKioskFragment;
 import org.schabi.newpipe.settings.SelectPlaylistFragment;
@ -39,8 +41,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-import static org.schabi.newpipe.settings.tabs.Tab.typeFrom;
-
 public class ChooseTabsFragment extends Fragment {
    private TabsManager tabsManager;

@ -374,36 +374,31 @@ public class ChooseTabsFragment extends Fragment {
                    return;
                }

-                final String tabName;
+                tabNameView.setText(getTabName(type, tab));
+                tabIconView.setImageResource(tab.getTabIconRes(requireContext()));
+            }
+
+            private String getTabName(@NonNull final Tab.Type type, @NonNull final Tab tab) {
                switch (type) {
                    case BLANK:
-                        tabName = getString(R.string.blank_page_summary);
-                        break;
+                        return getString(R.string.blank_page_summary);
                    case DEFAULT_KIOSK:
-                        tabName = getString(R.string.default_kiosk_page_summary);
-                        break;
+                        return getString(R.string.default_kiosk_page_summary);
                    case KIOSK:
-                        tabName = NewPipe.getNameOfService(((Tab.KioskTab) tab)
-                                .getKioskServiceId()) + "/" + tab.getTabName(requireContext());
-                        break;
+                        return getNameOfServiceById(((Tab.KioskTab) tab).getKioskServiceId())
+                                + "/" + tab.getTabName(requireContext());
                    case CHANNEL:
-                        tabName = NewPipe.getNameOfService(((Tab.ChannelTab) tab)
-                                .getChannelServiceId()) + "/" + tab.getTabName(requireContext());
-                        break;
+                        return getNameOfServiceById(((Tab.ChannelTab) tab).getChannelServiceId())
+                                + "/" + tab.getTabName(requireContext());
                    case PLAYLIST:
                        final int serviceId = ((Tab.PlaylistTab) tab).getPlaylistServiceId();
                        final String serviceName = serviceId == -1
                                ? getString(R.string.local)
-                                : NewPipe.getNameOfService(serviceId);
-                        tabName = serviceName + "/" + tab.getTabName(requireContext());
-                        break;
+                                : getNameOfServiceById(serviceId);
+                        return serviceName + "/" + tab.getTabName(requireContext());
                    default:
-                        tabName = tab.getTabName(requireContext());
-                        break;
+                        return tab.getTabName(requireContext());
                }
-
-                tabNameView.setText(tabName);
-                tabIconView.setImageResource(tab.getTabIconRes(requireContext()));
            }

            @SuppressLint("ClickableViewAccessibility")
--- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
@ -1,9 +1,13 @@
 package org.schabi.newpipe.util;

+import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
+
 import android.content.Context;
 import android.content.SharedPreferences;

 import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.preference.PreferenceManager;

@ -18,10 +22,9 @@ import org.schabi.newpipe.extractor.StreamingService;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;

+import java.util.Optional;
 import java.util.concurrent.TimeUnit;

-import static org.schabi.newpipe.extractor.ServiceList.SoundCloud;
-
 public final class ServiceHelper {
    private static final StreamingService DEFAULT_FALLBACK_SERVICE = ServiceList.YouTube;

@ -113,18 +116,32 @@ public final class ServiceHelper {
    }

    public static int getSelectedServiceId(final Context context) {
+        return Optional.ofNullable(getSelectedService(context))
+                .orElse(DEFAULT_FALLBACK_SERVICE)
+                .getServiceId();
+    }
+
+    @Nullable
+    public static StreamingService getSelectedService(final Context context) {
        final String serviceName = PreferenceManager.getDefaultSharedPreferences(context)
                .getString(context.getString(R.string.current_service_key),
                        context.getString(R.string.default_service_value));

-        int serviceId;
        try {
-            serviceId = NewPipe.getService(serviceName).getServiceId();
+            return NewPipe.getService(serviceName);
        } catch (final ExtractionException e) {
-            serviceId = DEFAULT_FALLBACK_SERVICE.getServiceId();
+            return null;
        }
+    }

-        return serviceId;
+    @NonNull
+    public static String getNameOfServiceById(final int serviceId) {
+        return ServiceList.all().stream()
+                .filter(s -> s.getServiceId() == serviceId)
+                .findFirst()
+                .map(StreamingService::getServiceInfo)
+                .map(StreamingService.ServiceInfo::getName)
+                .orElse("<unknown>");
    }

    public static void setSelectedServiceId(final Context context, final int serviceId) {
@ -138,16 +155,6 @@ public final class ServiceHelper {
        setSelectedServicePreferences(context, serviceName);
    }

-    public static void setSelectedServiceId(final Context context, final String serviceName) {
-        final int serviceId = NewPipe.getIdOfService(serviceName);
-        if (serviceId == -1) {
-            setSelectedServicePreferences(context,
-                    DEFAULT_FALLBACK_SERVICE.getServiceInfo().getName());
-        } else {
-            setSelectedServicePreferences(context, serviceName);
-        }
-    }
-
    private static void setSelectedServicePreferences(final Context context,
                                                      final String serviceName) {
        PreferenceManager.getDefaultSharedPreferences(context).edit().