From be4c392d72bacf0b78a16237cb43452eb12edca8 Mon Sep 17 00:00:00 2001 From: lussaczheng Date: Wed, 19 Feb 2020 16:49:30 +0800 Subject: [PATCH] Add: Import additional extractors when building; Add icon for executable --- .gitattributes | 10 ++ build.bat | 28 +++++- dist/you-get.ico | Bin 0 -> 16958 bytes dist/you-get_extracted_from_0.4.985.ico | Bin 0 -> 402718 bytes doc/PyInstaller-Options.md | 49 ++++++++-- repository/.gitkeep | 0 repository/_extractors/__init__.py | 117 ++++++++++++++++++++++ repository/_extractors/_blip.py | 24 +++++ repository/_extractors/_catfun.py | 76 +++++++++++++++ repository/_extractors/_coursera.py | 124 ++++++++++++++++++++++++ repository/_extractors/_dongting.py | 55 +++++++++++ repository/_extractors/_jpopsuki.py | 23 +++++ repository/_extractors/_qianmo.py | 40 ++++++++ repository/_extractors/_songtaste.py | 43 ++++++++ repository/_extractors/_thvideo.py | 83 ++++++++++++++++ repository/_extractors/_vid48.py | 23 +++++ repository/_extractors/_videobam.py | 31 ++++++ 17 files changed, 714 insertions(+), 12 deletions(-) create mode 100644 dist/you-get.ico create mode 100644 dist/you-get_extracted_from_0.4.985.ico delete mode 100644 repository/.gitkeep create mode 100644 repository/_extractors/__init__.py create mode 100644 repository/_extractors/_blip.py create mode 100644 repository/_extractors/_catfun.py create mode 100644 repository/_extractors/_coursera.py create mode 100644 repository/_extractors/_dongting.py create mode 100644 repository/_extractors/_jpopsuki.py create mode 100644 repository/_extractors/_qianmo.py create mode 100644 repository/_extractors/_songtaste.py create mode 100644 repository/_extractors/_thvideo.py create mode 100644 repository/_extractors/_vid48.py create mode 100644 repository/_extractors/_videobam.py diff --git a/.gitattributes b/.gitattributes index 0ae5850..512c335 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,3 +9,13 @@ # the files will be saved with the line endings CRLF, which are suitable # for Windows batchfiles. *.bat -text + +# Other files +*.py text eol=lf + +##### + +## Linguist config (https://github.com/github/linguist/#vendored-code) +repository/_extractors/*.py linguist-vendored +## https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-Unspecified +repository/_extractors/__init__.py !linguist-vendored diff --git a/build.bat b/build.bat index c99813c..729a788 100644 --- a/build.bat +++ b/build.bat @@ -1,5 +1,5 @@ @rem - Encoding:utf-8; Mode:Batch; Language:en; LineEndings:CRLF - -:: Video Downloaders (You-Get, Youtube-dl, Annie) One-Click Deployment Batch (Windows) +:: You-Get Unofficial Build Executable for Windows :: Author: Lussac (https://blog.lussac.net) :: Last updated: 2020-02-19 :: >>> Get updated from: https://github.com/LussacZheng/you-get.exe <<< @@ -8,7 +8,22 @@ if exist build\you-get\ rd /S /Q build\you-get if exist dist\you-get.exe del /S /Q dist\you-get.exe >NUL 2>NUL -pushd repository\you-get + +if NOT exist repository\you-get\you-get ( + echo. + echo * Please run "devscripts\init.bat" first or clone the repository of "you-get". + pause > NUL + exit +) + +cd repository +:: First, move out the original `__init__.py` from "you_get.extractors", +:: in order that we can recover everything after build. +:: Then copy all the extractors from `repository\_extractors\`, with a new `__init__.py` +:: which has imported these extractors, into the module "you_get.extractors" +move you-get\src\you_get\extractors\__init__.py .\ > NUL +xcopy _extractors\*.py you-get\src\you_get\extractors\ >NUL +pushd you-get echo. echo ============================================================ @@ -20,6 +35,7 @@ pyinstaller -F --path=src ^ --distpath ..\..\dist ^ --workpath ..\..\build ^ --specpath ..\..\build ^ + --icon ..\dist\you-get.ico ^ --hidden-import=you_get.extractors ^ --hidden-import=you_get.cli_wrapper ^ --hidden-import=you_get.processor ^ @@ -31,7 +47,13 @@ echo ============================================================ echo. popd -cd dist +:: Recover everything in you-get.git after build +for /f "delims=" %%i in ('dir /b /a:a _extractors') do ( + del /Q you-get\src\you_get\extractors\%%i >NUL 2>NUL +) +move __init__.py you-get\src\you_get\extractors\ > NUL + +cd ..\dist if exist file_version_info.txt ( pyi-set_version file_version_info.txt you-get.exe echo. diff --git a/dist/you-get.ico b/dist/you-get.ico new file mode 100644 index 0000000000000000000000000000000000000000..089588180b00450ac62f8ea7658533b2cee1db37 GIT binary patch literal 16958 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�>Xx9{Fg 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 G@Bbgg@S2MN literal 0 HcmV?d00001 diff --git a/doc/PyInstaller-Options.md b/doc/PyInstaller-Options.md index 39b7ec7..1462853 100644 --- a/doc/PyInstaller-Options.md +++ b/doc/PyInstaller-Options.md @@ -2,7 +2,7 @@ > [PyInstaller](https://github.com/pyinstaller/pyinstaller) bundles a Python application and all its dependencies into a single package. The user can run the packaged app without installing a Python interpreter or any modules. -下文我将简单叙述一下如何使用 PyInstaller 将 you-get 打包为可独立运行的 exe 程序 (Windows)。 +本文将叙述如何使用 PyInstaller 将 you-get 打包为可独立运行的 exe 程序 (Windows)。 --- @@ -150,13 +150,7 @@ ModuleNotFoundError: No module named 'you_get.extractors' > pyinstaller -F --path=src you-get --hidden-import=you_get.extractors --hidden-import=you_get.cli_wrapper ``` -## Final command - -综上所述，**最后打包的命令为**： - -```shell -> pyinstaller -F --path=src you-get --hidden-import=you_get.extractors --hidden-import=you_get.cli_wrapper --hidden-import=you_get.processor --hidden-import=you_get.util -``` +--- ## Issues @@ -232,4 +226,41 @@ from .ixigua import * 这些 extractors 均以 `_` 开头，而（参照 `Makefile`）直接运行 `python setup.py sdist`生成的 `dist/you-get-0.4.1403.tar.gz` 则不包含这些 extractors 。 暂不知其原因。 -根据上文分析，可以想到解决办法为在 `src/you_get/extractors/__init__.py` 中逐一导入这些模块，再重新打包。 +根据上文分析，可以想到解决办法为：将 `"you-get-0.4.1403.tar.gz" you-get-0.4.1403/src/you_get/extractors/` 中以 `_` 开头的 `py` 文件复制到 clone 目录对应位置，并编辑 `src/you_get/extractors/__init__.py` ，在其中逐一导入这些模块，最后再重新打包。 + +```python +# 为 src/you_get/extractors/__init__.py 文件追加以下语句 +from .baomihua import * +from .giphy import * +from .huomaotv import * +from .iwara import * +from .ixigua import * +from .missevan import * +from .qie_video import * +from .qq_egame import * +from .toutiao import * +from .vidto import * +from .ximalaya import * +from .yizhibo import * + +from ._blip import * +from ._catfun import * +from ._coursera import * +from ._dongting import * +from ._jpopsuki import * +from ._qianmo import * +from ._songtaste import * +from ._thvideo import * +from ._vid48 import * +from ._videobam import * +``` + +--- + +## Final command + +综上所述，**最后打包的命令为**： + +```shell +> pyinstaller -F --path=src you-get --hidden-import=you_get.extractors --hidden-import=you_get.cli_wrapper --hidden-import=you_get.processor --hidden-import=you_get.util +``` \ No newline at end of file diff --git a/repository/.gitkeep b/repository/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/repository/_extractors/__init__.py b/repository/_extractors/__init__.py new file mode 100644 index 0000000..a477fba --- /dev/null +++ b/repository/_extractors/__init__.py @@ -0,0 +1,117 @@ +#!/usr/bin/env python + +from .acfun import * +from .alive import * +from .archive import * +from .baidu import * +from .bandcamp import * +from .bigthink import * +from .bilibili import * +from .bokecc import * +from .cbs import * +from .ckplayer import * +from .cntv import * +from .coub import * +from .dailymotion import * +from .douban import * +from .douyin import * +from .douyutv import * +from .ehow import * +from .facebook import * +from .fc2video import * +from .flickr import * +from .freesound import * +from .funshion import * +from .google import * +from .heavymusic import * +from .icourses import * +from .ifeng import * +from .imgur import * +from .infoq import * +from .instagram import * +from .interest import * +from .iqilu import * +from .iqiyi import * +from .joy import * +from .khan import * +from .ku6 import * +from .kakao import * +from .kuaishou import * +from .kugou import * +from .kuwo import * +from .le import * +from .lizhi import * +from .longzhu import * +from .magisto import * +from .metacafe import * +from .mgtv import * +from .miaopai import * +from .miomio import * +from .mixcloud import * +from .mtv81 import * +from .musicplayon import * +from .nanagogo import * +from .naver import * +from .netease import * +from .nicovideo import * +from .pinterest import * +from .pixnet import * +from .pptv import * +from .qie import * +from .qingting import * +from .qq import * +from .showroom import * +from .sina import * +from .sohu import * +from .soundcloud import * +from .suntv import * +from .ted import * +from .theplatform import * +from .tiktok import * +from .tucao import * +from .tudou import * +from .tumblr import * +from .twitter import * +from .ucas import * +from .veoh import * +from .videomega import * +from .vimeo import * +from .vine import * +from .vk import * +from .w56 import * +from .wanmen import * +from .xiami import * +from .yinyuetai import * +from .yixia import * +from .youku import * +from .youtube import * +from .zhanqi import * +from .zhibo import * +from .zhihu import * + +# Import additional extractors for PyInstaller +# https://github.com/LussacZheng/you-get.exe/blob/master/doc/PyInstaller-Options.md +from .baomihua import * +from .giphy import * +from .huomaotv import * +from .iwara import * +from .ixigua import * +from .missevan import * +from .qie_video import * +from .qq_egame import * +from .toutiao import * +from .vidto import * +from .ximalaya import * +from .yizhibo import * + +# Copy these files from "you-get-0.4.1403.tar.gz" +from ._blip import * +from ._catfun import * +from ._coursera import * +from ._dongting import * +from ._jpopsuki import * +from ._qianmo import * +from ._songtaste import * +from ._thvideo import * +from ._vid48 import * +from ._videobam import * diff --git a/repository/_extractors/_blip.py b/repository/_extractors/_blip.py new file mode 100644 index 0000000..8308bc4 --- /dev/null +++ b/repository/_extractors/_blip.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python + +__all__ = ['blip_download'] + +from ..common import * + +import json + +def blip_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): + p_url = url + "?skin=json&version=2&no_wrap=1" + html = get_html(p_url) + metadata = json.loads(html) + + title = metadata['Post']['title'] + real_url = metadata['Post']['media']['url'] + type, ext, size = url_info(real_url) + + print_info(site_info, title, type, size) + if not info_only: + download_urls([real_url], title, ext, size, output_dir, merge = merge) + +site_info = "Blip.tv" +download = blip_download +download_playlist = playlist_not_supported('blip') diff --git a/repository/_extractors/_catfun.py b/repository/_extractors/_catfun.py new file mode 100644 index 0000000..85789e7 --- /dev/null +++ b/repository/_extractors/_catfun.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python + +__all__ = ['catfun_download'] +from .tudou import tudou_download_by_id +from .sina import sina_download_by_vid + +from ..common import * +from xml.dom.minidom import * + +def parse_item(item): + if item["type"] == "youku": + page = get_content("http://www.catfun.tv/index.php?m=catfun&c=catfun_video&a=get_youku_video_info&youku_id=" + item["vid"]) + dom = parseString(page) + ext = dom.getElementsByTagName("format")[0].firstChild.nodeValue; + size = 0 + urls = [] + for i in dom.getElementsByTagName("durl"): + urls.append(i.getElementsByTagName("url")[0].firstChild.nodeValue) + size += int(i.getElementsByTagName("size")[0].firstChild.nodeValue); + return urls, ext, size + + elif item["type"] == "qq": + page = get_content("http://www.catfun.tv/index.php?m=catfun&c=catfun_video&a=get_qq_video_info&qq_id=" + item["vid"]) + dom = parseString(page) + size = 0 + urls = [] + for i in dom.getElementsByTagName("durl"): + url = i.getElementsByTagName("url")[0].firstChild.nodeValue + urls.append(url) + vtype, ext, _size = url_info(url) + size += _size + return urls, ext, size + + elif item["type"] == "sina": + page = get_content("http://www.catfun.tv/index.php?m=catfun&c=catfun_video&a=get_sina_video_info&sina_id=" + item["vid"]) + try: + dom = parseString(page) + except: + #refresh page encountered + page = get_content(match1(page, r'url=(.+?)"')) + dom = parseString(page) + size = 0 + urls = [] + for i in dom.getElementsByTagName("durl"): + url = i.getElementsByTagName("url")[0].firstChild.nodeValue + urls.append(url) + vtype, ext, _size = url_info(url) + if not ext: + ext = match1(url,r'\.(\w+?)\?') + size += _size + #sina's result does not contains content-type + return urls, ext, size + +def catfun_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): + # html = get_content(url) + title = match1(get_content(url), r'

