diff --git a/README.md b/README.md index 5981d373..9ad85bcc 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ Fork me on GitHub: * MTV 81 * NetEase (网易视频) * NetEase Music (网易云音乐) +* Pixnet * PPTV * QianMo (阡陌视频) * QQ (腾讯视频) diff --git a/src/you_get/common.py b/src/you_get/common.py index 0f5080eb..33f5dc2e 100755 --- a/src/you_get/common.py +++ b/src/you_get/common.py @@ -48,6 +48,7 @@ SITES = { 'mtv81' : 'mtv81', '7gogo' : 'nanagogo', 'nicovideo' : 'nicovideo', + 'pixnet' : 'pixnet', 'pptv' : 'pptv', 'qianmo' : 'qianmo', 'qq' : 'qq', diff --git a/src/you_get/extractors/__init__.py b/src/you_get/extractors/__init__.py index 2a46d6cd..ea82b51d 100755 --- a/src/you_get/extractors/__init__.py +++ b/src/you_get/extractors/__init__.py @@ -41,6 +41,7 @@ from .mtv81 import * from .nanagogo import * from .netease import * from .nicovideo import * +from .pixnet import * from .pptv import * from .qianmo import * from .qq import * diff --git a/src/you_get/extractors/pixnet.py b/src/you_get/extractors/pixnet.py new file mode 100644 index 00000000..b5c94b24 --- /dev/null +++ b/src/you_get/extractors/pixnet.py @@ -0,0 +1,55 @@ +#!/usr/bin/env python + +__all__ = ['pixnet_download'] + +from ..common import * +import urllib.error +from time import time +from urllib.parse import quote +from json import loads + +def pixnet_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): + if re.match(r'http://(\w)+.pixnet.net/album/video/(\d)+', url): + # http://eric6513.pixnet.net/album/video/206644535 + html = get_content(url) + title = ''.join(r1(r'