From e38df8f9fa4d715513453928591346f680dbe298 Mon Sep 17 00:00:00 2001 From: pukkandan Date: Fri, 29 Jan 2021 23:15:27 +0530 Subject: Refactor `update-version`, `pyinst.py` and related files * Refactor update-version * Moved pyinst, update-version and icon into devscripts * pyinst doesn't bump version anymore * Merge pyinst and pyinst32. Usage: `pyinst.py [32|64]` * Add mutagen as requirement * Remove make_win and related files --- devscripts/cloud.ico | Bin 0 -> 4286 bytes devscripts/pyinst.py | 69 ++++++++++++++++++++++++++++++++++ devscripts/update-version-workflow.py | 30 --------------- devscripts/update-version.py | 31 +++++++++++++++ 4 files changed, 100 insertions(+), 30 deletions(-) create mode 100644 devscripts/cloud.ico create mode 100644 devscripts/pyinst.py delete mode 100644 devscripts/update-version-workflow.py create mode 100644 devscripts/update-version.py (limited to 'devscripts') diff --git a/devscripts/cloud.ico b/devscripts/cloud.ico new file mode 100644 index 000000000..6d742ce63 Binary files /dev/null and b/devscripts/cloud.ico differ diff --git a/devscripts/pyinst.py b/devscripts/pyinst.py new file mode 100644 index 000000000..a7fb59af0 --- /dev/null +++ b/devscripts/pyinst.py @@ -0,0 +1,69 @@ +from __future__ import unicode_literals +import sys + +from PyInstaller.utils.win32.versioninfo import ( + VarStruct, VarFileInfo, StringStruct, StringTable, + StringFileInfo, FixedFileInfo, VSVersionInfo, SetVersion, +) +import PyInstaller.__main__ + + +assert len(sys.argv) > 1 and sys.argv[1] in ("32", "64") +_x86 = "_x86" if sys.argv[1] == "32" else "" + +FILE_DESCRIPTION = 'Media Downloader%s' % (" (32 Bit)" if _x86 else '') +SHORT_URLS = {"32": "git.io/JUGsM", "64": "git.io/JLh7K"} + + +exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec')) +VERSION = locals()['__version__'] + +VERSION_LIST = VERSION.replace('-', '.').split('.') +VERSION_LIST = list(map(int, VERSION_LIST)) + [0] * (4 - len(VERSION_LIST)) + +print('Version: %s%s' % (VERSION, _x86)) +print('Remember to update the version using devscipts\\update-version.py') + +VERSION_FILE = VSVersionInfo( + ffi=FixedFileInfo( + filevers=VERSION_LIST, + prodvers=VERSION_LIST, + mask=0x3F, + flags=0x0, + OS=0x4, + fileType=0x1, + subtype=0x0, + date=(0, 0), + ), + kids=[ + StringFileInfo([ + StringTable( + "040904B0", [ + StringStruct("Comments", "Youtube-dlc%s Command Line Interface." % _x86), + StringStruct("CompanyName", "pukkandan@gmail.com"), + StringStruct("FileDescription", FILE_DESCRIPTION), + StringStruct("FileVersion", VERSION), + StringStruct("InternalName", "youtube-dlc%s" % _x86), + StringStruct( + "LegalCopyright", + "pukkandan@gmail.com | UNLICENSE", + ), + StringStruct("OriginalFilename", "youtube-dlc%s.exe" % _x86), + StringStruct("ProductName", "Youtube-dlc%s" % _x86), + StringStruct("ProductVersion", "%s%s | %s" % (VERSION, _x86, SHORT_URLS[sys.argv[1]])), + ])]), + VarFileInfo([VarStruct("Translation", [0, 1200])]) + ] +) + +PyInstaller.__main__.run([ + '--name=youtube-dlc%s' % _x86, + '--onefile', + '--icon=devscripts/cloud.ico', + '--exclude-module=youtube_dl', + '--exclude-module=test', + '--exclude-module=ytdlp_plugins', + '--hidden-import=mutagen', + 'youtube_dlc/__main__.py', +]) +SetVersion('dist/youtube-dlc%s.exe' % _x86, VERSION_FILE) diff --git a/devscripts/update-version-workflow.py b/devscripts/update-version-workflow.py deleted file mode 100644 index 4ac130a0d..000000000 --- a/devscripts/update-version-workflow.py +++ /dev/null @@ -1,30 +0,0 @@ -from __future__ import unicode_literals -from datetime import datetime -# import urllib.request - -# response = urllib.request.urlopen('https://blackjack4494.github.io/youtube-dlc/update/LATEST_VERSION') -# _LATEST_VERSION = response.read().decode('utf-8') - -exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec')) -_LATEST_VERSION = locals()['__version__'] - -_OLD_VERSION = _LATEST_VERSION.replace('-', '.').split(".", 4) - -old_ver = '.'.join(_OLD_VERSION[:3]) -old_rev = _OLD_VERSION[3] if len(_OLD_VERSION) > 3 else '' - -ver = datetime.now().strftime("%Y.%m.%d") -rev = str(int(old_rev or 0) + 1) if old_ver == ver else '' - -version = '.'.join((ver, rev)) if rev else ver - -print('::set-output name=ytdlc_version::' + version) - -file_version_py = open('youtube_dlc/version.py', 'rt') -data = file_version_py.read() -data = data.replace(_LATEST_VERSION, version) -file_version_py.close() - -file_version_py = open('youtube_dlc/version.py', 'wt') -file_version_py.write(data) -file_version_py.close() diff --git a/devscripts/update-version.py b/devscripts/update-version.py new file mode 100644 index 000000000..c9698875a --- /dev/null +++ b/devscripts/update-version.py @@ -0,0 +1,31 @@ +from __future__ import unicode_literals +from datetime import datetime +# import urllib.request + +# response = urllib.request.urlopen('https://blackjack4494.github.io/youtube-dlc/update/LATEST_VERSION') +# old_version = response.read().decode('utf-8') + +exec(compile(open('youtube_dlc/version.py').read(), 'youtube_dlc/version.py', 'exec')) +old_version = locals()['__version__'] + +old_version_list = old_version.replace('-', '.').split(".", 4) + +old_ver = '.'.join(old_version_list[:3]) +old_rev = old_version_list[3] if len(old_version_list) > 3 else '' + +ver = datetime.now().strftime("%Y.%m.%d") +rev = str(int(old_rev or 0) + 1) if old_ver == ver else '' + +VERSION = '.'.join((ver, rev)) if rev else ver +# VERSION_LIST = [(int(v) for v in ver.split(".") + [rev or 0])] + +print('::set-output name=ytdlc_version::' + VERSION) + +file_version_py = open('youtube_dlc/version.py', 'rt') +data = file_version_py.read() +data = data.replace(old_version, VERSION) +file_version_py.close() + +file_version_py = open('youtube_dlc/version.py', 'wt') +file_version_py.write(data) +file_version_py.close() -- cgit v1.2.3