diff --git a/export.py b/export.py index b4b5539..03201cb 100644 --- a/export.py +++ b/export.py @@ -34,24 +34,36 @@ def export(m, filtered_emoji, input_path, formats, path, src_size, partial_cached_emoji_count = check_result["partial_cached_emoji_count"] skipped_emoji_count = check_result["skipped_emoji_count"] - if skipped_emoji_count > 0: - log.out(f"- {skipped_emoji_count} emoji have been skipped, leaving {len(exporting_emoji)} emoji to export.", 34) + # report back how the export is going to go + # -------------------------------------------------------------------------- + if skipped_emoji_count and verbose: + log.out(f"", 34) # make a new line to break it up + + log.out(f"Output plan:", 34) + + if skipped_emoji_count: + log.out(f"->[skip] {skipped_emoji_count} emoji will be skipped.", 34) if not verbose: - log.out(f"- use the --verbose flag to see what those emoji are and why they were skipped.", 34) - if cached_emoji: - log.out(f"- {len(cached_emoji)} emoji will be reused from cache.", 32) + log.out(f" (use the --verbose flag to see what those emoji are and why they are being skipped.)", 34) + + if cached_emoji or partial_cached_emoji_count: + log.out(f"->[cache] {len(cached_emoji)} emoji will be reused from cache.", 34) + if partial_cached_emoji_count: - log.out(f"- {partial_cached_emoji_count} emoji will be partially " - "reused from cache.", 32) - log.out('- done!', 32) + log.out(f"->[partial] {partial_cached_emoji_count} emoji will be partly reused from cache.", 34) + + log.out(f"->[export] {len(exporting_emoji) - partial_cached_emoji_count} emoji will be fully exported.", 34) # If there's no emoji to export, tell the program to quit. + # -------------------------------------------------------------------------- if len(exporting_emoji) == 0 and len(cached_emoji) == 0: raise SystemExit('>∆∆< It looks like you have no emoji to export!') + + # export emoji # -------------------------------------------------------------------------- # declare some specs of this export. @@ -75,6 +87,7 @@ def export(m, filtered_emoji, input_path, formats, path, src_size, log.out(f"- done!", 32) + # exif license pass # (currently only just applies to PNGs) # -------------------------------------------------------------------------- @@ -97,15 +110,16 @@ def export(m, filtered_emoji, input_path, formats, path, src_size, image_proc.batch_add_exif_metadata(exif_compatible_images, m.license.get('exif'), max_batch) + + + def export_step(exporting_emoji, num_threads, m, input_path, formats, path, renderer, license_enabled, cache): log.out(f"Exporting {len(exporting_emoji)} emoji...", 36) - log.out(f"- {', '.join(formats)}") # print formats - log.out(f"- to '{path}'") # print out path if num_threads > 1: - log.out(f"- {num_threads} threads") + log.out(f"-> {num_threads} threads") else: - log.out(f"- {num_threads} thread") + log.out(f"-> {num_threads} thread") try: # start a Queue object for emoji export @@ -137,7 +151,7 @@ def export_step(exporting_emoji, num_threads, m, input_path, formats, path, rend for u in threads: u.kill() u.join() - + raise ValueError(f'Thread {t.name} failed: {t.err}') if done: @@ -169,9 +183,9 @@ def export_step(exporting_emoji, num_threads, m, input_path, formats, path, rend raise - log.out('- done!', 32) + log.out('done!', 32) if log.filtered_export_task_count > 0: - log.out(f"- {log.filtered_export_task_count} emoji have been implicitly or explicitly filtered out of this export task.", 34) + log.out(f"-> {log.filtered_export_task_count} emoji have been implicitly or explicitly filtered out of this export task.", 34) log.export_task_count = 0 log.filtered_export_task_count = 0 diff --git a/orxport.py b/orxport.py index 43ba960..eef6764 100755 --- a/orxport.py +++ b/orxport.py @@ -215,13 +215,13 @@ def main(): log.out(f'Loading manifest file...', 36) m = orx.manifest.Manifest(os.path.dirname(manifest_path), os.path.basename(manifest_path)) - log.out(f'- {len(m.emoji)} emoji defined.', 32) + log.out(f'-> {len(m.emoji)} emoji defined.') # filter emoji (if any filter is present) filtered_emoji = [e for e in m.emoji if emoji.match(e, emoji_filter)] if emoji_filter: if filtered_emoji: # if more than 0 - log.out(f'- {len(filtered_emoji)} / {len(m.emoji)} emoji match the filter you gave.', 34) + log.out(f'-> {len(filtered_emoji)} / {len(m.emoji)} emoji match the filter you gave.', 34) else: raise ValueError(f"Your filter ('{emoji_filter_text}') returned no results.") @@ -257,10 +257,14 @@ def main(): makeshift_params = f"dest structure = {output_naming} format = {' '.join(output_formats)} license = {license_text}" p = orx.params.Parameters(string = makeshift_params) - log.out(f'- {len(p.dests)} destination(s) defined.', 32) + path = os.path.join(output_path, output_naming) + + log.out(f'{len(p.dests)} destination(s) defined.', 32) + log.out(f"-> {', '.join(output_formats)}") # print formats + log.out(f"-> to '{path}'") # print out path export.export(m, filtered_emoji, input_path, output_formats, - os.path.join(output_path, output_naming), src_size, + path, src_size, num_threads, renderer, max_batch, verbose, license_enabled, cache)