优化缓存

u2sb · Mar 19, 2020 · c0a0fe2 · c0a0fe2
1 parent 20f62a7
commit c0a0fe2
Show file tree

Hide file tree

Showing 21 changed files with 185 additions and 321 deletions.
diff --git a/CommandLine/Danmu.CommandLine.csproj b/CommandLine/Danmu.CommandLine.csproj
@@ -8,45 +8,21 @@
     <Version>1.0.0</Version>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Menu\**" />
-    <EmbeddedResource Remove="Menu\**" />
-    <None Remove="Menu\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\MainMenu.txt" />
-    <None Remove="Utils\MainMenu.txt" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\MainMenu.txt">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.7.82" />
-    <PackageReference Include="Shell.NET" Version="0.2.2" />
+    <PackageReference Include="MedallionShell" Version="1.6.1" />
+    <PackageReference Include="Octokit" Version="0.45.0" />
+    <PackageReference Include="ShellProgressBar" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <TrimmerRootDescriptor Include="TrimmerRoots.xml" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+    <None Update="Scripts\**">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/CommandLine/Program.cs b/CommandLine/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading.Tasks;
 using CommandLine;
 using Danmu.CommandLine.Utils;
 
@@ -10,6 +11,9 @@ internal class Program
     {
         private static void Main(string[] args)
         {
+            //系统信息查询
+            Start.StartCommandLine();
+
             Parser.Default.ParseArguments<Options>(args)
                   .WithParsed(RunOptions)
                   .WithNotParsed(HandleParseError);
@@ -22,7 +26,7 @@ private static void RunOptions(Options opts)
                                  .GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion);
             if (opts.Menu)
             {
-                Menu.MainMenu();
+                _ = Menu.MainMenu().Result;
             }
         }
 

diff --git a/CommandLine/Properties/Resources.Designer.cs b/CommandLine/Properties/Resources.Designer.cs
diff --git a/CommandLine/Properties/Resources.resx b/CommandLine/Properties/Resources.resx
diff --git a/CommandLine/Resources/MainMenu.txt b/CommandLine/Resources/MainMenu.txt
diff --git a/CommandLine/Scripts/Menu/MainMenu.txt b/CommandLine/Scripts/Menu/MainMenu.txt
@@ -0,0 +1,9 @@
+============================ Danmu.Server ============================
+
+A 查看最新版本                             B
+
+
+
+X 退出
+
+======================================================================
diff --git a/CommandLine/TrimmerRoots.xml b/CommandLine/TrimmerRoots.xml
@@ -1,3 +1,5 @@
-<linker>
-  <assembly fullname="CommandLine" preserve="all"/>
+<linker>
+  <assembly fullname="CommandLine" preserve="all"/>
+  <assembly fullname="MedallionShell" preserve="all"/>
+  <assembly fullname="ShellProgressBar" preserve="all"/>
 </linker>
diff --git a/CommandLine/Utils/GlobalConstant.cs b/CommandLine/Utils/GlobalConstant.cs
@@ -0,0 +1,11 @@
+namespace Danmu.CommandLine.Utils
+{
+    public static class GlobalConstant
+    {
+        public const string GithubUserName = "MonoLogueChi";
+        public const string GithubRepoName = "Danmu.Server";
+
+        public const string ReleasesLatestUrl =
+            "https://api.github.com/repos/" + GithubUserName + "/" + GithubRepoName + "/releases/latest";
+    }
+}