80486DX2-66/C-bytebeat-render
1
0
Fork 0
Code Issues

ANSI_CLEAR refactor

Browse Source
This commit is contained in:
Intel A80486DX2-66 2024-05-19 20:38:06 +03:00
parent a66901b00d
commit f862603642
Signed by: 80486DX2-66
GPG Key ID: 83631EF27054609B
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bytebeat_compiler.py
View File

@ -4,7 +4,7 @@ from argparse import ArgumentParser
from os import environ, makedirs from os import environ, makedirs
from os.path import exists, join as path_join from os.path import exists, join as path_join
from shlex import split as command_line_split from shlex import split as command_line_split
from sys import stdin, exit from sys import stdin, stdout, exit
from typing import Dict, Union from typing import Dict, Union
import subprocess import subprocess
@ -41,6 +41,8 @@ DEFAULT_PARAMETERS = {
"OUTPUT_FILE": PATHS["output"] "OUTPUT_FILE": PATHS["output"]
} }
stdout_atty = hasattr(stdout, "isatty") and stdout.isatty()
def fetch(name: str): def fetch(name: str):
if from_env := environ.get(name): if from_env := environ.get(name):
return from_env return from_env
@ -137,6 +139,9 @@ if __name__ == "__main__":
help="show progress during generation") help="show progress during generation")
parser.add_argument("-E", "--show-substituted-values", default=False, parser.add_argument("-E", "--show-substituted-values", default=False,
action="store_true", help="show substituted values") action="store_true", help="show substituted values")
parser.add_argument("--color", default="auto", type=str,
help="ANSI escape codes. Set to 'always' to enable them, 'none' to "
"disable. Default: 'auto'.")
args = parser.parse_args() args = parser.parse_args()
bytebeat_contents = read_from_file_or_stdin(args.file).strip() bytebeat_contents = read_from_file_or_stdin(args.file).strip()
@ -203,6 +208,9 @@ if __name__ == "__main__":
gen_length = args.channels * samples gen_length = args.channels * samples
ansi_escape_codes_supported = args.color == "auto" and stdout_atty or \
args.color == "always"
rewrite_file(PATHS["substitute"], substitute_vars({ rewrite_file(PATHS["substitute"], substitute_vars({
"bytebeat_contents": bytebeat_contents, "bytebeat_contents": bytebeat_contents,
"output_file": C_str_repr(args.output), "output_file": C_str_repr(args.output),
@ -223,7 +231,8 @@ if __name__ == "__main__":
"block_size": args.block_size, "block_size": args.block_size,
"silent_mode": args.silent, "silent_mode": args.silent,
"verbose_mode": args.verbose and not args.silent, "verbose_mode": args.verbose and not args.silent,
"fwrite_le": PATHS["fwrite_le_header"] "fwrite_le": PATHS["fwrite_le_header"],
"ansi_escape_codes_supported": ansi_escape_codes_supported
}, read_file(PATHS["template"]), args.show_substituted_values)) }, read_file(PATHS["template"]), args.show_substituted_values))
# Compile by invoking the shell script # Compile by invoking the shell script

21
src/template.c
View File

@ -10,14 +10,17 @@
#include "`fwrite_le`" #include "`fwrite_le`"
// constants // constants
#if defined(_WIN32) #define ANSI_ESCAPE_CODES_SUPPORTED `ansi_escape_codes_supported`
# define __ANSI_CLEAR_STRING "\r"
#elif defined(__unix__) || defined(__linux__) #ifndef _ANSI_CLEAR_STRING /* can be defined during compilation */
# define __ANSI_CLEAR_STRING "\x1B[2K\r" # if ANSI_ESCAPE_CODES_SUPPORTED
#else # define _ANSI_CLEAR_STRING "\x1B[2K\r"
# define __ANSI_CLEAR_STRING "\n" # elif defined(_WIN32)
# define _ANSI_CLEAR_STRING "\r"
# else
# define _ANSI_CLEAR_STRING "\n"
# endif
#endif #endif
const char* ANSI_CLEAR = __ANSI_CLEAR_STRING;
#define OUTPUT_FILE `output_file` #define OUTPUT_FILE `output_file`
@ -310,7 +313,7 @@ main(void)
" (part %" PRIuMAX "/%" PRIuMAX ")" " (part %" PRIuMAX "/%" PRIuMAX ")"
#endif #endif
, ,
ANSI_CLEAR, _ANSI_CLEAR_STRING,
gen_length_minus_1 - time, gen_length_minus_1 - time,
((long double) time * 100) / (long double) GEN_LENGTH ((long double) time * 100) / (long double) GEN_LENGTH
#if SEQUENTIAL_MODE #if SEQUENTIAL_MODE
@ -323,7 +326,7 @@ main(void)
} }
#if !SILENT_MODE #if !SILENT_MODE
printf(ANSI_CLEAR); printf(_ANSI_CLEAR_STRING);
// 5. log // 5. log
#if !(SEQUENTIAL_MODE && VERBOSE_MODE) #if !(SEQUENTIAL_MODE && VERBOSE_MODE)