Commit Graph

1091 Commits

Author SHA1 Message Date
XiangRongLin 852a65ff18 Add tests for StringUtils 2021-07-30 19:56:57 +02:00
XiangRongLin 48d897e6ad Add final and adjust utils class name 2021-07-29 21:33:45 +02:00
XiangRongLin 60794aea31 [YouTube] Add parenthesis matching as way to parse decrypt function
From @Stypox
2021-07-29 21:23:00 +02:00
XiangRongLin 2967d1ae6a [YouTube] Compile YoutubeThrottlingDecrypter pattern statically 2021-07-29 20:27:29 +02:00
XiangRongLin 1c78976900 [YouTube] Expand regex to match n param decrypt function
Temporary solution
2021-07-29 20:26:36 +02:00
TobiGr b62fe7141e Fix JDoc 2 2021-07-29 12:34:04 +02:00
TobiGr dbc4e01c17 Fix JDoc 2021-07-29 12:31:33 +02:00
TobiGr 8bfcb0ad59 [SoundCloud] Fix hardcoded client id 2021-07-28 20:33:21 +02:00
Tobi 027dc65434 pull request #683 from XiangRongLin/yt_throttling
[YouTube] Fix buffering by decoding n parameter of stream urls
2021-07-28 20:32:38 +02:00
Tobi 14c179f343
Merge pull request #692 from TeamNewPipe/fix/sc/id
[SoundCloud] Fix hardcoded client id
2021-07-28 18:28:07 +02:00
Tobi 394c02ad06
Merge pull request #683 from XiangRongLin/yt_throttling
[YouTube] Fix buffering by decoding n parameter of stream urls
2021-07-28 18:01:57 +02:00
TobiGr 785ff4aa32 [SoundCloud] Fix hardcoded client id 2021-07-28 17:02:56 +02:00
TobiGr d70adfdb8f Add methods for cache control to YoutubeThrottlingDecrypter. 2021-07-27 20:32:22 +02:00
TiA4f8R d13f531b6f Use YoutubeThrottlingDecrypter also in getAudioStreams and getVideoOnlyStreams methods of YoutubeStreamExtractor
Without this commit, the n param is only decrypted for streams extracted in getVideoStreams (so only for streams in the formats object of the player response).
2021-07-27 17:28:32 +02:00
TiA4f8R 32055147e0 Do some code improvements
Use final where possible, annotate some methods and parameters as Nonnull and format new code to be in the 100 characters limit per line.
2021-07-27 17:24:27 +02:00
TobiGr 1c30a2725e Cache nParams to prevent executing the JavaScript function for the same nParam multiple times.
Closes #689
2021-07-22 19:40:12 +02:00
XiangRongLin 3a3d1d7f2b Make YoutubeJavaScriptExtractor and JavaScript methods static
Also address review and rewrite some comments
2021-07-20 20:48:11 +02:00
XiangRongLin a683c8d278 Delete duplicated code to load youtube javascript file 2021-07-17 19:14:57 +02:00
XiangRongLin a02ee2e952 Rewrite youtube throttling solution and add tests 2021-07-17 19:10:09 +02:00
litetex 0c12b396e5 Review changes 2021-07-17 16:41:12 +02:00
litetex ecf4232ce3 Using ``Collections.emptyList()`` 2021-07-17 16:41:12 +02:00
litetex 0f9ed020a4 Frameset has to implement Serializable or NewPipe fails
java.lang.RuntimeException: Parcelable encountered IOException writing serializable object (name = org.schabi.newpipe.extractor.stream.StreamInfo)
...
Caused by: java.io.NotSerializableException: org.schabi.newpipe.extractor.stream.Frameset
...
2021-07-17 16:41:11 +02:00
litetex 17ccaf4b87 Update YoutubeStreamExtractor.java
To fix ``java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.String[] java.lang.String.split(java.lang.String)' on a null object reference``
2021-07-17 16:41:10 +02:00
litetex 4e41e172ea Update Frameset.java
Reformatted code
2021-07-17 16:41:10 +02:00
litetex 09b670d745 Renamed frames to previewFrames (so it's better understandable) 2021-07-17 16:41:09 +02:00
litetex b086655d54 Reverted useless change 2021-07-17 16:41:08 +02:00
litetex 93b0c5b15f Added seekbar data 2021-07-17 16:41:08 +02:00
XiangRongLin 6956b72af7 Fix YoutubeThrottlingDecoder.replaceNParam
Previously it replaced the parameter itself not the value of the parameter.
2021-07-17 10:05:14 +02:00
XiangRongLin a189f685dc cache player js code 2021-07-16 19:20:40 +02:00
XiangRongLin fcdb9bdbeb add url to sout 2021-07-15 20:05:26 +02:00
XiangRongLin 80cf8b3acd Extract separate YoutubeThrottlingDecoder 2021-07-15 20:05:25 +02:00
XiangRongLin a86a30103f [Youtube] bare bones version to solve throttling
Done by transforming the parameter "n" from videoplayback urls
https://github.com/ytdl-org/youtube-dl/issues/29326#issuecomment-865985377
2021-07-15 20:05:25 +02:00
bopol c38a06e8dc
Merge pull request #661 from B0pol/peertube-livestreams
[PeerTube] Support livestreams
2021-07-13 15:48:13 +02:00
litetex fdebf3c6cd Added javadoc warnings 2021-07-07 20:41:59 +02:00
litetex 6860543b07 Added more doc 2021-07-06 21:16:31 +02:00
litetex a59fead0d7 Fixed typos 2021-07-06 21:16:30 +02:00
litetex 688a1c316b Fixed Exception when YT comments are disabled and added ``commentsDisabled`` field
* Fixed code: Added missing finals (according to NewPipes Checkstyle guide)
* Fixed ``findValue`` method in ``YoutubeCommentsExtractor``
2021-07-06 21:16:29 +02:00
litetex ca33f4f60b Improved code format (final) and added ``isCommentsDisabled`` method 2021-07-06 21:16:28 +02:00
TobiGr 9ca6dc26ed Fix invalid CONSENT cookie value 2021-07-03 13:27:40 +02:00
bopol 7d7cc087e2 [PeerTube] Support livestreams 2021-06-24 11:02:30 +02:00
bopol 3966178979
Merge pull request #665 from B0pol/agerestricted
[youtube] Fix extraction of age restricted videos
2021-06-23 21:07:14 +02:00
bopol b475f09ba7 don't do useless concatenation 2021-06-23 20:33:32 +02:00
bopol b96b2a6eba Update invidious instances 2021-06-23 14:39:10 +02:00
bopol e9a992b0a9 [youtube] Fix extraction of age restricted videos 2021-06-23 12:06:02 +02:00
bopol 65fd8740aa
Merge pull request #658 from TeamNewPipe/revert-651-fix/streamType
[YouTube] Fix getting stream type of live streams
2021-06-23 11:33:24 +02:00
bopol 361f142621 Use badge style instead of label 2021-06-23 11:25:59 +02:00
bopol 58f109ddec adress stypox review 2021-06-23 11:15:40 +02:00
TobiGr 1f9a99c931 [SoundCloud] Update HARDCODED_CLIENT_ID 2021-06-18 15:30:54 +02:00
Tobi c998012c28
Revert "[YouTube] Fix getting stream type of live streams" 2021-06-18 09:20:32 +02:00
TobiGr 6762fe3357 [YouTube] Fix getting stream type of live streams 2021-06-10 16:51:00 +02:00
TobiGr f7f727d19c Add constant NO_LIKE_COUNT to CommentsInfoItem 2021-06-08 10:28:44 +02:00
TobiGr b70c0f93c7 Add streamPosition for comments
SoundCloud is the only service which supports adding comments at a specific timestamp in the stream.
2021-06-08 10:27:52 +02:00
Tobi d4186d100b
Merge pull request #580 from TeamNewPipe/accountTerminated
Add AccountTerminatedException for terminated channels
2021-06-08 09:55:58 +02:00
TobiGr 89e0514d8b Fix Javadoc generation fix 2021-06-08 09:30:05 +02:00
TobiGr 80d3052033 Fix Javadoc generation 2021-06-08 09:26:01 +02:00
Stypox 2158ca4060
Remove two unneded warning suppressions 2021-06-05 14:15:48 +02:00
Stypox 13f192704d
Add utility method getService() to Info object 2021-06-05 14:14:19 +02:00
XiangRongLin 0ad51e76fb
Merge pull request #638 from TeamNewPipe/spelling
Improve exception message thrown when not accepting an URL in LinkHandlerFactory#fromUrl(String url, String baseUrl)
2021-06-04 18:23:31 +02:00
TobiGr 858e007804 Improve exception message thrown when not accepting an URL in LinkHandlerFactory#fromUrl(String url, String baseUrl) 2021-05-28 14:59:44 +02:00
litetex 289b84e68b Removed unused code 2021-05-27 21:27:44 +02:00
litetex e81b0e2885 Tweaked code 2021-05-27 19:48:31 +02:00
litetex 8c96545e57 Merge branch 'TeamNewPipe:dev' into fix-broken-yt-liked-comments 2021-05-24 18:06:45 +02:00
litetex 8e08a2aac7 Improved docs 2021-05-24 18:05:26 +02:00
litetex b310922fc0 Better exception message 2021-05-24 18:05:25 +02:00
litetex 46654f5fca Reformatted code 2021-05-24 18:05:25 +02:00
litetex 2174685c5c Reimplemented likeCount 2021-05-24 18:05:25 +02:00
litetex 01cfb55505 Update YoutubeCommentsInfoItemExtractor.java 2021-05-24 18:05:25 +02:00
litetex bedcd87abb Fixed occurrences where voteCount is not set (<=0 likes) 2021-05-24 18:05:25 +02:00
litetex 545c0a6f42 Fixed comment 2021-05-24 18:05:24 +02:00
TiA4f8R a00fdcbd3d
Format the indentation of the definition of the apiUrl string in SoundcloudParsingHelper.resolveFor method
Co-authored-by: Tobi <TobiGr@users.noreply.github.com>
2021-05-23 20:27:45 +02:00
TiA4f8R 6b607eb38d
Update the hardcoded client_id 2021-05-23 18:08:44 +02:00
TiA4f8R 4552ea9c9f
Use the SOUNDCLOUD_API_V2_URL constant in all the SoundCloud package 2021-05-23 18:08:44 +02:00
TiA4f8R 86308d0603
Use a lightweight request to check if the client_id is valid
Request the api-v2 host with the client_id instead of checking if the streams of a SoundCloud track are not empty: if it is valid, the API returns 404, otherwise it should return 401.
2021-05-23 18:08:43 +02:00
TiA4f8R c5c190500c
Format the SoundCloud package of the extractor and fix some warnings
Use final where possible in the package and format code to be in the 100 caracters per line limit.
Fix some warnings generated by Android Studio and do some code improvements
2021-05-23 18:08:42 +02:00
Tobi 636e27333b
Merge pull request #603 from TeamNewPipe/peertube_hls
Add PeerTube HLS streams
2021-05-23 11:49:40 +02:00
Hassan Igbaria e8b5364745
Update YoutubeStreamExtractor.java 2021-05-21 16:22:24 +03:00
litetex c3b837fe3b
Deduped code; Using default values... 2021-05-20 20:22:40 +02:00
litetex b934c7ccbb
Removed unused import 2021-05-20 20:11:35 +02:00
litetex 10cf081145
Removed likeCount and added textualVoteCount 2021-05-20 20:10:14 +02:00
TobiGr 1acc53b8db [PeerTube] Add support for HLS streams 2021-05-15 12:39:23 +02:00
Tobi 3a3ade20f4
Merge pull request #620 from TeamNewPipe/bandcamp-comments
Add Bandcamp comments (first page)
2021-05-02 13:43:53 +02:00
TobiGr f4404b5cc8 Add tests for more reasons 2021-05-01 17:50:19 +02:00
TobiGr fc998589dc Detect channels which have been terminated due to copyright infringement 2021-05-01 17:50:19 +02:00
TobiGr bb3861ddce Add AccountTerminatedException for better error handling of terminated channels 2021-05-01 17:50:19 +02:00
TobiGr 9c12dc5609 [SoundCloud] Fix SoundCloud ID extraction
resolveIdWithEmbedPlayer() does not work anymore because the JSON data has been extracted to an API call. For this reason, replace resolveIdWithEmbedPlayer() with resolveIdWithWidgetApi)( which performs the API call.
2021-04-26 17:58:34 +02:00
Fynn Godau 9dc7a1d5ee [Bandcamp] Add comments (first page) 2021-04-26 17:25:04 +02:00
TobiGr 8f023c1ec7 [SoundCloud] Update client id 2021-04-26 15:14:11 +02:00
Tobi 7f202db8b1
Fix Google URL detection (#617) 2021-04-26 11:49:47 +02:00
fynngodau 6db4bea8ca
Rework Bandcamp comments (#613) 2021-04-13 21:10:59 +02:00
Fynn Godau 3671876721 Fix bandcamp radio stream extractor 2021-04-13 19:30:11 +02:00
Fynn Godau 90b5c00599 Extract related items #593 2021-04-13 17:56:19 +02:00
TobiGr 318cec7625 [Bandcamp] Add Radio stream segments 2021-04-11 21:19:44 +02:00
TobiGr 55e0f8e725 Merge branch 'master' into dev 2021-04-10 11:33:34 +02:00
TobiGr 33173eb3e6 Make CONSENT COOKIE constants private 2021-04-09 11:59:17 +02:00
XiangRongLin 4833df60e5 Add method to inject Random into YoutubeParsingHelper and use in tests 2021-04-08 16:36:55 +02:00
TobiGr 080d1e318d Code improvement 2021-04-07 14:11:47 +02:00
TobiGr 883f16e0ad [YouTube] Set CONSENT cookie 2021-04-07 14:11:37 +02:00
XiangRongLin 7b06c696e2 Use Page.body for YoutubeChannelExtractor 2021-04-06 18:14:38 +02:00
XiangRongLin eda1b6e199 Use Page.body for YoutubePlaylistExtractor 2021-04-06 18:14:38 +02:00
XiangRongLin 3af26a2821 Add body field to Page 2021-04-04 11:39:58 +02:00
XiangRongLin 1925dcf4dc
Merge pull request #597 from fynngodau/related-items
Rename getRelatedStreams to getRelatedItems and change return type
2021-04-02 19:54:22 +02:00
Fynn Godau c877712647 Add deprecated old method calls to avoid breaking API 2021-04-01 22:32:36 +02:00
Fynn Godau 14f6f1b7c3 Generify related streams calls and rename method 2021-03-31 20:24:40 +02:00
TobiGr 1498e1905e Reduce number of type conversions in YouTubeSearchExtractor.collectStreamsFrom by introducing new variable 2021-03-31 13:30:38 +02:00
Tobi 7ea2cd73d3
Merge pull request #589 from fynngodau/bandcamp-more-recent-pages
Load more featured pages and fix featured cover arts not loading
2021-03-31 12:15:12 +02:00
Fynn Godau 705f6c6e33 Apply review 2021-03-31 11:02:30 +02:00
TobiGr 657b00ca11 Smaller code improvements 2021-03-30 10:10:53 +02:00
TobiGr 8fbd1a2bcf FIx potential NullPointerException 2021-03-30 10:07:20 +02:00
TobiGr f2e7c7ebd6 Replace Vector with ArrayList for performance improvements
I could not figure out, why these two methods are necessary.
2021-03-30 10:07:20 +02:00
TobiGr 48fd8ca7b3 Remove redundant type declaration 2021-03-30 10:07:20 +02:00
TobiGr 22bd16fca3 Make vars private, final and static 2021-03-30 10:07:20 +02:00
TobiGr 6a0f6e846a Fix possible bug when language.id field is not present and this the languageCode an empty String. 2021-03-30 10:07:20 +02:00
TobiGr b9282bbe94 Remove checks which are always true 2021-03-30 10:07:20 +02:00
TobiGr 46eab1ec17 Remove declarations of exceptions which are not thrown from method signatures 2021-03-30 10:07:20 +02:00
TobiGr c3e23559d7 Remove unused imports 2021-03-30 10:07:20 +02:00
TobiGr e4c40ae6d1 Use List.isEmpty() 2021-03-30 10:07:20 +02:00
Fynn Godau d663be5a78 [Bandcamp] Fix featured albums not showing thumbnails 2021-03-28 13:12:22 +02:00
Fynn Godau dbcf61c6f7 [Bandcamp] Load more featured pages 2021-03-28 12:53:05 +02:00
Stypox b4dee6d08f
Merge pull request #306 from B0pol/metadata
Extract metadata for youtube, soundcloud & mediaccc
2021-03-27 08:45:47 +01:00
TobiGr 070a40e181 [YouTube] Mix Playlist - Fix getting name 2021-03-25 21:47:16 +01:00
TobiGr bbee15474d [PeerTube] Fix playlist extraction 2021-03-25 19:19:19 +01:00
TiA4f8R ae283314da
Add a comment explaining subscribers count calculation 2021-03-25 17:54:46 +01:00
TiA4f8R abb790f465
Remove println in getSubscriberCount from PeertubeAccountExtractor class 2021-03-25 17:49:22 +01:00
TiA4f8R efe2b964f0
Extract real subscribers of a Peertube account
Apply fix provided in the PR and move all accounts/ strings to a constant, ACCOUNTS.
2021-03-25 17:47:44 +01:00
Tobi 12835bfae1
Merge pull request #551 from FireMasterK/ff-privacy
Change UA to privacy.resistFingerprinting.
2021-03-24 17:58:34 +01:00
Stypox ce7cbbc9a0
[YouTube] Fix trending getName() 2021-03-24 09:14:09 +01:00
bopol 8806fb4e6b
address reviews 2021-03-19 10:14:43 +01:00
bopol c47cc54908
Extract metadata for YouTube, SoundCloud & MediaCCC 2021-03-19 10:14:43 +01:00
TiA4f8R 379d7312fa
Don't use a regular expression to find the last segment URL and do code improvements
Apply suggestions provided in the PR and remove a redundant import.
2021-03-14 17:54:22 +01:00
TiA4f8R 0e3e420a25
Fix tests 2021-03-14 17:54:21 +01:00
TiA4f8R d61d9d116d
Refactor getAudioStreams method of SoundcloudStreamExtractor
Split the method into private methods, in order to have a better reading.
2021-03-14 17:54:20 +01:00
TiA4f8R a7b15b51e6
Change t to transcodingJsonObject in SoundcloudStreamExtractor 2021-03-14 17:54:19 +01:00
TiA4f8R 3bd08a2880
Adress requested changes and use final where possible in SoundcloudStreamExtractor
This commit moved the HLS parsing task to a separate method, did little performance improvements and used final where possible in the SoundcloudStreamExtractor file.
2021-03-14 17:54:17 +01:00
TiA4f8R cbacd3c0a5
Add a check to don't show MP3 128kbps stream twice and catch IOException when fetching the HLS Manifest
If a progressive stream is present in the transcodings, it's unnecessary to show twice an MP3 128kbps stream so if this is the case, the MP3 HLS stream will be not added to the audioStreams, else it will.
This commit also catch fetching errors in HLS manifests parsing and don't add the corresponding stream if an error occurs.
2021-03-14 17:54:16 +01:00
TiA4f8R 26f1b4e7dc
Support SoundCloud HLS by using a workaround
This commit tries to support SoundCloud HLS streams by parsing M3U manifests, get the last segment URL (in order to get track length) and request a segment URL equals to track's duration so it's a single URL.
2021-03-14 17:54:14 +01:00
Fynn Godau 2e57a8f24f [Bandcamp] Fix link handler acceptance behaviour
* Test for bandcamp footer instead of meta tag (which is not present on
  all pages)
* Accept links to /music, not just /releases
* Correctly handle uppercase URLs
2021-03-14 09:51:30 +01:00
Tobi 7e6f464407
Merge pull request #509 from TiA4f8R/soundcloud-improvements
Add new exceptions to be able to display different error messages in apps
2021-03-07 13:51:15 +01:00
TobiGr 22fa131922 Merge branch 'dev' into bandcamp 2021-03-05 19:45:37 +01:00
TiA4f8R e55284bb8f
Code style improvements
Use final where possible in YoutubeStreamExtractor and do some other code style improvements
2021-03-05 16:38:53 +01:00
TobiGr d0a1041afd
Prevent NullPointerException and use equalsIgnorecase 2021-03-05 16:38:52 +01:00
TiA4f8R 890cbba625
Update PaidContent exception 2021-03-05 16:38:51 +01:00
TobiGr da3cfa967d
Handle age-restricted videos 2021-03-05 16:38:50 +01:00
TiA4f8R 448b68700c
Use final in exceptions and add AgeRestrictedException
AgeRestrictedException will be thrown only if the reason message equals to "Sign in to confirm your age" and if the age limit is 18.
2021-03-05 16:38:49 +01:00
TiA4f8R 59d6d3f04e
Fix YouTube tests 2021-03-05 16:38:42 +01:00
TiA4f8R 3925204658
Add tests and rename SoundcloudGoPlusException to SoundcloudGoPlusContentException 2021-03-05 16:38:40 +01:00
TiA4f8R 771bb1a2cb
Add three new exceptions for unavailable YouTube contents
These exceptions are thrown on a test with the error messages text, because YouTube returns only "UNPLAYABLE" status in most error cases.
Tests are based with English strings, so changing the lang used by
extractor will throw the generic exception (ContentNotAvailableException).
2021-03-05 16:38:39 +01:00
TiA4f8R 35325d980d
Add GeographicRestrictionException and SoundCloudGoPlusException in NewPipe Extractor to be able to display different error messages
This commit adds two new exceptions in NewPipe Extractor: GeographicRestrictionException and SoundCloudGoPlusException (which extend to ContentNotAvailableException). These exceptions allow showing different error messages to user when a content isn't available in his/her/its country (only used for now by SoundCloudStreamExtractor) or when the content is a SoundCloud Go+ track.
2021-03-05 16:38:37 +01:00
Tobi bc0cda68d1
Merge pull request #570 from TiA4f8R/fix-yt-channels-playlists
Fix YouTube channels contination
2021-03-05 15:26:49 +01:00
Tobi a3c6fceef5
Merge pull request #573 from B0pol/comments-performance
[youtube] improve comments extraction performance
2021-03-05 14:46:27 +01:00
bopol ff5273b882
Update extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeCommentsExtractor.java
Co-authored-by: Tobi <TobiGr@users.noreply.github.com>
2021-03-05 14:39:01 +01:00