Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging youtube-dl #280

Closed
wants to merge 19 commits into from
Closed

Merging youtube-dl #280

wants to merge 19 commits into from

Conversation

pukkandan
Copy link
Contributor

@pukkandan pukkandan commented Dec 6, 2020 •
edited

I will periodically update this PR with the latest version of youtube-dl. This doesn't have to be merged right away. It can be merged once there are enough changes accumulated to justify it

Updated to: 2021.01.16

Closes #288, Closes #271
Makes #290 obsolete (Related #228)
Makes #298 obsolete

Commits that have't been merged

  1. tiktok - ytdl and dlc's tiktok extractors are quite different and I dont understand the extractor enough to properly resolve the conflicts. @GreyAlien502 or @merval might wanna have a look
  2. hotstar, stitcher (+this) - I am not sure how to resolve the conflicts
  3. [youtube] Improve age-gated videos extraction - dlc has a better age gate bypass than ytdl. @blackjack4494 could check if any changes can be adapted from this commit.
  4. [youtube:tab] Capture and output alerts - My own implementation of the same is better imo because it gets all alerts and reports them as warnings. yt-dl's implementation instead gets the alerts only if there was an error.
  5. Switch to GitHub actions for CI - ytdl has now switched to Github Actions instead of Travis

The following files are ignored:

.github/ISSUE_TEMPLATE/1_broken_site.md
.github/ISSUE_TEMPLATE/2_site_support_request.md
.github/ISSUE_TEMPLATE/3_site_feature_request.md
.github/ISSUE_TEMPLATE/4_bug_report.md
.github/ISSUE_TEMPLATE/5_feature_request.md
.github/workflows/ci.yml
devscripts/run_tests.bat
youtube_dlc/version.py
.travis.yml
Changelog

PS:
Since this repo has been inactive for a while, I have created my own fork yt-dlp. Merging youtube-dl with both this repo and mine separately is proving to be unnecessary extra work. So I won't update this PR anymore. If/when @blackjack4494 returns and merges this PR, I will create a new PR with any pending updates.

@pukkandan
fix bug from #245
1652b62
@pukkandan
Merge ytdl
242148c 
Upto:
[generic] Extract RSS video itunes metadata
ytdl-org/youtube-dl@f2c704e

Except:
youtube_dl/extractor/tiktok.py - ytdl-org/youtube-dl@fb626c0
youtube_dlc/extractor/youtube.py

Ignored:
.travis.yml
.github/ISSUE_TEMPLATE/1_broken_site.md
.github/ISSUE_TEMPLATE/2_site_support_request.md
.github/ISSUE_TEMPLATE/3_site_feature_request.md
.github/ISSUE_TEMPLATE/4_bug_report.md
.github/ISSUE_TEMPLATE/5_feature_request.md
youtube_dlc/version.py
Changelog
@pukkandan
Merge youtube.py
a74f473 
Except:
[youtube] Improve age-gated videos extraction
ytdl-org/youtube-dl@59d63d8
@pukkandan
Update to release 2020.12.07
c7a1392
@nixxo
Copy link
Contributor

nixxo commented Dec 8, 2020

it will probably conflict with #274

@pukkandan
Copy link
Contributor Author

@nixxo whichever gets merged first, the other person can just resolve the conflicts

@pukkandan
Copy link
Contributor Author

pukkandan commented Dec 9, 2020 •
edited

@blackjack4494 It seems that travis is not running for any new PRs. Did you turn it off?

@pukkandan pukkandan mentioned this pull request Dec 10, 2020
Open
@pukkandan
Remove extractors
ff69587 
[beampro] Remove Extractor (#17290, #22871, #23020, #23061, #26099)
[smotri] Remove extractor (#27358)
@pukkandan
Update to release 2020.12.12
b1ef860
@pukkandan
Update to release 2020.12.14
c09b3b1 
Except: [hotstar] fix and improve extraction ytdl-org/youtube-dl@bb38a12
@Lesmiscore
Copy link
Contributor

Lesmiscore commented Dec 16, 2020 •
edited

@blackjack4494 It seems that travis is not running for any new PRs. Did you turn it off?

Probable no, Travis now have a very tight limit.

https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing

@pukkandan
Update to 76fe4ba
c228e57 
[redditr] Extract duration
ytdl-org/youtube-dl@76fe4ba
This was referenced Dec 19, 2020
Open
Open
@merval
Copy link

merval commented Dec 25, 2020

Crap. I missed the mention here. I'll take a look at the TikTok commit when I get a chance

@pukkandan pukkandan mentioned this pull request Dec 28, 2020
Closed
9 tasks
@pukkandan pukkandan mentioned this pull request Jan 10, 2021
Open
9 tasks
@pukkandan
Copy link
Contributor Author

I have updated this PR to the latest version 2021.01.16. Since this repo has been inactive for a while, I have created my own fork yt-dlp. Merging youtube-dl with both this repo and mine is proving to be unnecessary extra work. So I won't update this PR anymore. If/when @blackjack4494 returns and merges this PR, I will create a new PR with any pending updates.

@pukkandan pukkandan closed this Jan 22, 2021
@pukkandan pukkandan deleted the merge-ytdl2 branch January 22, 2021 00:49
@pukkandan pukkandan restored the merge-ytdl2 branch January 25, 2021 04:28
@pukkandan pukkandan reopened this Jan 25, 2021
@pukkandan pukkandan mentioned this pull request Jan 27, 2021
Closed
6 tasks
@pukkandan
Copy link
Contributor Author

I am deleting this branch to keep yt-dlp clean. You can find a clone at https://github.com/pukkandan/yt-dlp/tree/merge-ytdl2

@pukkandan pukkandan closed this Mar 15, 2021
@pukkandan pukkandan deleted the merge-ytdl2 branch March 15, 2021 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@pukkandan @nixxo @Lesmiscore @merval