Commit Graph

780 Commits

Author SHA1 Message Date
bopol bc43f8977d [peertube] add feed url in channels 2020-03-28 10:22:47 +01:00
TobiGr 647e7cd450 Accept YouTube Music playlists but not YouTube Mixes 2020-03-25 22:24:18 +01:00
wb9688 bcd2a1092b Don't accept YouTube Mix playlists 2020-03-25 11:07:28 +01:00
Tobias Groza e4874d554e
Merge pull request #296 from mauriciocolli/fix-search-errors-detection
Fix search errors detection and refactor search tests
2020-03-24 21:53:32 +01:00
Tobias Groza 8a9ae32e6b
Merge pull request #292 from wb9688/fix-yt-no-views
Fix YouTube videos with no views
2020-03-24 20:27:08 +01:00
Mauricio Colli 0a20c53f1a
Use easier-to-read asserts statements in tests 2020-03-23 18:08:59 -03:00
Mauricio Colli c921e5d6a5
Remove unnecessary collector creation function from search extractor 2020-03-23 18:08:51 -03:00
Tobias Groza 6fd9b38ad9
Merge pull request #287 from mauriciocolli/fix-channel-redirect
[YouTube] Fix channel with redirects directly in the response
2020-03-23 18:41:56 +01:00
Mauricio Colli 04bfa0ec6a
[PeerTube] Update video used in age limit test (was 404 not found) 2020-03-21 15:55:40 -03:00
Mauricio Colli 921bf30bb7
[YouTube] Add check for channel items with no video count in search 2020-03-21 15:55:39 -03:00
Mauricio Colli b7f8001a49
[YouTube] Add check for channel items without description in search 2020-03-21 15:55:38 -03:00
Mauricio Colli 9b7999fe54
[YouTube] Check if channel item has subscription count in search 2020-03-21 15:55:37 -03:00
Mauricio Colli 9704fc9952
Improve search extractor tests for services 2020-03-21 15:55:36 -03:00
Mauricio Colli d72130edae
Always return a new item collector in the search extractor 2020-03-21 15:55:34 -03:00
Mauricio Colli 0c27198ba1
Include errors from child collectors in the search collector 2020-03-21 15:55:29 -03:00
TobiGr 2cf8cbf0df Merge branch 'master' into dev 2020-03-18 22:29:10 +01:00
wb9688 222d659d9e
[SoundCloud] Don't make separate request for getAudioStreams() in StreamExtractor
Signed-off-by: Stypox <stypox@pm.me>
2020-03-18 11:30:15 +01:00
wb9688 904c9d681f Fix YouTube videos with no views 2020-03-18 10:07:49 +01:00
Stypox 265cfb61f3
[SoundCloud] Add test for small playlist, use defaultTestGetPageInNewExtractor 2020-03-17 21:03:50 +01:00
Stypox 45bb646480
[SoundCloud] Do not overwrite nextPageUrl in PlaylistExtractor
Consistent with YouTube and the documentation
2020-03-17 20:56:47 +01:00
Stypox c505d4e2b7
[SoundCloud] Remove trailing , in playlist page urls 2020-03-17 20:36:59 +01:00
Stypox ae47c9587c
[SoundCloud] Optimize imports in edited files 2020-03-17 20:32:04 +01:00
Stypox 4389fd3b7b
[SoundCloud] Migrate StreamExtractor to api-v2 2020-03-17 18:06:13 +01:00
Stypox 5e4ddb368f
[SoundCloud] Fix extractors built from next playlist pages
They didn't have the information to calculate another next page url. So now `nextPageUrl` contains a full link with all video ids, and `getPage` takes the first part of the url (containing 15 streams) and produces another `nextPageUrl` with the remaining streams.
Also add a test for this.
2020-03-17 18:04:40 +01:00
Stypox 0e1b4bbf17
[SoundCloud] Test playlists banner: it should not exist 2020-03-17 15:53:25 +01:00
Stypox 65bdb3bc9d
[SoundCloud] Unignore ignored playlist tests 2020-03-17 15:49:58 +01:00
Stypox 1558da6f6b
[SoundCloud] Fix playlist next page generation 2020-03-17 15:46:35 +01:00
Stypox ca8bf53b61
[SoundCloud] Fix playlist test: number of streams changed 2020-03-17 15:35:33 +01:00
Stypox d4aa4a0763
[SoundCloud] Fix typo in ChartsExtractor 2020-03-17 15:25:11 +01:00
Stypox 4b1121aac7
[SoundCloud] Add tests for api-v2 channel urls 2020-03-17 15:23:13 +01:00
Stypox c3d811fde5
[SoundCloud] Use api-v2 in SubscriptionExtractor
Also added
2020-03-17 15:22:25 +01:00
Stypox d0e66cc600
[SoundCloud] Improve thumbnail url extraction in playlists
Prevent NullPointerExceptions and remove duplicate code
2020-03-17 15:13:28 +01:00
Stypox f3095713f9
[SoundCloud] Use api-v2 in PlaylistExtractor
Rewrote methods to calculate next page url and to get items from it. `api-v2` is different from `api` since the initial playlist page contains (usually) the full info of the first 3 streams and only the id of the other. Then the single tracks can be requested in batch using `/tracks?ids=id1,id2,...`.
2020-03-17 15:12:13 +01:00
TobiGr 9eca7df947 Forget to fetch the page 2020-03-16 20:50:08 +01:00
TobiGr edb57840d7 [SoundCloud] Update hard-coded client_id 2020-03-16 19:43:36 +01:00
TobiGr efad0be99f Test if the extractor can get AudiStreams with the hard-coded cliend_id
SoundCloud client_id are changed on a regular basis now. We might want to remove the hardcoded id completely on a later point of time when client_id is changed to often
2020-03-16 19:42:35 +01:00
TobiGr 5f39bc4e99 [SoundCloud] Update hardcoded client id 2020-03-16 17:26:30 +01:00
Tobias Groza 65a7eda446
Merge pull request #256 from B0pol/mediaccc
Support for non-api mediaccc links, invidious shortened links, refactor mediaccc tests
2020-03-15 17:04:09 +01:00
TobiGr 40b3bc138f Remove hack to fix YoutubeStreamLinkHandlerFactoryTest of vnd.youtube videos 2020-03-14 21:54:54 +01:00
Tobias Groza 1c954fbded
Merge pull request #277 from XiangRongLin/vnd
Handle youtube stream urls in "vnd.youtube:videoId" format.
2020-03-14 21:52:49 +01:00
Tobias Groza 9edd0f2675
Merge pull request #288 from Stypox/fix-unlisted-video
[YouTube] Fix videos without next stream throwing error and add test for unlisted videos
2020-03-14 21:36:13 +01:00
Stypox 957b78ed9b
[YouTube] Add test for an unlisted video, which has no next stream 2020-03-14 14:04:01 +01:00
Stypox 325a51f73a
[YouTube] Do not crash if there is no next stream, but return null
Like every other extractor does if there is no next stream
2020-03-14 14:02:48 +01:00
TobiGr aea0962cfe [SoundCloud] Update hardcoded client id 2020-03-14 12:41:44 +01:00
Mauricio Colli b086e9db3f
[YouTube] Fix id extraction for some channels
Some channels had no reliable way to get the redirected id in the response,
so saving it for later was a valid alternative.
2020-03-14 02:39:49 -03:00
Mauricio Colli 00d1ed439b
[YouTube] Fix channel extraction when redirects are in the response
Some redirects were embed directly into the response as instructions
for the page, instead of the usual http redirects.
2020-03-14 02:39:48 -03:00
bopol 66518ec444 check wether mediaccc streams url are secure 2020-03-13 20:07:36 +01:00
bopol 0cd5e05b7b MediaCCCLH: use substring instead of replace; improve a bit tests, return Collections.emptyList(); instead of null where it's annotated @NonNull 2020-03-13 20:00:49 +01:00
bopol f742a6bd3e code optimization 2020-03-13 20:00:49 +01:00
bopol 9701c7d800 invidious shortened links 2020-03-13 20:00:49 +01:00
bopol e8e535b815 mediaccc: update linkhandlers & refactor tests 2020-03-13 20:00:49 +01:00
Mauricio Colli 70abd57852
[YouTube] Cache commonly used stream type result 2020-03-07 16:48:32 -03:00
Mauricio Colli 1ef706f567
[YouTube] Detect LIVE videos in the trending page 2020-03-07 16:48:31 -03:00
Xiang Rong Lin cc8fb486ee Handle youtube stream urls in "vnd.youtube:videoId" format.
The official YouTube app accept intents in this format, which causes other developers to use it.
2020-03-02 20:40:33 +01:00
Mauricio Colli 6aa4d59b91
[PeerTube] Update video used in age limit test (the previous was 404) 2020-03-01 10:29:30 -03:00
Mauricio Colli cfc278317d
[YouTube] Fail-fast if status exist and is anything other than "OK" 2020-03-01 10:29:29 -03:00
Mauricio Colli 90ae5fbea2 Improve kiosk tests across services 2020-03-01 12:57:18 +01:00
Mauricio Colli e590417cc4 Test if services recognizes their own items urls 2020-03-01 12:57:18 +01:00
TobiGr 35252235b0 Go through all badges when checking if a StreamInfoItem is a live stream 2020-03-01 12:52:37 +01:00
Mauricio Colli 5686a6f562 [YouTube] Detect when a stream is deleted or doesn't exist
Added a test case as well.
2020-03-01 12:49:13 +01:00
Mauricio Colli e65333c3ce [YouTube] Detect deleted/nonexistent/invalid channels and playlists
- Added tests for these cases.
2020-03-01 12:49:13 +01:00
Mauricio Colli 98e359438a [YouTube] Detect simple 404s in the standard fetch method 2020-03-01 12:49:13 +01:00
Mauricio Colli 408f042127 [YouTube] Fix bug when url isn't present in the browseEndpoint object 2020-03-01 12:49:13 +01:00
Mauricio Colli 342bdbb852 [YouTube] Avoid crashing by letting exceptions bubble up 2020-03-01 12:49:13 +01:00
Mauricio Colli e9644e6216 [YouTube] Handle video premiere's date and duration 2020-03-01 12:49:13 +01:00
Mauricio Colli 2a470ac4f7 [YouTube] Handle videos with no views or with "Recommended to you" text 2020-03-01 12:49:13 +01:00
Mauricio Colli da2c562eb0 [YouTube] Take into account videos that have their views hidden
Also remove catch because it may hide bugs when the page changes.
2020-03-01 12:49:13 +01:00
Mauricio Colli f66c20de54 Ignore null-keyed entries when iterating through the response headers 2020-03-01 12:49:13 +01:00
Mauricio Colli 5edd774fc4 Add latest url to the response to make detection of a redirect possible
Will be latest one in this commit because there's need to check the
history of redirects as of now.
2020-03-01 12:49:13 +01:00
Mauricio Colli 3441946bea Make test downloader return a response instead of throwing an exception
The test implementation was throwing an exception instead of just
returning the response and letting the caller handle it.
2020-03-01 12:49:13 +01:00
wb9688 df219a9453 Don't use StandardCharsets class 2020-03-01 09:41:06 +01:00
wb9688 2807079531 Catch NumberFormatException instead of checking whether viewCount equals "Recommended for you" 2020-02-29 21:28:38 +01:00
wb9688 3e4d2fd64e Improve testChannelUrl() 2020-02-29 18:20:35 +01:00
wb9688 bfe3eb1409 Use suggested try-if code style 2020-02-29 17:18:50 +01:00
wb9688 a6a63e9570 Let isHardcodedClientVersionValid() throw IOException 2020-02-29 17:01:36 +01:00
wb9688 45df8248bf Use Localization in getJsonResponse() 2020-02-29 16:55:07 +01:00
wb9688 157055fbfd Create getJsonResponse() function 2020-02-29 16:42:04 +01:00
wb9688 4f406512c2 Use YoutubeChannelLinkHandlerFactory 2020-02-29 16:26:28 +01:00
wb9688 4ff655352d Reimplement getAgeLimit() 2020-02-28 17:14:26 +01:00
wb9688 6ba03e542b Cache getVideoTab() 2020-02-28 17:05:31 +01:00
wb9688 8bfbae904d Cache getVideo(Primary|Secondary)InfoRenderer() 2020-02-28 17:03:21 +01:00
wb9688 0b940f5cf4 Use "getAgeLimit() != NO_AGE_LIMIT" instead of "getAgeLimit() == 18" 2020-02-28 16:40:50 +01:00
wb9688 beb07a4852 Add test to check whether hardcoded client version is still valid 2020-02-28 16:36:14 +01:00
wb9688 b89b6b1db2 Check if hard-coded client version is valid in separate function 2020-02-28 16:35:24 +01:00
wb9688 7898ba230d Use pbj in YoutubeStreamExtractor 2020-02-28 15:17:47 +01:00
wb9688 612ec06839 Actually fix thumbnail URLs starting with // 2020-02-28 09:36:33 +01:00
wb9688 f946310af5 Fix search queries with a promotedSparklesTextSearchRenderer returning 0 results 2020-02-28 08:57:44 +01:00
wb9688 94a2d5be46 Fix thumbnail URLs starting with // 2020-02-27 19:08:46 +01:00
wb9688 838d834ce2 Get Uploads view of Videos tab 2020-02-27 18:54:27 +01:00
wb9688 365b0329f3 Implement getTextFromObject() function 2020-02-27 17:39:23 +01:00
wb9688 0798bdd5cd Fix getSubscriberCount() for 0 subscribers 2020-02-27 16:26:22 +01:00
wb9688 8ebd971648 Fix channel descriptions consisting of multiple parts 2020-02-27 10:06:35 +01:00
wb9688 880b951088 Fix getUploaderAvatarUrl() in YoutubeStreamExtractor 2020-02-27 09:53:59 +01:00
wb9688 8aa560bef4 Fix video titles consisting of multiple parts due to @ 2020-02-27 09:42:22 +01:00
wb9688 951ed9f0d8 Don't call getUploaderInfo() in onFetchPage() for playlists
This way YouTube Music playlists will keep working in NewPipe
2020-02-27 09:27:56 +01:00
wb9688 2399d46ab0 Fix YoutubeChannelExtractor for channels without videos 2020-02-27 09:21:25 +01:00
wb9688 cdbc751b87 Fix getUploaderUrl() in YoutubeStreamInfoItemExtractor 2020-02-27 09:05:41 +01:00
wb9688 db305408e9 Get all expandedShelfContentsRenderers in YoutubeTrendingExtractor 2020-02-26 20:37:20 +01:00
wb9688 a2d8489e16 Parse timestamps in description 2020-02-26 20:27:30 +01:00
wb9688 8d503407ef Parse browseEndpoint and watchEndpoint in descriptions 2020-02-26 19:37:58 +01:00
wb9688 8dc39d517a Fix tests
Except testGetFullLinksInDescription() in DescriptionTestUnboxing, since that requires other changes first.
2020-02-26 17:31:01 +01:00
wb9688 88282761f4 Fix YoutubeStreamExtractor not being able to getAgeLimit() in onFetchPage() 2020-02-26 16:19:42 +01:00
wb9688 bb3a3d70bf Use pbj in YoutubeTrendingExtractor 2020-02-26 16:10:24 +01:00
wb9688 1c3a4e710b Check if there are no related streams in getAgeLimit() 2020-02-26 16:03:06 +01:00
wb9688 985c3ec877 Improve getClientVersion() 2020-02-26 15:27:50 +01:00
wb9688 15afbea3e1 Use pbj in YoutubePlaylistExtractor 2020-02-26 15:27:50 +01:00
wb9688 89a41a7f69 Use pbj in YoutubeChannelExtractor 2020-02-26 15:27:50 +01:00
wb9688 0973263aab Use pbj in YoutubeSearchExtractor 2020-02-26 15:27:46 +01:00
TobiGr fc465c8bf7 Fix getUploadDate() for premiered videos with a given date
Detect publishDate and uploadDate
2020-02-25 22:54:37 +01:00
TobiGr 96285e0815 Fix getUploadDate() for premiered videos with a given date 2020-02-25 21:51:30 +01:00
wb9688 5a35300a5e Fix parsing upload date for premiered streams 2020-02-25 21:51:30 +01:00
wb9688 729fd2eaee Fix parsing description for navigationEndpoint without urlEndpoint 2020-02-25 21:51:30 +01:00
wb9688 26fb44595f Fix parsing description 2020-02-25 21:51:30 +01:00
TobiGr 0fff03038e Get description with correct links 2020-02-25 21:51:30 +01:00
wb9688 5d08c34322 Fix parsing upload date in YoutubeStreamExtractor 2020-02-25 21:51:30 +01:00
wb9688 bbe1a3cd62 Use getVideo(Primary|Secondary)InfoRenderer() 2020-02-25 21:51:30 +01:00
wb9688 8e6be880d7 Simplify getId() in YoutubeChannelExtractor 2020-02-25 21:51:30 +01:00
TobiGr ecfc27a92c Implement fallback methods for getDescription() and getTextualUploadDate() in YouTubeStreamExtractor 2020-02-25 21:51:30 +01:00
wb9688 eed29ea734 Return null for related streams at age restricted videos 2020-02-25 21:51:30 +01:00
TobiGr 9efcc61ca6 Adapt some tests to match the new URLs 2020-02-25 21:51:30 +01:00
TobiGr f39603f6ef Implement getUploadDate() in YouTubeStreamInfoItemExtractor 2020-02-25 21:51:30 +01:00
wb9688 26ea3dceb6 Fix getViewCount() in YoutubeStreamExtractor 2020-02-25 21:51:30 +01:00
wb9688 76d54abdbf Reimplement more methods in YoutubeStreamExtractor 2020-02-25 21:51:30 +01:00
wb9688 f13c0288cc Reimplement some methods in YoutubeStreamExtractor 2020-02-25 21:51:30 +01:00
wb9688 02b59903fa Remove useless code 2020-02-25 21:51:30 +01:00
TobiGr dd4dd849dc Get client version dynamically in YouTubeSearchExtractor 2020-02-25 21:51:30 +01:00
TobiGr 583e9c1571 Fix getPage()
Someone should check if there are unstaged changes before committing...
2020-02-25 21:51:30 +01:00
TobiGr 5842b9ad37 Add getClientVersion() and HARDCODED_CLIENT_VERSION to YouTubeParsingHelper
Prefer hardcoded client version above the current one when making requests to retrieve the same JSON structure for each request.
2020-02-25 21:51:30 +01:00
wb9688 5d883d100c Implement pagination in YoutubeSearchExtractor 2020-02-25 21:51:30 +01:00
wb9688 c0a8e01889 Implement pagination in YoutubePlaylistExtractor 2020-02-25 21:51:30 +01:00
wb9688 4039409820 Fix getLikeCount() for certain streams 2020-02-25 21:51:30 +01:00
wb9688 627ab2459f Uncomment fetchPage() 2020-02-25 21:51:30 +01:00
wb9688 2dfa2187ff Implement pagination in YoutubeChannelExtractor 2020-02-25 21:51:30 +01:00
wb9688 a38ab9b791 Return null if channel has no banner 2020-02-25 21:51:30 +01:00
wb9688 1eca63089b Count private and deleted videos as ad 2020-02-25 21:51:30 +01:00
wb9688 c7360e4a46 Fix getThumbnailUrl() in YoutubeChannelInfoItemExtractor 2020-02-25 21:51:30 +01:00
wb9688 51fb26625a Implement getSubscriberCount() in YoutubeChannelInfoItemExtractor 2020-02-25 21:51:30 +01:00
TobiGr 6d20b2b1d0 Fix NPE on collecting page items 2020-02-25 21:51:30 +01:00
wb9688 4462cbe3f1 Reimplement YoutubePlaylistInfoItemExtractor 2020-02-25 21:51:30 +01:00
wb9688 8aea4d445b Reimplement YoutubeChannelInfoItemExtractor 2020-02-25 21:51:30 +01:00
wb9688 3187116a63 Handle premium videos 2020-02-25 21:51:30 +01:00
wb9688 7442f91aa6 Don't assume which channel tab is videos 2020-02-25 21:51:30 +01:00
wb9688 316fe0109d Fix first playlist page 2020-02-25 21:51:30 +01:00
wb9688 4e57e589ce Fix first channel page 2020-02-25 21:51:30 +01:00
TobiGr 5816202cc7 Move getInitialData() method to YouTubeParsingHelper
Rename ytInitialData to initialData
2020-02-25 21:51:30 +01:00
wb9688 38aabc6aca Use plain YoutubeStreamInfoItemExtractor in YoutubeTrendingExtractor 2020-02-25 21:51:30 +01:00
wb9688 957db062ef Fix getting uploader for videoRenderer 2020-02-25 21:51:30 +01:00
wb9688 b88188d419 Move stuff from extractVideoPreviewInfo() into YoutubeStreamInfoItemExtractor and partially fix search 2020-02-25 21:51:30 +01:00
wb9688 af49b3c487 Fix live streams in extractVideoPreviewInfo() 2020-02-25 21:51:30 +01:00
TobiGr f33f9466ce Fix testDescription() in ChannelExtractor 2020-02-25 21:51:30 +01:00
TobiGr 10e9c16d8c Fix LiveStream view count 2020-02-25 21:51:30 +01:00
wb9688 127c4d5893 Fix getNextStream() in YoutubeStreamExtractor 2020-02-25 21:51:30 +01:00
wb9688 7bfc0e62c6 Fix getRelatedStreams() in YoutubeStreamExtractor 2020-02-25 21:51:30 +01:00
TobiGr 12166ca60c [StreamExtractor] Add fallback method for uploader avatar url 2020-02-25 21:51:30 +01:00
wb9688 3ec422a542 Fix like/dislike parsing 2020-02-25 21:51:30 +01:00
TobiGr a34e5c18e1 Trending StreamInfoItemCollecetor 2020-02-25 21:51:30 +01:00
TobiGr b705515da0 Adapt most playlist fields 2020-02-25 21:51:30 +01:00
TobiGr 21253abd9b Use Firefox ESR User-Agent: 68 2020-02-25 21:51:30 +01:00
TobiGr 655c999795 Detect disabled subriber count correctly
Fix parsing of kiosk name
2020-02-25 21:51:30 +01:00
TobiGr 7dcc9f159b Stream: fix uploader avatar url 2020-02-25 21:51:30 +01:00
TobiGr be3e20e263 Adapt most channel changes 2020-02-25 21:51:30 +01:00
TobiGr 39bf1ff1eb Add ytInitialData regex 2020-02-25 21:51:30 +01:00
Tobias Groza a129c65c63
more improvements of comments
Co-Authored-By: Stypox <stypox@pm.me>
2020-02-16 23:59:31 +01:00
TobiGr 0a4115286b Apply one suggestion 2020-02-15 13:36:54 +01:00
Tobias Groza 6822574588 Fix typos
Co-Authored-By: B0pol <bopol@e.email>
2020-02-15 13:36:54 +01:00
TobiGr 030465b5d4 Improve code formatting and optimise imports 2020-02-15 13:36:54 +01:00
TobiGr 9112a106ea [SoundCloud] Update client_id 2020-02-08 23:09:03 +01:00
TobiGr 008b6f505c [PeerTube] Fix subscriber count in ChannelExtractorTest 2020-02-08 23:08:37 +01:00
TobiGr 0e33249c85 Fix SoundCloud description test 2020-02-08 22:20:20 +01:00
bopol 11bcc78d9c Description implements Serializable. fix NotSerializableException 2020-02-07 14:10:54 +01:00
bopol 0f8a7f9df2 fix testGetUploadDate for PeerTubeStreamExtractor 2020-02-07 13:33:50 +01:00
bopol 70a40e7388 Description: rm constructor by serviceId 2020-02-07 13:28:27 +01:00
bopol 26c65b2948 Create class Description 2020-02-06 23:35:46 +01:00
bopol 5756df8dc7 Use GMT as base time (actually fix upload date) 2020-02-06 22:33:48 +01:00
B0pol b671a4ba18
Merge branch 'dev' into peertube 2020-02-01 18:18:23 +00:00
Mauricio Colli 26234a1c0f
Introduce FeedExtractor making fetching from dedicated feeds possible
YouTube, for example, has a dedicated feed which was built to be used
like this.
2020-01-28 02:44:18 -03:00
Mauricio Colli be81f2945c
[YouTube] Use correct upload date flag in StreamExtractor 2020-01-28 02:44:17 -03:00
Mauricio Colli 5c0c35064c
Use clean url and id when creating a channel info 2020-01-28 02:44:16 -03:00
TobiGr 033a9fb8e3 Revert change which I accidentally committed while fixing the decryption
function in 7b72fd2a7d
2020-01-25 21:08:17 +01:00
B0pol e392b6c68f getLanguageInfo returns Locale instead of String
so that java can automatically translate with Locale.getDisplayLanguage(), instead of always having English name of the language
2020-01-25 14:12:38 +01:00
B0pol 341372c0d0 reindenting (ctrl alt l) on JsonUtils and PeertubeStreamExtractor 2020-01-24 20:16:24 +01:00
B0pol b816e48216
Merge branch 'dev' into peertube 2020-01-24 20:10:47 +01:00
TobiGr f8d117f6cd Merge remote-tracking branch 'origin/master' into dev 2020-01-24 19:22:40 +01:00
TobiGr 7b72fd2a7d [YouTube] Add new decryption function 2020-01-24 02:10:56 +01:00
TobiGr bce87f3d01 Improve getDescriptionFuncName by removing catches and adding a loop 2020-01-24 02:10:38 +01:00
TobiGr 9b45c61103 Typos, comments and formatting 2020-01-24 02:10:18 +01:00
TobiGr 29a4cc78bf Fix typo in decryption constant 2020-01-24 02:10:08 +01:00
B0pol 812c8e0ad2 authorName in comments now follow PeerTube website
https://peertube.cpy.re/videos/watch/d2a5ec78-5f85-4090-8ec5-dc1102e022ea
anonyme zirbeldrüse is his displayName, what was displayed in NewPipe.
but on the website, it's shown 777@mastodon.xyz
2020-01-24 00:22:05 +01:00
bopol c790261eed update test 2020-01-23 19:08:41 +01:00
bopol a691d6d0fc fix upload date: there was a one hour delay
on peertube.co.uk: https://i.imgur.com/8Pai1rb.png
on newpipe, before this commit: https://i.imgur.com/NIRbs4Z.png
on newpipe, with this commit: https://i.ibb.co/mhKKtRD/Screenshot-20200123-185422-New-Pipe-Debug.png
2020-01-23 19:02:40 +01:00
bopol 20da4750f8 empty support returns "", same for empty description 2020-01-23 14:37:14 +01:00
bopol 74439f692a add extraction for support info and rename getLanguageInfo function 2020-01-23 14:19:22 +01:00
B0pol 1a15c0e750 agelimit now returns 18 if the video is marked as nsfw, 0 otherwise
+ created getBoolean method in JsonUtils.java
2020-01-23 04:42:54 +01:00
B0pol bcfe7be4e6
Merge branch 'dev' into peertube 2020-01-22 19:19:41 +01:00
Tobias Groza b9afc9807c
Merge pull request #233 from Stypox/yt-stream-ext
Youtube stream extractor improvements by using playerResponse json
2020-01-20 23:17:36 +01:00
Stypox 1cfdc4547a
Update extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
Co-Authored-By: Tobias Groza <TobiGr@users.noreply.github.com>
2020-01-20 22:52:48 +01:00
Stypox 1e1100ef76
Update extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
Co-Authored-By: Tobias Groza <TobiGr@users.noreply.github.com>
2020-01-20 22:52:36 +01:00
TobiGr 2308b074f0 [MediaCCC] Fix testGetTextualUploadDate() 2020-01-20 22:12:39 +01:00
TobiGr 089dbe8afb Fix StreamLinkHandlerFactoryTest by passing baseUrl to vdn.youtube urls 2020-01-20 22:10:18 +01:00
B0pol f403490bd9
Refactoring
Co-Authored-By: Tobias Groza <TobiGr@users.noreply.github.com>
2020-01-20 21:28:26 +01:00
TobiGr 69ccb7e69d Update subtitle tests comments 2020-01-20 21:25:47 +01:00
TobiGr 7943130307 Throw IllegalArgumentException when url is null in LinkHandlerFactory 2020-01-20 21:25:16 +01:00
TobiGr 39de55dcd3 [YouTube] Fix and move streamCountTest 2020-01-20 21:24:51 +01:00
bopol ad7f97ae83 fix PeerTube description and add more description tests
actually, the max description length is 250 after request with our extractor.
during my tests, I made API requests with Firefox, copy/pasted into echo "insert description" | wc, and it was giving a wrong length, maybe due to the escapers, I have no idea
anyway, it's now fixed
2020-01-20 15:14:23 +01:00
bopol b382416372 changed the way to extract peertube description
if the description length is above 254, and ends with ..., it means the description we got from the first request is shortened.
why above 254: because in fact, shortened descriptions length are between 255 : https://framatube.org/videos/watch/24efbe1b-73c0-4d72-a3ff-77c8b32d3fcd
https://framatube.org/videos/watch/1ca99f40-fb5b-4fa4-abe5-4d54325df7fc
and 269: https://framatube.org/videos/watch/4d661d5f-a884-4510-bca8-15cb19aa3fe5

