relikd/icnsutil
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix cli update -set TOC + small fixes

Browse Source
This commit is contained in:
relikd
2021-10-30 18:18:05 +02:00
parent b4cba899bc
commit a05626f020
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
icnsutil/cli.py
View File

@@ -37,7 +37,7 @@ def cli_compose(args: ArgParams) -> None:
print( print(
'File "{}" already exists. Force overwrite with -f.'.format(dest), 'File "{}" already exists. Force overwrite with -f.'.format(dest),
file=sys.stderr) file=sys.stderr)
return exit(1)
img = IcnsFile() img = IcnsFile()
for x in enum_with_stdin(args.source): for x in enum_with_stdin(args.source):
img.add_media(file=x) img.add_media(file=x)
@@ -56,16 +56,23 @@ def cli_update(args: ArgParams) -> None:
def fail(): def fail():
raise ArgumentTypeError( raise ArgumentTypeError(
'Expected arg format KEY=FILE - got "{}"'.format(key_val)) 'Expected arg format KEY=FILE - got "{}"'.format(key_val))
if key_val.lower() == 'toc':
key_val = 'toc=1'
if '=' not in key_val: if '=' not in key_val:
fail() fail()
key, val = key_val.split('=', ) key, val = key_val.split('=')
if not val: if not val:
fail() fail()
has_changes = True
if key.lower() == 'toc':
icns.add_media('TOC ', data=b'1', force=True)
continue
if not os.path.isfile(val): if not os.path.isfile(val):
raise ArgumentTypeError('File does not exist "{}"'.format(val)) raise ArgumentTypeError('File does not exist "{}"'.format(val))
icns.add_media(IcnsType.key_from_readable(key), file=val, force=True) icns.add_media(IcnsType.key_from_readable(key), file=val, force=True)
has_changes = True
# write file # write file
if has_changes or args.output: if has_changes or args.output:
icns.write(args.output or args.file, toc=icns.has_toc()) icns.write(args.output or args.file, toc=icns.has_toc())
@@ -120,6 +127,7 @@ def cli_convert(args: ArgParams) -> None:
else: else:
print('Could not determine target image-type for file "{}".'.format( print('Could not determine target image-type for file "{}".'.format(
dest), file=sys.stderr) dest), file=sys.stderr)
exit(1)
def enum_with_stdin(file_arg: list) -> Iterator[str]: def enum_with_stdin(file_arg: list) -> Iterator[str]:
@@ -149,7 +157,7 @@ def main() -> None:
# Args Parser # Args Parser
parser = ArgumentParser(description=__doc__, parser = ArgumentParser(description=__doc__,
formatter_class=RawTextHelpFormatter) formatter_class=RawTextHelpFormatter)
parser.set_defaults(func=lambda _: parser.print_help(sys.stderr)) parser.set_defaults(func=lambda _: parser.print_help(sys.stdout))
parser.add_argument( parser.add_argument(
'-v', '--version', action='version', version='icnsutil ' + __version__) '-v', '--version', action='version', version='icnsutil ' + __version__)
sub_parser = parser.add_subparsers(metavar='command') sub_parser = parser.add_subparsers(metavar='command')
@@ -170,7 +178,7 @@ def main() -> None:
cmd.add_argument('-o', '--export-dir', type=PathExist('d'), cmd.add_argument('-o', '--export-dir', type=PathExist('d'),
metavar='DIR', help='set custom export directory') metavar='DIR', help='set custom export directory')
cmd.add_argument('-k', '--keys', action='store_true', cmd.add_argument('-k', '--keys', action='store_true',
help='use icns key as filenam') help='use icns key as filename')
cmd.add_argument('-c', '--convert', action='store_true', cmd.add_argument('-c', '--convert', action='store_true',
help='convert ARGB and RGB images to PNG') help='convert ARGB and RGB images to PNG')
cmd.add_argument('--png-only', action='store_true', cmd.add_argument('--png-only', action='store_true',