cappy4king
/
marseymoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use names from makefile as input

pull/315/head
guidotheelen 2020-08-07 14:43:53 +02:00
parent a025df0943
commit 4f41aa7c55
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -219,7 +219,7 @@ check_sequence:
ifdef BYPASS_SEQUENCE_CHECK ifdef BYPASS_SEQUENCE_CHECK
@echo Bypassing the emoji sequence checks @echo Bypassing the emoji sequence checks
else else
$(PYTHON) $(SEQUENCE_CHECK_PY) -d $(EMOJI_SRC_DIR) -c @$(PYTHON) $(SEQUENCE_CHECK_PY) -n $(ALL_NAMES) -c
endif endif
clean: clean:

23
check_emoji_sequences.py
View File

@ -389,25 +389,36 @@ def collect_name_to_dirpath_with_override(dirs, prefix, suffix, exclude=None):
return result return result
def run_check(dirs, prefix, suffix, exclude, unicode_version, coverage): def run_check(dirs, names, prefix, suffix, exclude, unicode_version, coverage):
msg = '' msg = ''
if unicode_version: if unicode_version:
msg = ' (%3.1f)' % unicode_version msg = ' (%3.1f)' % unicode_version
if (names and dirs):
sys.exit("Please only provide a directory or a list of names")
elif names:
name_to_dirpath = {}
for name in names:
name_to_dirpath[name] = ""
elif dirs:
print(f'Checking files with prefix "{prefix}" and suffix "{suffix}"{msg} in: {dirs}') print(f'Checking files with prefix "{prefix}" and suffix "{suffix}"{msg} in: {dirs}')
name_to_dirpath = collect_name_to_dirpath_with_override( name_to_dirpath = collect_name_to_dirpath_with_override(dirs, prefix=prefix, suffix=suffix, exclude=exclude)
dirs, prefix=prefix, suffix=suffix, exclude=exclude)
print(f'checking {len(name_to_dirpath)} names') print(f'checking {len(name_to_dirpath)} names')
seq_to_filepath = create_sequence_to_filepath(name_to_dirpath, prefix, suffix) seq_to_filepath = create_sequence_to_filepath(name_to_dirpath, prefix, suffix)
print(f'checking {len(seq_to_filepath)} sequences') print(f'checking {len(seq_to_filepath)} sequences')
check_sequence_to_filepath(seq_to_filepath, unicode_version, coverage) check_sequence_to_filepath(seq_to_filepath, unicode_version, coverage)
print('done running checks') print('Done running checks')
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument( parser.add_argument(
'-d', '--dirs', help='directory roots containing emoji images', '-d', '--dirs', help='directory roots containing emoji images',
metavar='dir', nargs='+', required=True) metavar='dir', nargs='+')
parser.add_argument(
'-n', '--names', help='list with expected emoji',
metavar='names', nargs='+')
parser.add_argument( parser.add_argument(
'-e', '--exclude', help='names of source subdirs to exclude', '-e', '--exclude', help='names of source subdirs to exclude',
metavar='dir', nargs='+') metavar='dir', nargs='+')
@ -425,7 +436,7 @@ def main():
metavar='version', type=float) metavar='version', type=float)
args = parser.parse_args() args = parser.parse_args()
run_check( run_check(
args.dirs, args.prefix, args.suffix, args.exclude, args.unicode_version, args.dirs, args.names, args.prefix, args.suffix, args.exclude, args.unicode_version,
args.coverage) args.coverage)