[cleanup] Minor fixes (See desc)

[yt-dlp.git] / devscripts / update-version.py

diff --git a/devscripts/update-version.py b/devscripts/update-version.py
index 54d2158a6c240c5c10f4adc536dee47ebd303590..991cfb2aff0db83a2fcde6c025dc68b7e4f17ccb 100644 (file)
--- a/devscripts/update-version.py
+++ b/devscripts/update-version.py
@@ -1,31 +1,41 @@
-from __future__ import unicode_literals
+#!/usr/bin/env python3
+import subprocess
+import sys
 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'))
+with open('yt_dlp/version.py') as f:
+    exec(compile(f.read(), 'yt_dlp/version.py', 'exec'))
 old_version = locals()['__version__']
 
-old_version_list = old_version.split(".", 4)
+old_version_list = old_version.split('.')
 
 old_ver = '.'.join(old_version_list[:3])
 old_rev = old_version_list[3] if len(old_version_list) > 3 else ''
 
 ver = datetime.utcnow().strftime("%Y.%m.%d")
-rev = str(int(old_rev or 0) + 1) if old_ver == ver else ''
+
+rev = (sys.argv[1:] or [''])[0]  # Use first argument, if present as revision number
+if not rev:
+    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)
+try:
+    sp = subprocess.Popen(['git', 'rev-parse', '--short', 'HEAD'], stdout=subprocess.PIPE)
+    GIT_HEAD = sp.communicate()[0].decode().strip() or None
+except Exception:
+    GIT_HEAD = None
+
+VERSION_FILE = f'''\
+# Autogenerated by devscripts/update-version.py
+
+__version__ = {VERSION!r}
+
+RELEASE_GIT_HEAD = {GIT_HEAD!r}
+'''
 
-file_version_py = open('youtube_dlc/version.py', 'rt')
-data = file_version_py.read()
-data = data.replace(old_version, VERSION)
-file_version_py.close()
+with open('yt_dlp/version.py', 'wt') as f:
+    f.write(VERSION_FILE)
 
-file_version_py = open('youtube_dlc/version.py', 'wt')
-file_version_py.write(data)
-file_version_py.close()
+print('::set-output name=ytdlp_version::' + VERSION)
+print(f'\nVersion = {VERSION}, Git HEAD = {GIT_HEAD}')