[SoundCloud] Fix SoundCloud HLS expiry and add extractor logging #1325
Conversation
absurdlylongusername
changed the title
ShareASmile
added
bug
Add StreamingServiceId enum to map service id to name for logging
…rate building Hls and Progressive streams Add HlsAudioStream to facilitate refreshing expired Hls playlists
Stypox
force-pushed
the
fix-soundcloud-hls-expiry
branch
from
45df3cd to
578f4f0
Compare
| logger.error(tag, msg, t); | ||
| } | ||
|
|
||
| // default logger that prints to stdout |
There was a problem hiding this comment.
| // default logger that prints to stdout | |
| /** | |
| * Default logger that prints to stdout. | |
| */ |
There was a problem hiding this comment.
Thank you! My review gives some thoughts that we should decide on before continuing. There definitely needs to be a way to refresh streams in the extractor, which will come in handy not only for SoundCloud but also for YouTube.
I think it is a good idea to store refresh information in the streams themselves, and to make them expose methods that allow refreshing the stream. I guess this would also play well with #858 (comment). What do you think @AudricV?
Regarding logging, if I understand correctly the commit structure, it should be possible to extract it in a separate PR, that we can merge much faster. Could you put the logging in a separate PR? Also the
| public static void d(final String tag, final String msg) { | ||
| logger.debug(tag, msg); | ||
| } | ||
|
|
||
| public static void w(final String tag, final String msg) { | ||
| logger.warn(tag, msg); | ||
| } |
There was a problem hiding this comment.
These should also optionally take a Throwable (that's how they work in Android, and it's often useful)
| @SuppressWarnings("checkstyle:LeftCurly") | ||
| public interface RefreshableStream { |
There was a problem hiding this comment.
| @SuppressWarnings("checkstyle:LeftCurly") | |
| public interface RefreshableStream { | |
| public interface RefreshableStream { |
There was a problem hiding this comment.
Is this file used anywhere? Also, the reason why services are not implemented as an enum is also because it should be possible to dynamically add service implementations (think e.g. of plugins). Obviously this has never happened yet, but iirc that's why the API is like that.
| } | ||
|
|
||
| // default logger that prints to stdout | ||
| private static final class ConsoleLogger implements Logger { |
There was a problem hiding this comment.
This should be only set by users of the library and should default to a logger that logs nothing. In each extractor test then you would set this ConsoleLogger as the logger (i.e. you just add this in the common tests initialization methods).
|
|
||
| import javax.annotation.Nonnull; | ||
|
|
||
| public class HlsAudioStream extends AudioStream implements RefreshableStream { |
There was a problem hiding this comment.
I don't think it's a property of all HLS streams that they are refreshable. I think we have two alternative ways we can handle this instead:
RefreshableStreamcould just be an interface that someStreams can implement, then eachServicewould overrideVideoStream/AudioStreamand also implementRefreshableStreamif needed, and the player could check for refreshable streams usinginstanceof. This would require a lot of boilerplate though.- Add a
(Audio/Video)Stream refresh() {}method to the baseStreamclass which builds a new refreshed stream, and make it returnnullif refreshing is not available.
| import java.io.IOException; | ||
|
|
||
| @SuppressWarnings("checkstyle:LeftCurly") | ||
| public interface RefreshableStream { |
There was a problem hiding this comment.
Shouldn't this also somehow store the expiry time? So that the player can prepare in advance if the stream is about to expire
| * | ||
| * @return the resolved id | ||
| */ | ||
| // TODO: what makes this method different from the others? Don' they all return the same? |
There was a problem hiding this comment.
Maybe you can get an answer by git blaming?
Fix SoundCloud HLS stream urls expiring
This PR implements extractor side changes to facilitate refreshing expires HLS stream URLs for SoundCloud streams.
Add Extractor Logging
Added extractor logging, which helped a lot to fix this issue.
In a future PR I will add a proper logging framework that will only print logs if running in debug mode, but for now since the logs are not in high-traffic code then it should be fine.
Please Note
Includes changes from:
So those PRs must be merged before this.
See TeamNewPipe/NewPipe#12418 for the full writeup for the fix