git status

This commit is contained in:
w-e-w 2024-07-08 16:56:06 +09:00
parent 11f827c58b
commit 27947a79d6
2 changed files with 13 additions and 6 deletions

View File

@ -85,6 +85,14 @@ def git_tag():
return "<none>" return "<none>"
@lru_cache()
def git_status():
try:
return subprocess.check_output([git, "-C", script_path, "status"], shell=False, encoding='utf8').strip()
except Exception as e:
return str(e)
def run(command, desc=None, errdesc=None, custom_env=None, live: bool = default_command_live) -> str: def run(command, desc=None, errdesc=None, custom_env=None, live: bool = default_command_live) -> str:
if desc is not None: if desc is not None:
print(desc) print(desc)

View File

@ -1,13 +1,12 @@
import json import json
import os import os
import sys import sys
import subprocess
import platform import platform
import hashlib import hashlib
import re import re
import launch from modules import paths_internal, timer, shared, extensions, errors, launch_utils
from modules import paths_internal, timer, shared, extensions, errors
checksum_token = "DontStealMyGamePlz__WINNERS_DONT_USE_DRUGS__DONT_COPY_THAT_FLOPPY" checksum_token = "DontStealMyGamePlz__WINNERS_DONT_USE_DRUGS__DONT_COPY_THAT_FLOPPY"
environment_whitelist = { environment_whitelist = {
@ -89,7 +88,6 @@ def get_ram_info():
def get_packages(): def get_packages():
try: try:
import subprocess
return subprocess.check_output([sys.executable, '-m', 'pip', 'freeze', '--all']).decode("utf8").splitlines() return subprocess.check_output([sys.executable, '-m', 'pip', 'freeze', '--all']).decode("utf8").splitlines()
except Exception as pip_error: except Exception as pip_error:
try: try:
@ -104,8 +102,9 @@ def get_dict():
res = { res = {
"Platform": platform.platform(), "Platform": platform.platform(),
"Python": platform.python_version(), "Python": platform.python_version(),
"Version": launch.git_tag(), "Version": launch_utils.git_tag(),
"Commit": launch.commit_hash(), "Commit": launch_utils.commit_hash(),
"Git status": launch_utils.git_status(),
"Script path": paths_internal.script_path, "Script path": paths_internal.script_path,
"Data path": paths_internal.data_path, "Data path": paths_internal.data_path,
"Extensions dir": paths_internal.extensions_dir, "Extensions dir": paths_internal.extensions_dir,