From 261b26e4c1e59657f9eea7f42e2f5bfb4974191b Mon Sep 17 00:00:00 2001
From: Eric Matthes <ehmatthes@gmail.com>
Date: Tue, 27 May 2025 07:34:26 -0400
Subject: [PATCH 1/2] Path logic moved to utils.

---
 generate_plugin.py       | 10 +++++-----
 utils/generator_utils.py | 11 ++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/generate_plugin.py b/generate_plugin.py
index d079446..aba8e9b 100644
--- a/generate_plugin.py
+++ b/generate_plugin.py
@@ -24,14 +24,14 @@
 def generate_plugin(plugin_config, args):
     """Generate a new plugin."""
     plugin_config.validate()
-    path_root = Path(__file__).parent
+    # 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)
+    # # 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)
+    # 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)#, path_root, path_root_new, platform_name_lower)
     generator_utils.show_summary()
 
 
diff --git a/utils/generator_utils.py b/utils/generator_utils.py
index a4958dc..e620408 100644
--- a/utils/generator_utils.py
+++ b/utils/generator_utils.py
@@ -83,8 +83,17 @@ 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):#, path_root, path_root_new, platform_name_lower):
     """Build the new plugin in the target directory."""
+    path_root = Path(__file__).parent.parent
+
+    # 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.

From 8ee316b52c122d2c2b1d0f04a43ea74d0f83d3bf Mon Sep 17 00:00:00 2001
From: Eric Matthes <ehmatthes@gmail.com>
Date: Tue, 27 May 2025 07:36:45 -0400
Subject: [PATCH 2/2] Remove unused code.

---
 generate_plugin.py       | 17 +----------------
 utils/generator_utils.py |  7 ++-----
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/generate_plugin.py b/generate_plugin.py
index aba8e9b..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(args, 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 e620408..7bf6f83 100644
--- a/utils/generator_utils.py
+++ b/utils/generator_utils.py
@@ -83,17 +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(args, 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__).parent.parent
+    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.