喵

yomunsam · Jul 2, 2020 · 73a6af0 · 73a6af0
1 parent 0e26477
commit 73a6af0
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 1 deletion.
diff --git a/NekoSheet.Console/NekoSheet.Console.csproj b/NekoSheet.Console/NekoSheet.Console.csproj
@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Nekonya.Common" Version="1.0.1" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20303.1" />
   </ItemGroup>
 

diff --git a/NekoSheet.Console/NekoSheet.Console.csproj.user b/NekoSheet.Console/NekoSheet.Console.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>E:\DevWork\Nekonya\NekoSheet\NekoSheet.Console\Properties\PublishProfiles\linux64_框架依赖.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>E:\DevWork\Nekonya\NekoSheet\NekoSheet.Console\Properties\PublishProfiles\OSX64_框架依赖.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>
diff --git a/NekoSheet.Console/Program.cs b/NekoSheet.Console/Program.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.CommandLine;
 using System.CommandLine.Invocation;
+using Nekonya;
 
 namespace NekoSheet
 {
@@ -78,6 +79,17 @@ static string[] GetSheetFileNames(string path)
         /// <returns></returns>
         static string GetOutputName(string outputPath,string filePath, char commentChar)
         {
+            if(outputPath.IsNullOrEmpty())
+            {
+                string file_name = Path.GetFileNameWithoutExtension(filePath);
+                int _comment = file_name.IndexOf(commentChar);
+                if (_comment > 0)
+                {
+                    file_name = file_name.Substring(0, _comment);
+                }
+                return Path.Combine(Path.GetDirectoryName(filePath), file_name + ".json");
+            }
+
             if (Directory.Exists(outputPath))
             {
                 //给定的路径是个文件夹,也就是说要自动生成文件名

diff --git a/...rties/PublishProfiles/linux64_框架依赖.pubxml → ...s/PublishProfiles/Linux_AMD64_框架依赖.pubxml b/...rties/PublishProfiles/linux64_框架依赖.pubxml → ...s/PublishProfiles/Linux_AMD64_框架依赖.pubxml
diff --git a/.../PublishProfiles/linux64_框架依赖.pubxml.user → ...lishProfiles/Linux_AMD64_框架依赖.pubxml.user b/.../PublishProfiles/linux64_框架依赖.pubxml.user → ...lishProfiles/Linux_AMD64_框架依赖.pubxml.user
diff --git a/NekoSheet.Console/Properties/PublishProfiles/Linux_ARM_框架依赖.pubxml b/NekoSheet.Console/Properties/PublishProfiles/Linux_ARM_框架依赖.pubxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\netcoreapp3.1\publish_linux_arm</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+  </PropertyGroup>
+</Project>
diff --git a/NekoSheet.Console/Properties/PublishProfiles/Linux_ARM_框架依赖.pubxml.user b/NekoSheet.Console/Properties/PublishProfiles/Linux_ARM_框架依赖.pubxml.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/NekoSheet.Console/Properties/PublishProfiles/OSX64_框架依赖.pubxml b/NekoSheet.Console/Properties/PublishProfiles/OSX64_框架依赖.pubxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\netcoreapp3.1\publish_osx64</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
+    <SelfContained>false</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+  </PropertyGroup>
+</Project>
diff --git a/NekoSheet.Console/Properties/PublishProfiles/OSX64_框架依赖.pubxml.user b/NekoSheet.Console/Properties/PublishProfiles/OSX64_框架依赖.pubxml.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/NekoSheet.Console/Properties/PublishProfiles/win64_独立.pubxml b/NekoSheet.Console/Properties/PublishProfiles/win64_独立.pubxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>bin\Release\netcoreapp3.1\publish_win_64_single</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <SelfContained>true</SelfContained>
+    <PublishSingleFile>True</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>True</PublishTrimmed>
+  </PropertyGroup>
+</Project>
diff --git a/NekoSheet.Console/Properties/PublishProfiles/win64_独立.pubxml.user b/NekoSheet.Console/Properties/PublishProfiles/win64_独立.pubxml.user
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/NekoSheet.Console/Properties/launchSettings.json b/NekoSheet.Console/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "NekoSheet.Console": {
+      "commandName": "Project",
+      "commandLineArgs": "--path C:\\Users\\yomun\\Desktop\\NekoSheet_Tpl.xlsx"
+    }
+  }
+}