diff --git a/pycritty/__init__.py b/pycritty/__init__.py index 6a55a58..1743b5a 100644 --- a/pycritty/__init__.py +++ b/pycritty/__init__.py @@ -1,6 +1,6 @@ """Automated tools for managing alacritty configurations""" -__version__ = "0.3.0" +__version__ = "0.3.1" class PycrittyError(Exception): diff --git a/pycritty/cli/__init__.py b/pycritty/cli/__init__.py index fd9e60e..cd00434 100644 --- a/pycritty/cli/__init__.py +++ b/pycritty/cli/__init__.py @@ -1,6 +1,5 @@ from .pycritty import parser, subparsers from .set import set_parser -from .print import print_parser from .list import list_parser from .save import save_parser from .load import load_parser diff --git a/pycritty/cli/print.py b/pycritty/cli/print.py deleted file mode 100644 index 498e9af..0000000 --- a/pycritty/cli/print.py +++ /dev/null @@ -1,17 +0,0 @@ -import argparse -from .pycritty import subparsers, formatter - - -print_parser = subparsers.add_parser( - 'print', - help='Print the contents of a config file', - formatter_class=formatter(max_help_position=10), - argument_default=argparse.SUPPRESS, -) - -print_parser.add_argument( - 'print', - nargs='*', - default=['config'], - help='Choose from "config", "fonts", or a theme name like "onedark"', -) diff --git a/pycritty/commands/__init__.py b/pycritty/commands/__init__.py index 983eb2d..61f6643 100644 --- a/pycritty/commands/__init__.py +++ b/pycritty/commands/__init__.py @@ -1,5 +1,4 @@ from .set import SetConfig -from .print import Printer from .list import ListResource from .save import SaveConfig from .load import LoadConfig @@ -7,7 +6,6 @@ subcommands = { 'set': SetConfig, - 'print': Printer, 'list': ListResource, 'save': SaveConfig, 'load': LoadConfig, diff --git a/pycritty/commands/print.py b/pycritty/commands/print.py deleted file mode 100644 index bd7543b..0000000 --- a/pycritty/commands/print.py +++ /dev/null @@ -1,31 +0,0 @@ -from typing import List -import yaml -from .command import Command -from .. import resources -from ..io import log, yio - - -class Printer(Command): - def print_yaml(self, resource: resources.ConfigFile): - if not resource.exists(): - log.warn(f'{resource.path} not found') - return - - content = yio.read_yaml(resource.path) - log.color_print(resource.path, default_color=log.Color.BOLD) - if content is None or len(content) == 0: - log.warn('File is empty') - else: - print(yaml.dump(content)) - - def print(self, to_be_printed: List[str]): - options = { - 'fonts': resources.fonts_file, - 'config': resources.config_file, - } - - for file in to_be_printed: - if file not in options: - self.print_yaml(resources.get_theme(file)) - else: - self.print_yaml(options[file]) diff --git a/pycritty/commands/set.py b/pycritty/commands/set.py index e4e892c..1b3ac7d 100644 --- a/pycritty/commands/set.py +++ b/pycritty/commands/set.py @@ -29,9 +29,6 @@ def __init__(self): def apply(self): yio.write_yaml(self.config, resources.config_file) - def execute(self, actions: Dict[str, Any]): - super().execute(actions) - def set(self, **kwargs): """Set multiple changes at once diff --git a/pycritty/io/yio.py b/pycritty/io/yio.py index f15a245..d478b82 100644 --- a/pycritty/io/yio.py +++ b/pycritty/io/yio.py @@ -32,7 +32,7 @@ def read_yaml(url: Union[str, Path, Resource]) -> Dict[str, Any]: has_protocol = urlparse(url).scheme != '' if isinstance(url, Resource): url = url.path - if not has_protocol or isinstance(url, Path) or isinstance(url, Resource): + if not has_protocol or isinstance(url, Path): open_function = open else: open_function = urlopen