Release 2021.03.24

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 9e4f75227e2cbc15efd985a0f0d4f7bf1f220495..efdad78dd36e11dc32d4d56035a20996359d9041 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -33,3 +33,5 @@ teesid
 kevinoconnor7
 damianoamatruda
 2ShedsJackson
+CXwudi
+xtkoba

diff --git a/Changelog.md b/Changelog.md
index 3737a23fef95b7824ad5493f44fbb8c938aaa0fa..d498bbe4a811b4638046ed8085803308e9e1e5b9 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,9 +17,19 @@ # Instuctions for creating release
 -->
 
 
+### 2021.03.24
+* Merge youtube-dl: Upto [commit/8562218](https://github.com/ytdl-org/youtube-dl/commit/8562218350a79d4709da8593bb0c538aa0824acf)
+* Parse metadata from multiple fields using `--parse-metadata`
+* Ability to load playlist infojson using `--load-info-json`
+* Write current epoch to infojson when using `--no-clean-infojson`
+* [youtube_live_chat] fix bug when trying to set cookies
+* [niconico] Fix for when logged in by: @CXwudi and @xtkoba
+* [linuxacadamy] Fix login
+
+
 ### 2021.03.21
 * Merge youtube-dl: Upto [commit/7e79ba7](https://github.com/ytdl-org/youtube-dl/commit/7e79ba7dd6e6649dd2ce3a74004b2044f2182881)
-* Option `--clean-infojson` to keep private keys in the infojson
+* Option `--no-clean-infojson` to keep private keys in the infojson
 * [aria2c] Support retry/abort unavailable fragments by [damianoamatruda](https://github.com/damianoamatruda)
 * [aria2c] Better default arguments
 * [movefiles] Fix bugs and make more robust

diff --git a/README.md b/README.md
index ba1b01702ca5484d2117d7d983179dbb48e7834d..999d9f39db9d59469b05ad1c7bddf84e54e91d00 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ # YT-DLP
 [![Release version](https://img.shields.io/github/v/release/yt-dlp/yt-dlp?color=brightgreen&label=Release)](https://github.com/yt-dlp/yt-dlp/releases/latest)
 [![License: Unlicense](https://img.shields.io/badge/License-Unlicense-blue.svg)](LICENSE)
 [![CI Status](https://github.com/yt-dlp/yt-dlp/workflows/Core%20Tests/badge.svg?branch=master)](https://github.com/yt-dlp/yt-dlp/actions)
-[![Discord](https://img.shields.io/discord/807245652072857610?color=blue&label=discord&logo=discord)](https://discord.gg/S75JaBna)  
+[![Discord](https://img.shields.io/discord/807245652072857610?color=blue&label=discord&logo=discord)](https://discord.gg/H5MNcFW63r)  
 
 [![Commits](https://img.shields.io/github/commit-activity/m/yt-dlp/yt-dlp?label=commits)](https://github.com/yt-dlp/yt-dlp/commits)
 [![Last Commit](https://img.shields.io/github/last-commit/yt-dlp/yt-dlp/master)](https://github.com/yt-dlp/yt-dlp/commits)
@@ -58,7 +58,7 @@ # NEW FEATURES
 
 * **[Format Sorting](#sorting-formats)**: The default format sorting options have been changed so that higher resolution and better codecs will be now preferred instead of simply using larger bitrate. Furthermore, you can now specify the sort order using `-S`. This allows for much easier format selection that what is possible by simply using `--format` ([examples](#format-selection-examples))
 
-* **Merged with youtube-dl v2021.03.14**: You get all the latest features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494/yt-dlc)
+* **Merged with youtube-dl v2021.03.25**: You get all the latest features and patches of [youtube-dl](https://github.com/ytdl-org/youtube-dl) in addition to all the features of [youtube-dlc](https://github.com/blackjack4494/yt-dlc)
 
 * **Merged with animelover1984/youtube-dl**: You get most of the features and improvements from [animelover1984/youtube-dl](https://github.com/animelover1984/youtube-dl) including `--get-comments`, `BiliBiliSearch`, `BilibiliChannel`, Embedding thumbnail in mp4/ogg/opus, Playlist infojson etc. Note that the NicoNico improvements are not available. See [#31](https://github.com/yt-dlp/yt-dlp/pull/31) for details.
 

diff --git a/supportedsites.md b/supportedsites.md
index e6700e529ddd38109ab5f5156ac75a9a0122f98c..d18a91ad3e7616b723de2d5e912c82183c30adae 100644 (file)
--- a/supportedsites.md
+++ b/supportedsites.md
@@ -97,7 +97,8 @@ # Supported sites
  - **bbc**: BBC
  - **bbc.co.uk**: BBC iPlayer
  - **bbc.co.uk:article**: BBC articles
- - **bbc.co.uk:iplayer:playlist**
+ - **bbc.co.uk:iplayer:episodes**
+ - **bbc.co.uk:iplayer:group**
  - **bbc.co.uk:playlist**
  - **BBVTV**
  - **Beatport**
@@ -1251,5 +1252,6 @@ # Supported sites
  - **zee5:series**
  - **Zhihu**
  - **zingmp3**: mp3.zing.vn
+ - **zingmp3:album**
  - **zoom**
  - **Zype**

diff --git a/yt_dlp/postprocessor/metadatafromfield.py b/yt_dlp/postprocessor/metadatafromfield.py
index e67e591e162f032a30e4d610e761d93acfed8077..636199214a920e8c7f05aee6da34018d593656c6 100644 (file)
--- a/yt_dlp/postprocessor/metadatafromfield.py
+++ b/yt_dlp/postprocessor/metadatafromfield.py
@@ -4,7 +4,6 @@
 
 from .common import PostProcessor
 from ..compat import compat_str
-from ..utils import str_or_none
 
 
 class MetadataFromFieldPP(PostProcessor):