mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-25 01:20:34 +00:00
fixed stream exception handling
This commit is contained in:
parent
369d9204d9
commit
bc468b6f36
@ -165,6 +165,24 @@ public class VideoItemDetailFragment extends Fragment {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
} catch(VideoInfo.StreamExctractException e) {
|
||||||
|
if(!videoInfo.errors.isEmpty()) {
|
||||||
|
// !!! if this case ever kicks in someone gets kicked out !!!
|
||||||
|
ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
|
||||||
|
ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
|
||||||
|
service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
|
||||||
|
} else {
|
||||||
|
ErrorActivity.reportError(h, getActivity(), videoInfo.errors, VideoItemListActivity.class, null,
|
||||||
|
ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
|
||||||
|
service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
|
||||||
|
}
|
||||||
|
h.post(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
getActivity().finish();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
e.printStackTrace();
|
||||||
} catch (ParsingException e) {
|
} catch (ParsingException e) {
|
||||||
ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
|
ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
|
||||||
ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
|
ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
|
||||||
|
@ -28,6 +28,12 @@ import java.util.Vector;
|
|||||||
@SuppressWarnings("ALL")
|
@SuppressWarnings("ALL")
|
||||||
public class VideoInfo extends AbstractVideoInfo {
|
public class VideoInfo extends AbstractVideoInfo {
|
||||||
|
|
||||||
|
public static class StreamExctractException extends ExtractionException {
|
||||||
|
StreamExctractException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**Fills out the video info fields which are common to all services.
|
/**Fills out the video info fields which are common to all services.
|
||||||
* Probably needs to be overridden by subclasses*/
|
* Probably needs to be overridden by subclasses*/
|
||||||
public static VideoInfo getVideoInfo(StreamExtractor extractor, Downloader downloader)
|
public static VideoInfo getVideoInfo(StreamExtractor extractor, Downloader downloader)
|
||||||
@ -116,7 +122,8 @@ public class VideoInfo extends AbstractVideoInfo {
|
|||||||
if((videoInfo.video_streams == null || videoInfo.video_streams.isEmpty())
|
if((videoInfo.video_streams == null || videoInfo.video_streams.isEmpty())
|
||||||
&& (videoInfo.audio_streams == null || videoInfo.audio_streams.isEmpty())
|
&& (videoInfo.audio_streams == null || videoInfo.audio_streams.isEmpty())
|
||||||
&& (videoInfo.dashMpdUrl == null || videoInfo.dashMpdUrl.isEmpty())) {
|
&& (videoInfo.dashMpdUrl == null || videoInfo.dashMpdUrl.isEmpty())) {
|
||||||
throw new ExtractionException("Could not get any stream. See error variable to get further details.");
|
throw new StreamExctractException(
|
||||||
|
"Could not get any stream. See error variable to get further details.");
|
||||||
}
|
}
|
||||||
|
|
||||||
return videoInfo;
|
return videoInfo;
|
||||||
|
@ -88,6 +88,7 @@
|
|||||||
<string name="blocked_by_gema">Blocked by GEMA.</string>
|
<string name="blocked_by_gema">Blocked by GEMA.</string>
|
||||||
<string name="could_not_setup_download_menu">Could not setup download menu.</string>
|
<string name="could_not_setup_download_menu">Could not setup download menu.</string>
|
||||||
<string name="live_streams_not_supported">This is a LIVE STREAM. These are not yet supported.</string>
|
<string name="live_streams_not_supported">This is a LIVE STREAM. These are not yet supported.</string>
|
||||||
|
<string name="could_not_get_stream">Could not get any stream.</string>
|
||||||
<!-- error activity -->
|
<!-- error activity -->
|
||||||
<string name="sorry_string">Sorry that should not happen.</string>
|
<string name="sorry_string">Sorry that should not happen.</string>
|
||||||
<string name="guru_meditation" translatable="false">Guru Meditation.</string>
|
<string name="guru_meditation" translatable="false">Guru Meditation.</string>
|
||||||
|
Loading…
Reference in New Issue
Block a user