diff --git a/wwqLyParse/annie/src/github.com/iawia002/annie b/wwqLyParse/annie/src/github.com/iawia002/annie index 24ddaed..8f5cbd6 160000 --- a/wwqLyParse/annie/src/github.com/iawia002/annie +++ b/wwqLyParse/annie/src/github.com/iawia002/annie @@ -1 +1 @@ -Subproject commit 24ddaed7ad052adb8997f29995ed3670c8c13415 +Subproject commit 8f5cbd653f9da19e193111202ff6163b65885627 diff --git a/wwqLyParse/parsers/annieparser.py b/wwqLyParse/parsers/annieparser.py index aa0e400..def84a2 100644 --- a/wwqLyParse/parsers/annieparser.py +++ b/wwqLyParse/parsers/annieparser.py @@ -135,6 +135,8 @@ def _try_parse_info(self, raw_text): # parse for parse_url def _parse_parse_url(self, raw, _format): + if raw.get('streams'): + raw['Formats'] = raw['streams'] stream = raw['Formats'].get(_format, None) if stream is None: for item in raw['Formats'].keys(): @@ -150,6 +152,8 @@ def _parse_parse_url(self, raw, _format): def _parse_parse(self, raw): out = {'type': 'formats', 'name': raw['Title'] + '_' + raw['Site'], 'data': []} stream = [] + if raw.get('streams'): + raw['Formats'] = raw['streams'] for _format, s in raw['Formats'].items(): s['_format'] = _format stream.append(s) diff --git a/wwqLyParse/ykdl b/wwqLyParse/ykdl index baa07af..03b6988 160000 --- a/wwqLyParse/ykdl +++ b/wwqLyParse/ykdl @@ -1 +1 @@ -Subproject commit baa07af21d38e4d1cbef939667c284a01d47f423 +Subproject commit 03b6988acb53fb341ec5f17635cc4a3d9e796729 diff --git a/wwqLyParse/you-get b/wwqLyParse/you-get index c7cba52..b11a13d 160000 --- a/wwqLyParse/you-get +++ b/wwqLyParse/you-get @@ -1 +1 @@ -Subproject commit c7cba52c92978fea44654c4fee1f4f1ed7f0cee3 +Subproject commit b11a13d0b374d170e7d1cf605d15ae9ba1a3f970