also fixed a typo in StreamExtractor.java
2020-01-20 14:36:12 +01:00
bopol a281519e77 added metadata, fix descriptions, fix thumbnail, update tests
thumbnail: quality before: https://peertube.cpy.re/static/thumbnails/d2a5ec78-5f85-4090-8ec5-dc1102e022ea.jpg
quality after: https://peertube.cpy.re/static/previews/d2a5ec78-5f85-4090-8ec5-dc1102e022ea.jpg

description: we were getting about the first 260 characters, we now get full description (with fallback to first 260 chars if the get request for full description fails)
test: updated tests to match description, also changed some test: it was assertEquals(extracted, expected), but the proper way to do it is assertEquals(expected, extracted)

metadata: got host, privacy (public, private, unlisted), licence, language, tags
2020-01-20 12:22:33 +01:00
Tobias Groza 2ee558fbe7
Merge pull request #237 from B0pol/fix_invidious_comments
Fix invidious comments
2020-01-17 22:55:51 +01:00
Tobias Groza 5a259fca94
Merge pull request #238 from B0pol/c_links_support
add support to /c/shortened_url channel links
2020-01-17 22:53:46 +01:00
bopol 221e8dd171 changed assertTrue(string.equals(string)) to assertEquals(string, string) 2020-01-17 21:24:52 +01:00
bopol 5e81ed1dff add support to /c/shortened_url channel links 2020-01-17 19:27:54 +01:00
B0pol 7e8d00981f changed getId() to remove duplicate code 2020-01-17 13:44:55 +01:00
B0pol 02930d08f1 added comments test for invidious 2020-01-17 12:58:50 +01:00
B0pol a12c0e2a37 fix:invidious: getID and onAccpetURl for comments 2020-01-17 12:09:59 +01:00
B0pol 3743c60695 fix: typos in Test 2020-01-15 14:27:52 +01:00
Stypox 0567c20549
Merge branch 'dev' into yt-stream-ext 2020-01-07 00:10:06 +01:00
Stypox 7ba04836eb
Add tests for ratings in yt stream extractor tests 2020-01-06 23:57:08 +01:00
Stypox 1bb6cdee22
Enable commented-out test for yt stream extractor 2020-01-06 21:43:24 +01:00
Stypox d5ca02f3f6
Fix test failing because music channel could be Vevo
In yt stream extractor test.
The Vevo and the normal music channel are equivalent, so Youtube picks one of them at random, and in playerResponse the channel id is Vevo's one.
2020-01-06 21:41:15 +01:00
Stypox 1689037b01
Fix getLength() tests now that the value is rounded (not floor-ed)
In yt stream extractor
2020-01-06 20:49:08 +01:00
Stypox 1ed89aad3e
Use more often playerResponse in yt stream extractor
This enhances performance and should make the extractor more reliable since it get info from a stable json structure that shouldn't be subject to many changes. Fallback html methods have been kept. In case of error the thrown exception contains the data about the playerResponse failure, that should be clearer than a NPE caused by not-found html tags.
2020-01-06 20:45:57 +01:00
pihug12 d4e0930f44 [Soundcloud] Update client_id 2019-12-31 23:36:23 +01:00
Tobias Groza d83787a5ca
Merge pull request #226 from 7FM/dev
fix switching on null causing NPE
2019-12-31 00:26:27 +01:00
TobiGr 0b6e37e71f Improve YouTubeSearchPagingtest 2019-12-31 00:18:53 +01:00
Zsombor Gegesy 64729e5357 Improve the tests 2019-12-29 23:14:55 +01:00
Zsombor Gegesy 68b0fd9650 Add test for search paging 2019-12-29 23:14:55 +01:00
Zsombor Gegesy 2123b3abd3 Fix search result paging - due to the way as the InfoItemsSearchCollector are re-used,
the returned item list just grows, which cause that same videos are returned.
2019-12-29 23:14:55 +01:00
Zsombor Gegesy 0a3422a591 Fix invalid jsoup query 2019-12-26 14:03:40 +01:00
7FM fd5ed07d33
Merge branch 'dev' into dev 2019-12-22 12:33:26 +01:00
TobiGr 8e53fdad16 [SoundCloud] Fix getAudioStreams 401 response
Fix TeamNewPipe/NewPipe#2823
2019-12-22 00:42:07 +01:00
7FM f57d9d43ce fix switching on null causing NPE 2019-12-21 14:15:42 +01:00
TobiGr 54d1a1a831 Fix SoundCloud client_id extraction and update SoundCloud client_id
Don't throw exception when hard coded client_id is wrong.
Addresses TeamNewPipe/NewPipe#2823
2019-12-12 18:01:48 +01:00
Redirion 035994b3cf
Update PlaylistInfo.java
added missing imports
2019-12-09 16:55:28 +01:00
Redirion e98112ea21
Update PlaylistInfo.java
Fixed typo
2019-12-07 14:34:15 +01:00
Redirion cdf41b868c
Allow PlayLists with missing uploader
This supports PR 2724 in NewPipe
2019-12-07 12:49:42 +01:00
yausername 00c23683b1
Merge remote-tracking branch 'upstream/dev' into peertube 2019-12-03 00:45:03 +05:30
yausername 5115541268
fix peertube trending, added most-liked kiosk 2019-12-03 00:42:06 +05:30
kapodamy c1d39f692d
Merge branch 'dev' into yt-webm-opus 2019-11-24 11:56:16 -03:00
yausername 6a7680ce17 added instance getter 2019-11-24 03:38:27 +05:30
yausername 281ccea39f [peertube] constant name for service 2019-11-24 02:35:41 +05:30
yausername bc75c6603b added getBaseUrl method to linkhandler 2019-11-23 00:05:49 +05:30
yausername 279f175693 validate peertube instance 2019-11-22 22:59:14 +05:30
yausername 4e0adbefbc [peertube] use baseUrl instead of global instance url 2019-11-21 05:35:22 +05:30
yausername 8a7aa6b9a9 added baseUrl param in linkhandlers. Required for multi instance services 2019-11-21 05:00:09 +05:30
yausername f3a59a6cdc merged upstream/dev 2019-11-20 03:08:17 +05:30
Mauricio Colli 0c6e2c8f23 Revert "Temp Commit: Ignore Test (Remove this before merge)"
This reverts commit 6ca4c8986a.
2019-11-18 10:09:18 +01:00
yausername 318f600527 add subtitles support for peertube 2019-11-16 04:30:13 +05:30
yausername bb5ad49fac fix html comments 2019-11-16 03:20:35 +05:30
yausername 193442d01c add original url for share 2019-11-16 02:42:39 +05:30
yausername d7582734e7 merged upstream/dev 2019-11-16 00:07:45 +05:30
Mauricio Colli 3d21ef5dba
Introduce class that indicates when the time ago is an approximation 2019-11-03 15:46:28 -03:00
Mauricio Colli 6ca4c8986a
Temp Commit: Ignore Test (Remove this before merge) 2019-11-03 15:46:27 -03:00
Mauricio Colli 41b51adceb
[YouTube] Force english as the only supported language (#196) 2019-11-03 15:46:25 -03:00
Mauricio Colli cb1e327a6e
[YouTube] Fix parsing of video reminders 2019-11-03 15:46:23 -03:00
Mauricio Colli d8280ce0da
[YouTube] Parse watching count in live streams items 2019-11-03 15:46:22 -03:00
Mauricio Colli 3638f0e0ea
Implement time ago parser and improve localization handling
- Handle special cases for languages where the number is not shown
- Rework the Downloader base implementation, allowing for more
advanced things to be done
- Separate the localization from the content country (just like
YouTube let's the user choose both).
2019-11-03 15:46:21 -03:00
wojcik-online 180836c180
Base Implementation: Parse the upload date of StreamInfoItems
In the format '2 days ago' (in English) on a YouTube channel page.
(Parser extensible to other pages.)
2019-11-03 15:46:20 -03:00
Mauricio Colli c4fe2183ce
[YouTube] Improve detection of reCAPTCHA pages 2019-10-29 02:00:41 -03:00
Mauricio Colli 9a325b280d
[YouTube] Make detection of age restricted pages more reliable 2019-10-29 02:00:40 -03:00
Mauricio Colli 91c360df5e
Remove section of dead code 2019-10-29 02:00:39 -03:00
Mauricio Colli ddd563fe78 [SoundCloud] Add test for hardcoded client id 2019-10-23 16:54:20 +02:00
Mauricio Colli 4fc18a6994 [SoundCloud] Fix extraction of client id
- Hardcoded id and check at the first usage.
- As a fallback, and considering that the scripts containing the client
id were all split up, try searching it in each of them.
2019-10-23 16:54:20 +02:00
Mauricio Colli 250c0bb1e8 Add head request to the current downloader implementation 2019-10-23 16:54:20 +02:00
kapodamy 3c6e93c96a
Merge branch 'dev' into yt-webm-opus 2019-10-12 14:01:50 -03:00
Tobias Groza 06f2144e4d
[YouTube] Remove GEMA exception handling (#202) 2019-10-05 14:59:05 +02:00
kapodamy 95f93bc71c
Merge branch 'dev' into yt-webm-opus 2019-10-01 13:11:43 -03:00
Stypox fbb9a86c9f
Merge branch 'dev' into yt-webm-opus 2019-09-29 18:16:14 +02:00
Vasiliy d8279f91f6
Merge branch 'dev' of https://github.com/TeamNewPipe/NewPipeExtractor into feature/frames 2019-09-28 14:46:14 +03:00
TobiGr 8ab48c62b9 [YouTube] Fix NPE in ChennelExtractor.getSubsciberCount() 2019-09-25 08:57:08 +02:00
TobiGr 0710f31a39 Fix TeamNewPipe/NewPipeExtractor#197 2019-09-25 08:37:26 +02:00
Stypox d1cd341592 Change comment 2019-09-25 08:32:00 +02:00
Stypox f6088c4fc1 Add test for Eminem channel (it has no "Subscribe" button) 2019-09-25 08:32:00 +02:00
Stypox 35921345d9 Use Exception instead of Throwable (more consistent) 2019-09-25 08:32:00 +02:00
Stypox db3596c818 Fix "Could not get id" for channels w/o "Subscribe" button 2019-09-25 08:32:00 +02:00
Stypox 94e7f0d3ab Fix fallback method is not tried on exception
in YoutubeChannelInfoItem.getUrl()
2019-09-25 08:32:00 +02:00
kapodamy 12008fc6bb Update MediaFormat.java
declare WEBMA_OPUS
2019-09-23 21:25:19 -03:00
kapodamy 5f3c2f5622 Update ItagItem.java 2019-09-23 21:25:19 -03:00
TobiGr 6d504e0883 Add test for mixedNumberWordToLong method
Add Billion to mixedNumberWordToLong
2019-09-17 09:15:05 +02:00
TobiGr 06016d1ae3 Fix YouTube subscriber count
Modify test to fail on too small subscriber count
2019-09-16 23:16:05 +02:00
Tobias Groza dbdd9ed083
Merge pull request #195 from Stypox/livestream-fix
Fix livestreams
2019-09-12 22:40:44 +02:00
toehead2001 b709529cb6 Add link handler tests for music.youtube.com 2019-09-12 12:16:30 -06:00
toehead2001 075e6d51d6 Add music.youtube.com to link handler 2019-09-12 12:16:30 -06:00
Stypox 1a1672248a
Eliminate Android Studio warnings in livestream test 2019-09-12 15:11:23 +02:00
Stypox 3f1ba93be5
Fix NPE when extracting itags with non-existing streamingData key 2019-09-12 15:08:17 +02:00
Stypox 0d8fb65003
Fix NPE on determining whether stream is live on Youtube 2019-09-12 15:07:07 +02:00
Stypox 4453a63447
Add test for YouTube livestreams
The current livestream is https://www.youtube.com/watch?v=EcEMX-63PKY
2019-09-12 15:05:22 +02:00
Stypox 5f8e76eb87
Move stream-related youtube tests to subfolder 2019-09-12 14:36:42 +02:00
Tobias Groza bfa6b4d14b
Merge pull request #182 from 2secslater/patch-1
Add Invidious instances
2019-09-12 09:19:11 +02:00
Tobias Groza ec3554a2ea
Merge pull request #193 from Stypox/unavailable-video-fix
Fix TeamNewPipe/NewPipe#2615
2019-09-11 21:44:05 +02:00
Stypox 24a37b88a9
Use pre-generated playerResponse field in yt's getHlsUrl()
Also refactored code to always throw exception when the url can't be found
2019-09-11 20:12:30 +02:00
Stypox 9c423a0a40
Use FORMATS to get video+audio streams on yt
Not ADAPTIVE_FORMATS
2019-09-11 20:04:28 +02:00
Stypox e5e8c66686
Readd signature decryption in YtStreamExtractor 2019-09-11 19:56:16 +02:00
Stypox d9570d8634
Use pre-generated playerResponse field everywhere in YtStreamExtractor 2019-09-11 19:35:08 +02:00
Stypox 63a37c48e3
Remove println left behind 2019-09-11 19:31:39 +02:00
Stypox bf017bf5b9
Fix TeamNewPipe/NewPipe#2615 2019-09-11 19:05:41 +02:00
Vasiliy ecb8ad85a1
Update comments 2019-09-11 19:03:53 +03:00
Andrew d0f1c31b34
Add Invidious instances to parsing helper for YouTube 2019-09-10 17:54:32 +01:00
Vasiliy b55c05d04f
Update frameset extractor test 2019-09-10 19:42:55 +03:00
Vasiliy ab32b0ed84
Merge remote-tracking branch 'upstream/dev' into feature/frames 2019-09-10 19:39:58 +03:00
Vasiliy f084cfec24
Refactor frames extraction 2019-09-10 19:38:51 +03:00
Tobias Groza c7e9ad57c4
Merge branch 'dev' into patch-1 2019-09-09 19:05:00 +02:00