Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ec5893581e | |||
| 8afdadc263 | |||
| 5bb280b1da |
6
TODO.md
6
TODO.md
@@ -1,5 +1 @@
|
|||||||
- Push scheme generation to `~/.config/autoconf`
|
- Add local app caching for `auto` logic
|
||||||
- Copy default app registry to the config location
|
|
||||||
- Formalize the theme spec (JSON) and `autoconf gen` to produce color configs
|
|
||||||
- Likely need to formalize the `sync.sh` script logic better, possibly associated directly
|
|
||||||
with registry TOML
|
|
||||||
|
|||||||
@@ -28,6 +28,9 @@ dependencies = [
|
|||||||
"colorama",
|
"colorama",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[project.scripts]
|
||||||
|
symconf = "symconf.__main__:main"
|
||||||
|
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
tests = ["pytest"]
|
tests = ["pytest"]
|
||||||
docs = [
|
docs = [
|
||||||
|
|||||||
@@ -92,10 +92,13 @@ subparsers = parser.add_subparsers(title='subcommand actions')
|
|||||||
add_set_subparser(subparsers)
|
add_set_subparser(subparsers)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
def main():
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
if 'func' in args:
|
if 'func' in args:
|
||||||
args.func(args)
|
args.func(args)
|
||||||
else:
|
else:
|
||||||
parser.print_help()
|
parser.print_help()
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
|
|||||||
@@ -307,7 +307,7 @@ class ConfigManager:
|
|||||||
|
|
||||||
group_dir = Path(self.config_dir, 'groups')
|
group_dir = Path(self.config_dir, 'groups')
|
||||||
if not group_dir.exists():
|
if not group_dir.exists():
|
||||||
return {}
|
return {}, []
|
||||||
|
|
||||||
# handle non-palette-scheme groups
|
# handle non-palette-scheme groups
|
||||||
group_matches = {}
|
group_matches = {}
|
||||||
@@ -345,8 +345,6 @@ class ConfigManager:
|
|||||||
|
|
||||||
group_matches[fkey] = list(match_dict.values())
|
group_matches[fkey] = list(match_dict.values())
|
||||||
|
|
||||||
print(group_matches)
|
|
||||||
|
|
||||||
# first handle scheme maps; matching palette files should already be found in the
|
# first handle scheme maps; matching palette files should already be found in the
|
||||||
# regular group matching process
|
# regular group matching process
|
||||||
palette_dict = self._stack_toml(group_matches.get('palette', []))
|
palette_dict = self._stack_toml(group_matches.get('palette', []))
|
||||||
@@ -624,7 +622,7 @@ class ConfigManager:
|
|||||||
# app's config map points config tails to absolute paths
|
# app's config map points config tails to absolute paths
|
||||||
if config_tail in app_settings['config_map']:
|
if config_tail in app_settings['config_map']:
|
||||||
to_symlink.append((
|
to_symlink.append((
|
||||||
abs_pat(Path(app_settings['config_map'][config_tail])), # point from real config path
|
util.absolute_path(Path(app_settings['config_map'][config_tail])), # point from real config path
|
||||||
full_path, # to internal config location
|
full_path, # to internal config location
|
||||||
))
|
))
|
||||||
|
|
||||||
@@ -661,8 +659,9 @@ class ConfigManager:
|
|||||||
# previously set by this script), throw an error.
|
# previously set by this script), throw an error.
|
||||||
if from_path.exists() and not from_path.is_symlink():
|
if from_path.exists() and not from_path.is_symlink():
|
||||||
print(
|
print(
|
||||||
|
Fore.RED + \
|
||||||
f'Symlink target "{from_path}" exists and isn\'t a symlink, NOT overwriting;' \
|
f'Symlink target "{from_path}" exists and isn\'t a symlink, NOT overwriting;' \
|
||||||
+ ' please first manually remove this file so a symlink can be set.'
|
+ ' please first manually remove this file so a symlink can be set.'
|
||||||
)
|
)
|
||||||
links_fail.append((from_path, to_path))
|
links_fail.append((from_path, to_path))
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user