esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2025-05-06 03:32:57 +00:00
Code Issues Projects Releases Wiki Activity

CLI

Browse Source
This commit is contained in:
Ahmed Zamil 2024-10-12 05:21:04 +03:00
parent b66f8eb340
commit 264c1e1cd8
9 changed files with 66 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Esiur.CLI/Program.cs
View File

@ -8,8 +8,6 @@ using System.Diagnostics;
using System.IO;
using System.Reflection;
static void Main(string[] args)
{
if (args.Length > 0)
{
@ -24,10 +22,11 @@ static void Main(string[] args)
{
try
{
var path = Esiur.Proxy.TemplateGenerator.GetTemplate(url, o.Dir, o.Username, o.Password, o.AsyncSetters);
var path = Esiur.Proxy.TemplateGenerator.GetTemplate(url, o.Dir, false, o.Username, o.Password, o.AsyncSetters);
Console.WriteLine($"Generated successfully: {path}");
}
catch (Exception ex) {
catch (Exception ex)
{
Console.WriteLine(ex.ToString());
}
});
@ -43,12 +42,13 @@ static void Main(string[] args)
{
var version = FileVersionInfo.GetVersionInfo(typeof(Esiur.Core.AsyncReply).Assembly.Location).FileVersion;
Console.WriteLine(version);
Console.WriteLine("Esiur " + version);
return;
}
}
PrintHelp();
}
static void PrintHelp()
{
@ -58,13 +58,13 @@ static void PrintHelp()
Console.WriteLine("Usage: <command> [arguments]");
Console.WriteLine("");
Console.WriteLine("Available commands:");
Console.WriteLine("\tget-template\t\tGet a template from an IIP link.");
Console.WriteLine("\tget-template\tGet a template from an IIP link.");
Console.WriteLine("\tversion\t\tPrint Esiur version.");
Console.WriteLine("");
Console.WriteLine("Global options:");
Console.WriteLine("\t-u, --username\tAuthentication username.");
Console.WriteLine("\t-p, --password\tAuthentication password.");
Console.WriteLine("\t-d, --dir\tDirectory name where the generated models will be saved.");
Console.WriteLine("\t-u, --username\t\tAuthentication username.");
Console.WriteLine("\t-p, --password\t\tAuthentication password.");
Console.WriteLine("\t-d, --dir\t\tDirectory name where the generated models will be saved.");
Console.WriteLine("\t-a, --async-setters\tUse asynchronous property setters.");
}

8
Esiur.CLI/Properties/launchSettings.json Normal file
View File

@ -0,0 +1,8 @@
{
"profiles": {
"Esiur.CLI": {
"commandName": "Project",
"commandLineArgs": "get-template iip://phase.delta.iq/sys/phase -d c:\\temp\\a"
}
}
}

4
Esiur.Examples.StandaloneWebServerDemo/Esiur.Examples.StandaloneWebServerDemo.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Esiur" Version="2.4.0" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Esiur" Version="2.4.5" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
</ItemGroup>
<ItemGroup>

2
Esiur.Examples.StandaloneWebServerDemo/Program.cs
View File

@ -40,7 +40,7 @@ internal class Program
}
else
{
sender.Response.Number = Esiur.Net.Packets.HTTPResponsePacket.ResponseCode.NotFound;
sender.Response.Number = Esiur.Net.Packets.HTTP.HTTPResponseCode.NotFound;
sender.Send("`" + fn + "` Not Found");
sender.Close();
}

2
Esiur.Stores.EntityCore/Esiur.Stores.EntityCore.csproj
View File

@ -22,7 +22,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
<PackageReference Include="System.Collections" Version="4.3.0" />
</ItemGroup>

4
Esiur.Stores.MongoDB/Esiur.Stores.MongoDB.csproj
View File

@ -17,8 +17,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MongoDB.Bson" Version="2.24.0" />
<PackageReference Include="MongoDB.Driver" Version="2.24.0" />
<PackageReference Include="MongoDB.Bson" Version="2.29.0" />
<PackageReference Include="MongoDB.Driver" Version="2.29.0" />
</ItemGroup>
<ItemGroup>

10
Esiur/Esiur.csproj
View File

