update

Author: iotagtk1

GtkFileGenerator/Program.cs

@@ -27,9 +27,6 @@ public static void Main(string[] args)
                 throw;
             }
 
-            //clsArgsConfig.Instance().ProjectFolder = "/home/ita/C#/App_GitHub/GtkFileGenerator/GtkFileGenerator";
-            //clsArgsConfig.Instance().ProjectName = "GtkFileGenerator";
-
             if (!clsArgsConfig.Instance()._validateCommandKey())
             {
                 return;

GtkFileGenerator/clsArgsConfig.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Xml;
 
@@ -24,6 +25,7 @@ public static clsArgsConfig Instance()
             "-projectName","-projectDir"};
         public Boolean _validateCommandKey()
         {
+   
             if (ProjectFolder == "" )
             {
                 Console.WriteLine("The projectFolder is not specified.");
@@ -34,6 +36,11 @@ public Boolean _validateCommandKey()
                 Console.WriteLine("ProjectName is not specified.");
                 return false;
             }
+            
+            if (ProjectName != "")
+            {
+                ProjectName = _getProjectName(ProjectName);
+            }
 
             return true;
         }
@@ -53,7 +60,7 @@ public void _setArgs(string[] args)
                     i++;
                     continue;
                 }
-                
+
                 if (commandKey._indexOf("-projectName") != -1)
                 {
 
@@ -70,7 +77,37 @@ public void _setArgs(string[] args)
             }
         }
 
-  
-       
+        /// <summary>
+        /// プロジェクトパスを取得する
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        private string _getProjectName(string path)
+        {
+            path = path.TrimEnd(Path.DirectorySeparatorChar);
+
+            var separator = Path.DirectorySeparatorChar;
+            string[] pathArray = path.Split(separator);
+            
+            if (pathArray.Length == 0)
+            {
+                return path;
+            }
+
+            for (int i = pathArray.Length; i > 0; i--)
+            {
+                var pathArray1 = pathArray[0..i];
+                string stCsvData = string.Join("/", pathArray1);
+                string csprojPath = stCsvData + "/" + pathArray[i - 1] + ".csproj";
+                if (File.Exists(csprojPath))
+                {
+                    return pathArray[i - 1];
+                    break;
+                }
+            }
+            
+            return "";
+        }
+
     }
 }

README.md

@@ -29,7 +29,7 @@ $ dotnet new --install GtkSharp.Template.CSharp
 Run from a terminal You can't use macros in a terminal, so you need to put the absolute path in the projectDir.
 
 ```
-$ GtkFileGenerator -projectName namespace name -projectDir projectPath
+$ GtkFileGenerator -projectName namespace -projectDir projectPath
 ```
 
 ##### Run from Rider macro can be used
@@ -42,7 +42,7 @@ Set the path of the program.
 Set the arguments.
 
 ```
--projectName $SolutionName$ -projectDir $FileDir$
+-projectName $FilePath$ -projectDir $FileDir$
 ```
 
 The working Path can be empty.