diff --git a/generate_plugin.py b/generate_plugin.py index d079446..3e74878 100644 --- a/generate_plugin.py +++ b/generate_plugin.py @@ -12,26 +12,11 @@ from utils.plugin_config import PluginConfig from utils import cli -from pathlib import Path -import platform -import subprocess -import time -import shlex -import shutil -import sys - def generate_plugin(plugin_config, args): """Generate a new plugin.""" plugin_config.validate() - path_root = Path(__file__).parent - - # Make sure it's okay to write to the target directory. - path_root_new = generator_utils.validate_target_dir(args, plugin_config, path_root) - - platform_name_lower = generator_utils.get_platform_name_lower(plugin_config.platform_name) - - generator_utils.build_new_plugin(plugin_config, path_root, path_root_new, platform_name_lower) + generator_utils.build_new_plugin(args, plugin_config) generator_utils.show_summary() diff --git a/utils/generator_utils.py b/utils/generator_utils.py index a4958dc..7bf6f83 100644 --- a/utils/generator_utils.py +++ b/utils/generator_utils.py @@ -83,8 +83,14 @@ def validate_target_dir(args, plugin_config, path_root): print("\n\nThank you. Configuring plugin...") return path_root_new -def build_new_plugin(plugin_config, path_root, path_root_new, platform_name_lower): +def build_new_plugin(args, plugin_config): """Build the new plugin in the target directory.""" + path_root = Path(__file__).parents[1] + + # Make sure it's okay to write to the target directory. + path_root_new = validate_target_dir(args, plugin_config, path_root) + + platform_name_lower = get_platform_name_lower(plugin_config.platform_name) replacements = _get_replacements(plugin_config, platform_name_lower) # Make new plugin dir, and required directory structure.