From fb8acf4320d8ec13e016fd62c5d67a3861d67ed1 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Fri, 23 Oct 2015 05:33:31 +0200 Subject: [PATCH] version 0.4.111 --- README.md | 130 ++++++++++++++++++++-------------------- src/you_get/util/git.py | 1 + src/you_get/version.py | 2 +- 3 files changed, 67 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index 7119fa033e..99fa1283ad 100644 --- a/README.md +++ b/README.md @@ -298,71 +298,71 @@ Use `--url`/`-u` to get a list of downloadable resource URLs extracted from the | Site | URL | Videos? | Images? | Audios? | | :--: | :-- | :-----: | :-----: | :-----: | -| **YouTube** | https://www.youtube.com/ |✓| | | -| **Twitter** | https://twitter.com/ |✓|✓| | -| VK | http://vk.com/ |✓| | | -| Vine | https://vine.co/ |✓| | | -| Vimeo | https://vimeo.com/ |✓| | | -| Vidto | http://vidto.me/ |✓| | | -| Veoh | http://www.veoh.com/ |✓| | | -| **Tumblr** | https://www.tumblr.com/ |✓|✓|✓| -| TED | http://www.ted.com/ |✓| | | -| SoundCloud | https://soundcloud.com/ | | |✓| -| MTV81 | http://www.mtv81.com/ |✓| | | -| Mixcloud | https://www.mixcloud.com/ | | |✓| -| Metacafe | http://www.metacafe.com/ |✓| | | -| Magisto | http://www.magisto.com/ |✓| | | -| Khan Academy | https://www.khanacademy.org/ |✓| | | -| JPopsuki TV | http://www.jpopsuki.tv/ |✓| | | -| Internet Archive | https://archive.org/ |✓| | | -| **Instagram** | https://instagram.com/ |✓|✓| | -| Heavy Music Archive | http://www.heavy-music.ru/ | | |✓| -| **Google+** | https://plus.google.com/ |✓|✓| | -| Freesound | http://www.freesound.org/ | | |✓| -| Flickr | https://www.flickr.com/ |✓|✓| | -| Facebook | https://www.facebook.com/ |✓| | | -| eHow | http://www.ehow.com/ |✓| | | -| Dailymotion | http://www.dailymotion.com/ |✓| | | -| CBS | http://www.cbs.com/ |✓| | | -| Bandcamp | http://bandcamp.com/ | | |✓| -| AliveThai | http://alive.in.th/ |✓| | | -| interest.me | http://ch.interest.me/tvn |✓| | | -| **755
ナナゴーゴー** | http://7gogo.jp/ |✓|✓| | -| **niconico
ニコニコ動画** | http://www.nicovideo.jp/ |✓| | | -| **163
网易视频
网易云音乐** | http://v.163.com/
http://music.163.com/ |✓| |✓| -| 56网 | http://www.56.com/ |✓| | | -| **AcFun** | http://www.acfun.tv/ |✓| | | -| **Baidu
百度贴吧** | http://tieba.baidu.com/ |✓|✓| | -| 爆米花网 | http://www.baomihua.com/ |✓| | | -| **bilibili
哔哩哔哩** | http://www.bilibili.com/ |✓| | | -| 豆瓣 | http://www.douban.com/ | | |✓| -| 斗鱼 | http://www.douyutv.com/ |✓| | | -| 凤凰视频 | http://v.ifeng.com/ |✓| | | -| 风行网 | http://www.fun.tv/ |✓| | | -| iQIYI
爱奇艺 | http://www.iqiyi.com/ |✓| | | -| 激动网 | http://www.joy.cn/ |✓| | | -| 酷6网 | http://www.ku6.com/ |✓| | | -| 酷狗音乐 | http://www.kugou.com/ | | |✓| -| 酷我音乐 | http://www.kuwo.cn/ | | |✓| -| 乐视网 | http://www.letv.com/ |✓| | | -| 荔枝FM | http://www.lizhi.fm/ | | |✓| -| 秒拍 | http://www.miaopai.com/ |✓| | | -| MioMio弹幕网 | http://www.miomio.tv/ |✓| | | -| 痞客邦 | https://www.pixnet.net/ |✓| | | -| PPTV聚力 | http://www.pptv.com/ |✓| | | -| 齐鲁网 | http://v.iqilu.com/ |✓| | | -| QQ
腾讯视频 | http://v.qq.com/ |✓| | | -| 阡陌视频 | http://qianmo.com/ |✓| | | -| Sina
新浪视频
微博秒拍视频 | http://video.sina.com.cn/
http://video.weibo.com/ |✓| | | -| Sohu
搜狐视频 | http://tv.sohu.com/ |✓| | | -| 天天动听 | http://www.dongting.com/ | | |✓| -| **Tudou
土豆** | http://www.tudou.com/ |✓| | | -| 虾米 | http://www.xiami.com/ | | |✓| -| 阳光卫视 | http://www.isuntv.com/ |✓| | | -| **音悦Tai** | http://www.yinyuetai.com/ |✓| | | -| **Youku
优酷** | http://www.youku.com/ |✓| | | -| 战旗TV | http://www.zhanqi.tv/lives |✓| | | -| 央视网 | http://www.cntv.cn/ |✓| | | +| **YouTube** | |✓| | | +| **Twitter** | |✓|✓| | +| VK | |✓| | | +| Vine | |✓| | | +| Vimeo | |✓| | | +| Vidto | |✓| | | +| Veoh | |✓| | | +| **Tumblr** | |✓|✓|✓| +| TED | |✓| | | +| SoundCloud | | | |✓| +| MTV81 | |✓| | | +| Mixcloud | | | |✓| +| Metacafe | |✓| | | +| Magisto | |✓| | | +| Khan Academy | |✓| | | +| JPopsuki TV | |✓| | | +| Internet Archive | |✓| | | +| **Instagram** | |✓|✓| | +| Heavy Music Archive | | | |✓| +| **Google+** | |✓|✓| | +| Freesound | | | |✓| +| Flickr | |✓|✓| | +| Facebook | |✓| | | +| eHow | |✓| | | +| Dailymotion | |✓| | | +| CBS | |✓| | | +| Bandcamp | | | |✓| +| AliveThai | |✓| | | +| interest.me | |✓| | | +| **755
ナナゴーゴー** | |✓|✓| | +| **niconico
ニコニコ動画** | |✓| | | +| **163
网易视频
网易云音乐** |
|✓| |✓| +| 56网 | |✓| | | +| **AcFun** | |✓| | | +| **Baidu
百度贴吧** | |✓|✓| | +| 爆米花网 | |✓| | | +| **bilibili
哔哩哔哩** | |✓| | | +| 豆瓣 | | | |✓| +| 斗鱼 | |✓| | | +| 凤凰视频 | |✓| | | +| 风行网 | |✓| | | +| iQIYI
爱奇艺 | |✓| | | +| 激动网 | |✓| | | +| 酷6网 | |✓| | | +| 酷狗音乐 | | | |✓| +| 酷我音乐 | | | |✓| +| 乐视网 | |✓| | | +| 荔枝FM | | | |✓| +| 秒拍 | |✓| | | +| MioMio弹幕网 | |✓| | | +| 痞客邦 | |✓| | | +| PPTV聚力 | |✓| | | +| 齐鲁网 | |✓| | | +| QQ
腾讯视频 | |✓| | | +| 阡陌视频 | |✓| | | +| Sina
新浪视频
微博秒拍视频 |
|✓| | | +| Sohu
搜狐视频 | |✓| | | +| 天天动听 | | | |✓| +| **Tudou
土豆** | |✓| | | +| 虾米 | | | |✓| +| 阳光卫视 | |✓| | | +| **音悦Tai** | |✓| | | +| **Youku
优酷** | |✓| | | +| 战旗TV | |✓| | | +| 央视网 | |✓| | | For all other sites not on the list, the universal extractor will take care of finding and downloading interesting resources from the page. diff --git a/src/you_get/util/git.py b/src/you_get/util/git.py index 9e4a1001cb..da972f9345 100644 --- a/src/you_get/util/git.py +++ b/src/you_get/util/git.py @@ -28,6 +28,7 @@ def get_version(repo_path): raw, err = q.communicate() c_master = int(raw.decode('ascii')) cc = c_head - c_master + assert cc return '%s.%s.%s' % (major, minor, cc) except: return __version__ diff --git a/src/you_get/version.py b/src/you_get/version.py index 355ac93266..642d3c9679 100644 --- a/src/you_get/version.py +++ b/src/you_get/version.py @@ -1,4 +1,4 @@ #!/usr/bin/env python script_name = 'you-get' -__version__ = '0.4.0' +__version__ = '0.4.111'