[extractor] Support merging subtitles with data
Authored-by: coletdjnz
This commit is contained in:
parent
592b748582
commit
a825ffbffa
1 changed files with 3 additions and 3 deletions
|
@ -3651,11 +3651,11 @@ class InfoExtractor(object):
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _merge_subtitle_items(subtitle_list1, subtitle_list2):
|
def _merge_subtitle_items(subtitle_list1, subtitle_list2):
|
||||||
""" Merge subtitle items for one language. Items with duplicated URLs
|
""" Merge subtitle items for one language. Items with duplicated URLs/data
|
||||||
will be dropped. """
|
will be dropped. """
|
||||||
list1_urls = set([item['url'] for item in subtitle_list1])
|
list1_data = set([item.get('url') or item['data'] for item in subtitle_list1])
|
||||||
ret = list(subtitle_list1)
|
ret = list(subtitle_list1)
|
||||||
ret.extend([item for item in subtitle_list2 if item['url'] not in list1_urls])
|
ret.extend([item for item in subtitle_list2 if (item.get('url') or item['data']) not in list1_data])
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
Loading…
Reference in a new issue