adapt new annie and update submodules

wwqgtxx · Oct 21, 2018 · ed90568 · ed90568
1 parent 7e95652
commit ed90568
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/wwqLyParse/annie/src/github.com/iawia002/annie b/wwqLyParse/annie/src/github.com/iawia002/annie
diff --git 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
diff --git a/wwqLyParse/you-get b/wwqLyParse/you-get
+3 −0		.gitignore
+63 −14		README.md
+10 −2		config/config.go
+1 −1		config/version.go
+113 −44		downloader/downloader.go
+16 −16		downloader/downloader_test.go
+7 −6		extractors/bcy/bcy.go
+38 −50		extractors/bilibili/bilibili.go
+1 −1		extractors/bilibili/bilibili_test.go
+9 −8		extractors/douyin/douyin.go
+12 −13		extractors/douyu/douyu.go
+10 −9		extractors/facebook/facebook.go
+18 −17		extractors/instagram/instagram.go
+17 −18		extractors/iqiyi/iqiyi.go
+16 −17		extractors/mgtv/mgtv.go
+31 −17		extractors/miaopai/miaopai.go
+19 −2		extractors/miaopai/miaopai_test.go
+7 −6		extractors/pixivision/pixivision.go
+1 −0		extractors/pixivision/pixivision_test.go
+20 −17		extractors/qq/qq.go
+25 −23		extractors/tumblr/tumblr.go
+19 −18		extractors/twitter/twitter.go
+10 −9		extractors/universal/universal.go
+12 −11		extractors/vimeo/vimeo.go
+9 −8		extractors/weibo/weibo.go
+17 −17		extractors/youku/youku.go
+6 −5		extractors/youku/youku_test.go
+33 −37		extractors/youtube/youtube.go
+1 −1		extractors/youtube/youtube_test.go
+16 −5		main.go
+3 −3		parser/parser.go
+13 −17		test/utils.go
+1 −1		ykdl/extractors/kankanews.py
+12 −12		ykdl/extractors/miaopai.py
+4 −4		ykdl/extractors/sina/video.py
+22 −6		ykdl/extractors/weibo.py
+7 −1		ykdl/util/html.py
+6 −3		src/you_get/common.py
+5 −5		src/you_get/extractors/sohu.py
+2 −0		src/you_get/util/fs.py
+6 −0		src/you_get/util/log.py