From 1e8fe57e5cd0f33f940df87430d75e1230ec5b7a Mon Sep 17 00:00:00 2001
From: pukkandan <pukkandan.ytdlp@gmail.com>
Date: Wed, 13 Jul 2022 15:03:05 +0530
Subject: [extractor] Support multiple archive ids for one video (#4307)

Closes #4352
---
 yt_dlp/extractor/funimation.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'yt_dlp/extractor/funimation.py')

diff --git a/yt_dlp/extractor/funimation.py b/yt_dlp/extractor/funimation.py
index 12cacd3b4..5881f1687 100644
--- a/yt_dlp/extractor/funimation.py
+++ b/yt_dlp/extractor/funimation.py
@@ -249,7 +249,8 @@ class FunimationIE(FunimationBaseIE):
         self._sort_formats(formats, ('lang', 'source'))
 
         return {
-            'id': initial_experience_id if only_initial_experience else episode_id,
+            'id': episode_id,
+            '_old_archive_ids': [initial_experience_id],
             'display_id': display_id,
             'duration': duration,
             'title': episode['episodeTitle'],
-- 
cgit v1.2.3


From 0647d9251f7285759109cc82693efee533346911 Mon Sep 17 00:00:00 2001
From: pukkandan <pukkandan.ytdlp@gmail.com>
Date: Tue, 2 Aug 2022 03:40:47 +0530
Subject: Minor bugfixes

---
 yt_dlp/extractor/funimation.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'yt_dlp/extractor/funimation.py')

diff --git a/yt_dlp/extractor/funimation.py b/yt_dlp/extractor/funimation.py
index 5881f1687..c70cf50c7 100644
--- a/yt_dlp/extractor/funimation.py
+++ b/yt_dlp/extractor/funimation.py
@@ -5,17 +5,18 @@ import string
 from .common import InfoExtractor
 from ..compat import compat_HTTPError
 from ..utils import (
+    ExtractorError,
     determine_ext,
     int_or_none,
     join_nonempty,
     js_to_json,
+    make_archive_id,
     orderedSet,
     qualities,
     str_or_none,
     traverse_obj,
     try_get,
     urlencode_postdata,
-    ExtractorError,
 )
 
 
@@ -250,7 +251,7 @@ class FunimationIE(FunimationBaseIE):
 
         return {
             'id': episode_id,
-            '_old_archive_ids': [initial_experience_id],
+            '_old_archive_ids': [make_archive_id(self, initial_experience_id)],
             'display_id': display_id,
             'duration': duration,
             'title': episode['episodeTitle'],
-- 
cgit v1.2.3


From 9f14daf22b4080ae1531a772ee7574959af4e2fa Mon Sep 17 00:00:00 2001
From: pukkandan <pukkandan.ytdlp@gmail.com>
Date: Thu, 17 Nov 2022 10:40:03 +0530
Subject: [extractor] Deprecate `_sort_formats`

---
 yt_dlp/extractor/funimation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yt_dlp/extractor/funimation.py')

diff --git a/yt_dlp/extractor/funimation.py b/yt_dlp/extractor/funimation.py
index c70cf50c7..18363c1b9 100644
--- a/yt_dlp/extractor/funimation.py
+++ b/yt_dlp/extractor/funimation.py
@@ -247,7 +247,6 @@ class FunimationIE(FunimationBaseIE):
             self.raise_no_formats(
                 'There are no video formats matching the requested languages/versions', expected=True, video_id=display_id)
         self._remove_duplicate_formats(formats)
-        self._sort_formats(formats, ('lang', 'source'))
 
         return {
             'id': episode_id,
@@ -266,6 +265,7 @@ class FunimationIE(FunimationBaseIE):
             'formats': formats,
             'thumbnails': thumbnails,
             'subtitles': subtitles,
+            '_format_sort_fields': ('lang', 'source'),
         }
 
     def _get_subtitles(self, subtitles, experience_id, episode, display_id, format_name):
-- 
cgit v1.2.3