kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[F] Fix windows support

Browse source
This commit is contained in:
Azalea (on Windows VM) 2022-08-18 00:53:52 -04:00
parent fd2dfb80ce
commit 10a2367077
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
hyfetch/neofetch_util.py
View file

@ -4,6 +4,7 @@ import inspect
import os import os
import platform import platform
import re import re
import shlex
import subprocess import subprocess
from dataclasses import dataclass from dataclasses import dataclass
from pathlib import Path from pathlib import Path
@ -141,6 +142,27 @@ def get_command_path() -> str:
return pkg_resources.resource_filename(__name__, 'scripts/neowofetch') return pkg_resources.resource_filename(__name__, 'scripts/neowofetch')
def run_command(args: str, pipe: bool = False) -> str | None:
"""
Run neofetch command
"""
if platform.system() != 'Windows':
full_cmd = shlex.split(f'{get_command_path()} {args}')
else:
cmd = get_command_path().replace("\\", "/").replace("C:/", "/c/")
args = args.replace('\\', '/').replace('C:/', '/c/')
full_cmd = ['C:\\Program Files\\Git\\bin\\bash.exe', '-c', f'{cmd} {args}']
# print(full_cmd)
if pipe:
return check_output(full_cmd).decode().strip()
else:
subprocess.run(full_cmd)
def get_distro_ascii(distro: str | None = None) -> str: def get_distro_ascii(distro: str | None = None) -> str:
""" """
Get the distro ascii of the current distro. Or if distro is specified, get the specific distro's Get the distro ascii of the current distro. Or if distro is specified, get the specific distro's
@ -158,11 +180,11 @@ def get_distro_ascii(distro: str | None = None) -> str:
os.environ['CUSTOM_DISTRO'] = distro os.environ['CUSTOM_DISTRO'] = distro
cmd = 'print_custom_ascii' cmd = 'print_custom_ascii'
return normalize_ascii(check_output([get_command_path(), cmd]).decode().strip()) return normalize_ascii(run_command(cmd, True))
def get_distro_name(): def get_distro_name():
return check_output([get_command_path(), 'ascii_distro_name']).decode().strip() return run_command('ascii_distro_name', True)
def run_neofetch(preset: ColorProfile, alignment: ColorAlignment): def run_neofetch(preset: ColorProfile, alignment: ColorAlignment):
@ -186,18 +208,7 @@ def run_neofetch(preset: ColorProfile, alignment: ColorAlignment):
os.environ['ascii_len'] = str(w) os.environ['ascii_len'] = str(w)
os.environ['ascii_lines'] = str(h) os.environ['ascii_lines'] = str(h)
if platform.system() != 'Windows': run_command(f'--ascii --source {path.absolute()} --ascii-colors')
os.system(f'{get_command_path()} --ascii --source {path.absolute()} --ascii-colors')
else:
cmd = get_command_path().replace("\\", "/").replace("C:/", "/c/")
path_str = str(path.absolute()).replace('\\', '/').replace('C:/', '/c/')
cmd = f'ascii_len={w} ascii_lines={h} {cmd} --ascii --source {path_str} --ascii-colors'
full_cmd = ['C:\\Program Files\\Git\\bin\\bash.exe', '-c', cmd]
# print(full_cmd)
subprocess.run(full_cmd)
def get_fore_back(distro: str | None = None) -> tuple[int, int] | None: def get_fore_back(distro: str | None = None) -> tuple[int, int] | None:

2
setup.py
View file

@ -33,7 +33,7 @@ setup(
packages=['hyfetch'], packages=['hyfetch'],
package_data={'hyfetch': ['hyfetch/*']}, package_data={'hyfetch': ['hyfetch/*']},
include_package_data=True, include_package_data=True,
install_requires=['setuptools', 'typing_extensions'], install_requires=['setuptools', 'typing_extensions', 'pyreadline'],
entry_points={ entry_points={
"console_scripts": [ "console_scripts": [
"hyfetch=hyfetch.main:run", "hyfetch=hyfetch.main:run",