@ -5,7 +5,7 @@
<Copyright>Ahmed Kh. Zamil</Copyright>
<PackageProjectUrl>http://www.esiur.com</PackageProjectUrl>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>2.4.4</Version>
<Version>2.4.5</Version>
<RepositoryUrl>https://github.com/esiur/esiur-dotnet</RepositoryUrl>
<Authors>Ahmed Kh. Zamil</Authors>
<AssemblyVersion></AssemblyVersion>
@ -63,7 +63,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
@ -74,11 +74,11 @@
<PackageReference Include="System.Net.Security" Version="4.3.2" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
<PackageReference Include="System.Text.Json" Version="8.0.4" GeneratePathProperty="true" />
<PackageReference Include="System.Text.Json" Version="8.0.5" GeneratePathProperty="true" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
</ItemGroup>

22
Esiur/Proxy/TemplateGenerator.cs
View File

@ -177,7 +177,7 @@ public static class TemplateGenerator
return (representationType.Nullable) ? name + "?" : name;
}
public static string GetTemplate(string url, string dir = null, string username = null, string password = null, bool asyncSetters = false)
public static string GetTemplate(string url, string dir = null, bool tempDir = false, string username = null, string password = null, bool asyncSetters = false)
{
try
{
@ -200,14 +200,14 @@ public static class TemplateGenerator
// no longer needed
Warehouse.Remove(con);
var tempDir = new DirectoryInfo(Path.GetTempPath() + Path.DirectorySeparatorChar
+ Misc.Global.GenerateCode(20) + Path.DirectorySeparatorChar + dir);
var dstDir = new DirectoryInfo(tempDir ? Path.GetTempPath() + Path.DirectorySeparatorChar
+ Misc.Global.GenerateCode(20) + Path.DirectorySeparatorChar + dir : dir);
if (!tempDir.Exists)
tempDir.Create();
if (!dstDir.Exists)
dstDir.Create();
else
{
foreach (FileInfo file in tempDir.GetFiles())
foreach (FileInfo file in dstDir.GetFiles())
file.Delete();
}
@ -217,17 +217,17 @@ public static class TemplateGenerator
if (tmp.Type == TemplateType.Resource)
{
var source = GenerateClass(tmp, templates, asyncSetters);
File.WriteAllText(tempDir.FullName + Path.DirectorySeparatorChar + tmp.ClassName + ".Generated.cs", source);
File.WriteAllText(dstDir.FullName + Path.DirectorySeparatorChar + tmp.ClassName + ".Generated.cs", source);
}
else if (tmp.Type == TemplateType.Record)
{
var source = GenerateRecord(tmp, templates);
File.WriteAllText(tempDir.FullName + Path.DirectorySeparatorChar + tmp.ClassName + ".Generated.cs", source);
File.WriteAllText(dstDir.FullName + Path.DirectorySeparatorChar + tmp.ClassName + ".Generated.cs", source);
}
else if (tmp.Type == TemplateType.Enum)
{
var source = GenerateEnum(tmp, templates);
File.WriteAllText(tempDir.FullName + Path.DirectorySeparatorChar + tmp.ClassName + ".Generated.cs", source);
File.WriteAllText(dstDir.FullName + Path.DirectorySeparatorChar + tmp.ClassName + ".Generated.cs", source);
}
}
@ -248,10 +248,10 @@ public static class TemplateGenerator
"\r\n } \r\n}";
File.WriteAllText(tempDir.FullName + Path.DirectorySeparatorChar + "Esiur.Generated.cs", typesFile);
File.WriteAllText(dstDir.FullName + Path.DirectorySeparatorChar + "Esiur.Generated.cs", typesFile);
return tempDir.FullName;
return dstDir.FullName;
}
catch (Exception ex)

2
Esiur/Tools/Esiur.psm1
View File

@ -5,7 +5,7 @@
#write-host "Lib is at $($lib)"
$assembly = [Reflection.Assembly]::LoadFile($lib)
$tempPath = [Esiur.Proxy.TemplateGenerator]::GetTemplate($url, $dir, $username,$password, $asyncSetters);
$tempPath = [Esiur.Proxy.TemplateGenerator]::GetTemplate($url, $dir, true, $username,$password, $asyncSetters);
$startupProject = GetStartupProject