(.+?)

') + vid = match1(url, r"v\d+/cat(\d+)") + j = json.loads(get_content("http://www.catfun.tv/index.php?m=catfun&c=catfun_video&a=get_video&modelid=11&id={}".format(vid))) + for item in j: + if item["name"] != "\u672a\u547d\u540d1": + t = title + "-" + item["name"] + else: + t = title + if item["type"] == "tudou": + tudou_download_by_id(item["vid"], title, output_dir, merge, info_only) + + else: + urls, ext, size = parse_item(item) + + print_info(site_info, title, ext, size) + if not info_only: + download_urls(urls, t, ext, size, output_dir, merge=merge) + +site_info = "CatFun.tv" +download = catfun_download +download_playlist = playlist_not_supported('catfun') diff --git a/repository/_extractors/_coursera.py b/repository/_extractors/_coursera.py new file mode 100644 index 0000000..3454974 --- /dev/null +++ b/repository/_extractors/_coursera.py @@ -0,0 +1,124 @@ +#!/usr/bin/env python + +__all__ = ['coursera_download'] + +from ..common import * + +def coursera_login(user, password, csrf_token): + url = 'https://www.coursera.org/maestro/api/user/login' + my_headers = { + 'Cookie': ('csrftoken=%s' % csrf_token), + 'Referer': 'https://www.coursera.org', + 'X-CSRFToken': csrf_token, + } + + values = { + 'email_address': user, + 'password': password, + } + form_data = parse.urlencode(values).encode('utf-8') + + response = request.urlopen(request.Request(url, headers = my_headers, data = form_data)) + + return response.headers + +def coursera_download(url, output_dir = '.', merge = True, info_only = False, **kwargs): + course_code = r1(r'coursera.org/([^/]+)', url) + url = "http://class.coursera.org/%s/lecture/index" % course_code + + request.install_opener(request.build_opener(request.HTTPCookieProcessor())) + + import http.client + conn = http.client.HTTPConnection('class.coursera.org') + conn.request('GET', "/%s/lecture/index" % course_code) + response = conn.getresponse() + + csrf_token = r1(r'csrf_token=([^;]+);', response.headers['Set-Cookie']) + + import netrc, getpass + info = netrc.netrc().authenticators('coursera.org') + if info is None: + user = input("User: ") + password = getpass.getpass("Password: ") + else: + user, password = info[0], info[2] + print("Logging in...") + + coursera_login(user, password, csrf_token) + + request.urlopen("https://class.coursera.org/%s/auth/auth_redirector?type=login&subtype=normal" % course_code) # necessary! + + html = get_html(url) + + course_name = "%s (%s)" % (r1(r'course_strings_name = "([^"]+)"', html), course_code) + output_dir = os.path.join(output_dir, course_name) + + materials = re.findall(r'