foundrytools-cli 1.1.14__tar.gz → 1.1.15__tar.gz

{foundrytools_cli-1.1.14/foundrytools_cli.egg-info → foundrytools_cli-1.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.14
+Version: 1.1.15
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: afdko>=4.0.1
-Requires-Dist: fonttools>=4.53.0
+Requires-Dist: fonttools>=4.53.1
 Requires-Dist: brotli>=1.1.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: cffsubr>=0.3.0

{foundrytools_cli-1.1.14 → foundrytools_cli-1.1.15}/foundryToolsCLI/CLI/ftcli_utils.py

@@ -158,29 +158,45 @@ def del_table(
     is_flag=True,
     help="Appends the version string to the family folder.",
 )
+@click.option(
+    "-d",
+    "--delete-empty",
+    "delete_empty",
+    is_flag=True,
+    help="""
+    Delete empty folder.
+
+    This deletes empty folders that are the result of moving files to different folder, especially when using the recursive option.
+    """,
+)
 @add_file_or_path_argument()
+@add_recursive_option()
 @Timer(logger=logger.info)
 def font_organizer(
     input_path: Path,
     sort_by_foundry: bool = False,
     sort_by_extension: bool = False,
     sort_by_version: bool = False,
+    recursive: bool = False,
+    delete_empty: bool = False,
 ):
     """
     Sorts fonts in folders by family name and optionally by foundry, font revision and extension.
     """
-    fonts = get_fonts_in_path(input_path=input_path)
+    fonts = get_fonts_in_path(input_path=input_path, recursive=recursive)
     if not initial_check_pass(fonts=fonts):
         return
 
     for font in fonts:
         try:
             file = Path(font.reader.file.name)
-            output_dir = file.parent
+            output_dir = input_path
+            old_dir = file.parent
             family_name = font.guess_family_name()
 
             foundry = font.guess_foundry_name() if sort_by_foundry else None
             if foundry:
+                foundry = foundry.strip()
                 output_dir = output_dir.joinpath(foundry)
 
             version = f" v{round(font['head'].fontRevision, 3)}" if sort_by_version else None
@@ -196,11 +212,21 @@ def font_organizer(
             output_dir = sanitize_filepath(output_dir, platform="auto")
             output_dir.mkdir(parents=True, exist_ok=True)
 
+            if Path(makeOutputFileName(output_dir.joinpath(file.name), overWrite=True)) == file:
+                logger.skip(Logs.file_not_changed, file=file.name)
+                continue
+
             target = Path(makeOutputFileName(output_dir.joinpath(file.name), overWrite=False))
             file.rename(target=target)
 
             logger.opt(colors=True).success(f"{file} <magenta>--></> <cyan>{target}</>")
 
+            if delete_empty:
+                while not any(old_dir.iterdir()):
+                    old_dir.rmdir()
+                    logger.opt(colors=True).success(f"{old_dir} <magenta>--></> <red>DELETED</>")
+                    old_dir = old_dir.parent
+
         except Exception as e:
             logger.exception(e)
         finally:

foundrytools_cli-1.1.15/foundryToolsCLI/__init__.py

@@ -0,0 +1,3 @@
+VERSION = __version__ = "1.1.15"
+
+__all__ = ["VERSION"]

{foundrytools_cli-1.1.14 → foundrytools_cli-1.1.15/foundrytools_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.14
+Version: 1.1.15
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: afdko>=4.0.1
-Requires-Dist: fonttools>=4.53.0
+Requires-Dist: fonttools>=4.53.1
 Requires-Dist: brotli>=1.1.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: cffsubr>=0.3.0

{foundrytools_cli-1.1.14 → foundrytools_cli-1.1.15}/foundrytools_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 afdko>=4.0.1
-fonttools>=4.53.0
+fonttools>=4.53.1
 brotli>=1.1.0
 click>=8.1.7
 cffsubr>=0.3.0

{foundrytools_cli-1.1.14 → foundrytools_cli-1.1.15}/requirements.txt

@@ -1,6 +1,6 @@
 # Hard pinning here gets relaxed to ">=" in setup.py
 afdko==4.0.1
-fonttools==4.53.0
+fonttools==4.53.1
 brotli==1.1.0
 click==8.1.7
 cffsubr==0.3.0

{foundrytools_cli-1.1.14 → foundrytools_cli-1.1.15}/setup.py

@@ -18,7 +18,7 @@ def _get_requirements():
 
 setuptools.setup(
     name="foundrytools-cli",
-    version="1.1.14",
+    version="1.1.15",
     description="A set of command line tools to inspect, manipulate and convert font files",
     long_description=long_description,
     long_description_content_type="text/markdown",

foundrytools_cli-1.1.14/foundryToolsCLI/__init__.py

@@ -1,3 +0,0 @@
-VERSION = __version__ = "1.1.14"
-
-__all__ = ["VERSION"]