From f9f8bcde983d4da6ef8e8f31709f01456d342702 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Tue, 18 Sep 2012 22:56:52 +0200 Subject: [PATCH] version 0.2.3 --- CHANGELOG.txt | 8 ++++ README.md | 104 +++++++++++++++++++++------------------------- README.txt | 51 ++++++++++------------- you-get.json | 4 +- you_get/common.py | 2 +- 5 files changed, 82 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7adc6c59..dcb84336 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,14 @@ Changelog ========= +0.2.3 +----- + +*Date: 2012-09-18* + +* Use FFmpeg for converting and joining of videos. +* Add '--url' and '--debug' options. + 0.2.2 ----- diff --git a/README.md b/README.md index 85197cf4..14ce0c54 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,6 @@ Fork me on GitHub: * Sohu (搜狐视频) * 56 (56网) -### Supported Video Formats - -* WebM (*.webm) -* MP4 (*.mp4) -* FLV (*.flv) -* 3GP (*.3gp) -* MPEG-TS (*.ts) - ## Installation ### 1. Install via [Pip](http://www.pip-installer.org/): @@ -52,7 +44,28 @@ Fork me on GitHub: $ you-get -V -### 3. Direct download (from ): +### 3. Install from Git: + + $ git clone git://github.com/soimort/you-get.git + + Use the raw script without installation: + + $ cd you-get/ + $ ./you-get -V + + To install the package into the system path, execute: + + $ make install + + Or (on Windows): + + > setup.py install + + Check if the installation was successful: + + $ you-get -V + +### 4. Direct download (from ): $ wget -O you-get.zip https://github.com/soimort/you-get/zipball/master $ unzip you-get.zip @@ -74,26 +87,9 @@ Fork me on GitHub: $ you-get -V -### 4. Install from Git: - - $ git clone git://github.com/soimort/you-get.git +### 5. Install from [AUR](http://aur.archlinux.org/) (Arch User Repository): - Use the raw script without installation: - - $ cd you-get/ - $ ./you-get -V - - To install the package into the system path, execute: - - $ make install - - Or (on Windows): - - > setup.py install - - Check if the installation was successful: - - $ you-get -V + ## Examples (For End-Users) @@ -209,14 +205,6 @@ You-Get基于优酷下载脚本[iambus/youku-lixian](https://github.com/iambus/y * 搜狐视频 * 56网 -### 输出视频格式 - -* WebM (*.webm) -* MP4 (*.mp4) -* FLV (*.flv) -* 3GP (*.3gp) -* MPEG-TS (*.ts) - ## 安装说明 （以下命令格式均以Linux shell为例） @@ -237,7 +225,28 @@ You-Get基于优酷下载脚本[iambus/youku-lixian](https://github.com/iambus/y $ you-get -V -### 3. 直接下载（从）： +### 3. 从Git安装： + + $ git clone git://github.com/soimort/you-get.git + + 在不安装的情况下直接使用脚本： + + $ cd you-get/ + $ ./you-get -V + + 若要将Python package安装到系统默认路径，执行： + + $ make install + + 或：（适用于Windows） + + > setup.py install + + 检查安装是否成功： + + $ you-get -V + +### 4. 直接下载（从）： $ wget -O you-get.zip https://github.com/soimort/you-get/zipball/master $ unzip you-get.zip @@ -259,26 +268,9 @@ You-Get基于优酷下载脚本[iambus/youku-lixian](https://github.com/iambus/y $ you-get -V -### 4. 从Git安装： - - $ git clone git://github.com/soimort/you-get.git +### 5. 从[AUR](http://aur.archlinux.org/)（Arch User Repository）安装： - 在不安装的情况下直接使用脚本： - - $ cd you-get/ - $ ./you-get -V - - 若要将Python package安装到系统默认路径，执行： - - $ make install - - 或：（适用于Windows） - - > setup.py install - - 检查安装是否成功： - - $ you-get -V + ## 使用方法示例 diff --git a/README.txt b/README.txt index f758065e..0bf0d0e2 100644 --- a/README.txt +++ b/README.txt @@ -29,15 +29,6 @@ Supported Sites (As of Now) * Sohu (搜狐视频) http://tv.sohu.com * 56 (56网) http://www.56.com -Supported Video Formats -~~~~~~~~~~~~~~~~~~~~~~~ - -* WebM (\*.webm) -* MP4 (\*.mp4) -* FLV (\*.flv) -* 3GP (\*.3gp) -* MPEG-TS (\*.ts) - Installation ------------ @@ -57,6 +48,27 @@ Installation $ you-get -V +#) Install from Git:: + + $ git clone git://github.com/soimort/you-get.git + + Use the raw script without installation:: + + $ cd you-get/ + $ ./you-get -V + + To install the package into the system path, execute:: + + $ make install + + Or (on Windows):: + + > setup.py install + + Check if the installation was successful:: + + $ you-get -V + #) Direct download (from https://github.com/soimort/you-get/zipball/master):: $ wget -O you-get.zip https://github.com/soimort/you-get/zipball/master @@ -79,26 +91,9 @@ Installation $ you-get -V -#) Install from Git:: +#) Install from `AUR `_ (Arch User Repository):: - $ git clone git://github.com/soimort/you-get.git - - Use the raw script without installation:: - - $ cd you-get/ - $ ./you-get -V - - To install the package into the system path, execute:: - - $ make install - - Or (on Windows):: - - > setup.py install - - Check if the installation was successful:: - - $ you-get -V + https://aur.archlinux.org/packages.php?ID=62576 Examples (For End-Users) ------------------------ diff --git a/you-get.json b/you-get.json index 972fa05b..1891df1f 100644 --- a/you-get.json +++ b/you-get.json @@ -1,7 +1,7 @@ { "name": "you-get", - "version": "0.2.2", - "date": "2012-09-17", + "version": "0.2.3", + "date": "2012-09-18", "author": "Mort Yao", "author_email": "mort.yao@gmail.com", diff --git a/you_get/common.py b/you_get/common.py index 6cc317f8..27ab920d 100644 --- a/you_get/common.py +++ b/you_get/common.py @@ -8,7 +8,7 @@ import re import sys from urllib import request, parse -__version__ = "0.2.2" +__version__ = "0.2.3" dry_run = False force = False