hiro/melpazoid
1
0
Fork 0
mirror of https://github.com/vale981/melpazoid synced 2025-03-06 01:41:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify recipe validation -- just use Emacs directly

Browse source
This commit is contained in:
riscy 2021-10-01 22:01:07 -07:00
parent b60785cc0d
commit a2d3e56e73
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
melpazoid/melpazoid.py
View file

@ -23,7 +23,6 @@ import subprocess
import sys import sys
import tempfile import tempfile
import time import time
import traceback
from typing import Any, Dict, Iterator, List, Set, TextIO, Tuple from typing import Any, Dict, Iterator, List, Set, TextIO, Tuple
import requests import requests
@ -93,17 +92,9 @@ def validate_recipe(recipe: str) -> bool:
False False
""" """
try: try:
tokenized_recipe = _tokenize_expression(recipe) return bool(_recipe_struct_elisp(recipe))
except ChildProcessError: except ChildProcessError:
traceback.print_exc()
return False return False
valid = (
tokenized_recipe[0] == '('
and tokenized_recipe[-1] == ')'
and len([pp for pp in tokenized_recipe if pp == '('])
== len([pp for pp in tokenized_recipe if pp == ')'])
)
return valid
def _note(message: str, color: str = '', highlight: str = ''): def _note(message: str, color: str = '', highlight: str = ''):
@ -795,7 +786,11 @@ def _clone_address(recipe: str) -> str:
@functools.lru_cache() @functools.lru_cache()
def _recipe_struct_elisp(recipe: str) -> str: def _recipe_struct_elisp(recipe: str) -> str:
"""Turn the recipe into a serialized 'package-recipe' object.""" """Turn the recipe into a serialized 'package-recipe' object.
Throw a ChildProcessError if Emacs encounters a problem.
>>> _recipe_struct_elisp('(melpazoid :fetcher github :repo "xyz")')
'#s(package-github-recipe "melpazoid" nil "xyz" nil nil nil nil nil nil)'
"""
name = package_name(recipe) name = package_name(recipe)
with tempfile.TemporaryDirectory() as tmpdir: with tempfile.TemporaryDirectory() as tmpdir:
with open(os.path.join(tmpdir, name), 'w', encoding='utf-8') as file: with open(os.path.join(tmpdir, name), 'w', encoding='utf-8') as file: