refactor: extract shared _apply_import_flags_to_params helper, add 16384 to max-size

- Extract _build_import_settings_from_flags and _apply_import_flags_to_params
  shared helpers to eliminate duplication between modify and set-import-settings
- Add 16384 to --max-size CLI choices (both commands) to match backend support

Author: zaferdace

Server/src/cli/commands/texture.py

@@ -481,13 +481,78 @@ def sprite(path: str, width: int, height: int, image_path: Optional[str], color:
         print_success(f"Created sprite: {path}")
 
 
+def _build_import_settings_from_flags(
+    texture_type: Optional[str],
+    sprite_mode: Optional[str],
+    sprite_ppu: Optional[float],
+    max_size: Optional[str],
+    compression: Optional[str],
+    generate_mipmaps: Optional[bool],
+    srgb: Optional[bool],
+    readable: Optional[bool],
+) -> dict[str, Any]:
+    """Build importSettings dict from CLI flags. Returns empty dict if no flags set."""
+    import_settings: dict[str, Any] = {}
+    if texture_type:
+        import_settings["textureType"] = _TEXTURE_TYPES[texture_type]
+    if sprite_mode:
+        import_settings["spriteImportMode"] = _SPRITE_MODES[sprite_mode]
+    if sprite_ppu is not None:
+        import_settings["spritePixelsPerUnit"] = sprite_ppu
+    if max_size:
+        import_settings["maxTextureSize"] = int(max_size)
+    if compression:
+        import_settings["textureCompression"] = _COMPRESSIONS[compression]
+    if generate_mipmaps is not None:
+        import_settings["mipmapEnabled"] = generate_mipmaps
+    if srgb is not None:
+        import_settings["sRGBTexture"] = srgb
+    if readable is not None:
+        import_settings["isReadable"] = readable
+    return import_settings
+
+
+def _apply_import_flags_to_params(
+    params: dict[str, Any],
+    texture_type: Optional[str],
+    sprite_mode: Optional[str],
+    sprite_ppu: Optional[float],
+    max_size: Optional[str],
+    compression: Optional[str],
+    generate_mipmaps: Optional[bool],
+    srgb: Optional[bool],
+    readable: Optional[bool],
+    as_sprite: bool,
+) -> bool:
+    """Validate and apply import-setting flags to params dict. Returns True if any import setting present."""
+    has_other_flags = any(v is not None for v in (
+        texture_type, sprite_mode, sprite_ppu, max_size, compression, generate_mipmaps, srgb, readable))
+
+    if as_sprite:
+        if has_other_flags:
+            print_error("--as-sprite cannot be combined with other import-setting flags")
+            sys.exit(1)
+        params["spriteSettings"] = {"pivot": [0.5, 0.5], "pixelsPerUnit": 100}
+        return True
+
+    if has_other_flags:
+        import_settings = _build_import_settings_from_flags(
+            texture_type, sprite_mode, sprite_ppu, max_size, compression,
+            generate_mipmaps, srgb, readable)
+        if import_settings:
+            params["importSettings"] = import_settings
+        return True
+
+    return False
+
+
 @texture.command("modify")
 @click.argument("path")
 @click.option("--set-pixels", default=None, help="Modification args as JSON")
 @click.option("--texture-type", type=click.Choice(list(_TEXTURE_TYPES.keys())), help="Texture type")
 @click.option("--sprite-mode", type=click.Choice(list(_SPRITE_MODES.keys())), help="Sprite import mode")
 @click.option("--sprite-ppu", type=float, help="Sprite pixels per unit")
-@click.option("--max-size", type=click.Choice(["32", "64", "128", "256", "512", "1024", "2048", "4096", "8192"]), help="Max texture size")
+@click.option("--max-size", type=click.Choice(["32", "64", "128", "256", "512", "1024", "2048", "4096", "8192", "16384"]), help="Max texture size")
 @click.option("--compression", type=click.Choice(list(_COMPRESSIONS.keys())), help="Compression quality")
 @click.option("--generate-mipmaps/--no-mipmaps", default=None, help="Generate mipmaps")
 @click.option("--srgb/--linear", default=None, help="sRGB color texture")
@@ -509,51 +574,21 @@ def modify(path: str, set_pixels: Optional[str], texture_type: Optional[str], sp
     """
     config = get_config()
 
-    has_import_setting = any(v is not None for v in (texture_type, sprite_mode, sprite_ppu, max_size, compression, generate_mipmaps, srgb, readable)) or as_sprite
+    params: dict[str, Any] = {"action": "modify", "path": path}
 
-    if set_pixels is None and not has_import_setting:
-        print_error("At least one of --set-pixels or an import-setting flag must be provided")
-        sys.exit(1)
-
-    if as_sprite:
-        if any(v is not None for v in (texture_type, sprite_mode, sprite_ppu, max_size, compression, generate_mipmaps, srgb, readable)):
-            print_error("--as-sprite cannot be combined with other import-setting flags")
-            sys.exit(1)
-
-    params: dict[str, Any] = {
-        "action": "modify",
-        "path": path,
-    }
+    has_import = _apply_import_flags_to_params(
+        params, texture_type, sprite_mode, sprite_ppu, max_size,
+        compression, generate_mipmaps, srgb, readable, as_sprite)
 
     if set_pixels is not None:
         try:
             params["setPixels"] = _normalize_set_pixels(set_pixels)
         except ValueError as e:
             print_error(str(e))
             sys.exit(1)
-
-    if as_sprite:
-        params["spriteSettings"] = {"pivot": [0.5, 0.5], "pixelsPerUnit": 100}
-    elif has_import_setting:
-        import_settings: dict[str, Any] = {}
-        if texture_type:
-            import_settings["textureType"] = _TEXTURE_TYPES[texture_type]
-        if sprite_mode:
-            import_settings["spriteImportMode"] = _SPRITE_MODES[sprite_mode]
-        if sprite_ppu is not None:
-            import_settings["spritePixelsPerUnit"] = sprite_ppu
-        if max_size:
-            import_settings["maxTextureSize"] = int(max_size)
-        if compression:
-            import_settings["textureCompression"] = _COMPRESSIONS[compression]
-        if generate_mipmaps is not None:
-            import_settings["mipmapEnabled"] = generate_mipmaps
-        if srgb is not None:
-            import_settings["sRGBTexture"] = srgb
-        if readable is not None:
-            import_settings["isReadable"] = readable
-        if import_settings:
-            params["importSettings"] = import_settings
+    elif not has_import:
+        print_error("At least one of --set-pixels or an import-setting flag must be provided")
+        sys.exit(1)
 
     result = run_command("manage_texture", params, config)
     click.echo(format_output(result, config.format))
@@ -594,7 +629,7 @@ def delete(path: str, force: bool):
 @click.option("--texture-type", type=click.Choice(list(_TEXTURE_TYPES.keys())), help="Texture type")
 @click.option("--sprite-mode", type=click.Choice(list(_SPRITE_MODES.keys())), help="Sprite import mode")
 @click.option("--sprite-ppu", type=float, help="Sprite pixels per unit")
-@click.option("--max-size", type=click.Choice(["32", "64", "128", "256", "512", "1024", "2048", "4096", "8192"]), help="Max texture size")
+@click.option("--max-size", type=click.Choice(["32", "64", "128", "256", "512", "1024", "2048", "4096", "8192", "16384"]), help="Max texture size")
 @click.option("--compression", type=click.Choice(list(_COMPRESSIONS.keys())), help="Compression quality")
 @click.option("--generate-mipmaps/--no-mipmaps", default=None, help="Generate mipmaps")
 @click.option("--srgb/--linear", default=None, help="sRGB color texture")
@@ -616,40 +651,15 @@ def set_import_settings(path: str, texture_type: Optional[str], sprite_mode: Opt
     """
     config = get_config()
 
-    params: dict[str, Any] = {
-        "action": "set_import_settings",
-        "path": path,
-    }
+    params: dict[str, Any] = {"action": "set_import_settings", "path": path}
 
-    if as_sprite:
-        if any(v is not None for v in (texture_type, sprite_mode, sprite_ppu, max_size, compression, generate_mipmaps, srgb, readable)):
-            print_error("--as-sprite cannot be combined with other import-setting flags")
-            sys.exit(1)
-        params["spriteSettings"] = {"pivot": [0.5, 0.5], "pixelsPerUnit": 100}
-    else:
-        import_settings = {}
-        if texture_type:
-            import_settings["textureType"] = _TEXTURE_TYPES[texture_type]
-        if sprite_mode:
-            import_settings["spriteImportMode"] = _SPRITE_MODES[sprite_mode]
-        if sprite_ppu is not None:
-            import_settings["spritePixelsPerUnit"] = sprite_ppu
-        if max_size:
-            import_settings["maxTextureSize"] = int(max_size)
-        if compression:
-            import_settings["textureCompression"] = _COMPRESSIONS[compression]
-        if generate_mipmaps is not None:
-            import_settings["mipmapEnabled"] = generate_mipmaps
-        if srgb is not None:
-            import_settings["sRGBTexture"] = srgb
-        if readable is not None:
-            import_settings["isReadable"] = readable
-
-        if not import_settings:
-            print_error("At least one import setting must be specified")
-            sys.exit(1)
+    has_import = _apply_import_flags_to_params(
+        params, texture_type, sprite_mode, sprite_ppu, max_size,
+        compression, generate_mipmaps, srgb, readable, as_sprite)
 
-        params["importSettings"] = import_settings
+    if not has_import:
+        print_error("At least one import setting must be specified")
+        sys.exit(1)
 
     result = run_command("manage_texture", params, config)
     click.echo(format_output(result, config.format))