Release 1.3.3

Changes.md

@@ -1,4 +1,4 @@
-v1.3.3(working)
+v1.3.3
 - Add cookie support.
 - Add CommandService.
 - Optimize Log system.

SyncClipboard/Control/MainController.cs

@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using Microsoft.Win32;
 using SyncClipboard.Utility;
+using SyncClipboard.Module;
 
 namespace SyncClipboard.Control
 {

SyncClipboard/Control/SettingsForm.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using SyncClipboard.Control;
+using SyncClipboard.Module;
 
 namespace SyncClipboard
 {

SyncClipboard/UpdateChecker.cs → SyncClipboard/Module/UpdateChecker.cs

@@ -7,7 +7,7 @@ namespace SyncClipboard
 {
     internal class UpdateChecker
     {
-        public const string Version = "1.3.2";
+        public const string Version = "1.3.3";
         public const int VersionPartNumber = 3;
         public const string UpdateUrl = "https://api.github.com/repos/Jeric-X/SyncClipboard/releases/latest";
         public const string ReleaseUrl = "https://github.com/Jeric-X/SyncClipboard/releases/latest";

SyncClipboard/UserConfig.cs → SyncClipboard/Module/UserConfig.cs

@@ -4,7 +4,7 @@
 using System.Windows.Forms;
 using System;
 
-namespace SyncClipboard
+namespace SyncClipboard.Module
 {
     internal static class UserConfig
     {
@@ -29,7 +29,13 @@ public class CSyncService
                 public bool IsNextcloud = false;
             }
 
+            public class CCommandService
+            {
+                public int Shutdowntime = 30;
+            }
+
             public CSyncService SyncService = new CSyncService();
+            public CCommandService CommandService = new CCommandService();
             public CProgram Program = new CProgram();
         }
 
@@ -41,7 +47,7 @@ internal static void Save()
             var configStr = serializer.Serialize(Config);
             try
             {
-                System.IO.File.WriteAllText(Env.FullPath(CONFIG_FILE), configStr);
+                File.WriteAllText(Env.FullPath(CONFIG_FILE), configStr);
             }
             catch
             {
@@ -56,7 +62,7 @@ internal static void Load()
             string text;
             try
             {
-                text = System.IO.File.ReadAllText(Env.FullPath(CONFIG_FILE));
+                text = File.ReadAllText(Env.FullPath(CONFIG_FILE));
             }
             catch (FileNotFoundException)
             {
@@ -78,7 +84,7 @@ internal static void Load()
                 WriteDefaultConfigFile();
             }
 
-            Auth = FormatHttpAuthHeader(UserConfig.Config.SyncService.UserName, UserConfig.Config.SyncService.Password);
+            Auth = FormatHttpAuthHeader(Config.SyncService.UserName, Config.SyncService.Password);
         }
 
         private static void WriteDefaultConfigFile()

SyncClipboard/Program.cs

@@ -4,6 +4,7 @@
 using SyncClipboard.Control;
 using SyncClipboard.Utility;
 using SyncClipboard.Service;
+using SyncClipboard.Module;
 namespace SyncClipboard
 {
     static class Program

SyncClipboard/Service/CommandService/CommandService.cs

@@ -1,6 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using SyncClipboard.Utility;
+using SyncClipboard.Module;
 
 namespace SyncClipboard.Service
 {
@@ -15,6 +16,7 @@ public class Command
 
         private CancellationTokenSource _cancelSource;
         private CancellationToken _cancelToken;
+        private bool _isError = false;
 
         protected override void StartService()
         {
@@ -42,10 +44,16 @@ private async void StartServiceAsync(CancellationToken cancelToken)
                     Command command = await GetRemoteCommand().ConfigureAwait(false);
                     await ResetRemoteCommand(new Command()).ConfigureAwait(false);
                     ExecuteCommand(command);
+
+                    _isError = false;
                 }
                 catch (System.Exception ex)
                 {
-                    Program.notifyer.ToastNotify("CommandService failed", ex.ToString());
+                    if (!_isError)
+                    {
+                        Program.notifyer.ToastNotify("CommandService failed", ex.ToString());
+                        _isError = true;
+                    }
                 }
 
                 await Task.Delay(UserConfig.Config.Program.IntervalTime).ConfigureAwait(false);
@@ -74,10 +82,12 @@ private void ExecuteCommand(Command command)
         {
             if (command.CommandStr == "shutdown")
             {
-                System.Diagnostics.Process open = new System.Diagnostics.Process();
-                open.StartInfo.FileName = "cmd";
-                open.StartInfo.Arguments = @"/k shutdown.exe /s /t 60 /c ""use [ shutdown /a ] in 60s to undo shutdown.""";
-                open.Start();
+                var shutdownTime = UserConfig.Config.CommandService.Shutdowntime;
+
+                var process = new System.Diagnostics.Process();
+                process.StartInfo.FileName = "cmd";
+                process.StartInfo.Arguments = $@"/k shutdown.exe /s /t {shutdownTime} /c ""use [ shutdown /a ] in {shutdownTime}s to undo shutdown.""";
+                process.Start();
             }
         }
 

SyncClipboard/Service/SyncService/Profile/ProfileFactory.cs

@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Web.Script.Serialization;
 using System.Windows.Forms;
+using SyncClipboard.Module;
 using static SyncClipboard.Service.ProfileType;
 
 namespace SyncClipboard.Service

SyncClipboard/Service/SyncService/PullService.cs

@@ -3,6 +3,7 @@
 using SyncClipboard.Control;
 using SyncClipboard.Service;
 using SyncClipboard.Utility;
+using SyncClipboard.Module;
 
 namespace SyncClipboard
 {

SyncClipboard/Service/SyncService/PushService.cs

@@ -1,6 +1,7 @@
 using SyncClipboard.Control;
 using SyncClipboard.Service;
 using SyncClipboard.Utility;
+using SyncClipboard.Module;
 using System;
 using System.Threading;
 using System.Threading.Tasks;

SyncClipboard/SyncClipboard.csproj

@@ -116,15 +116,15 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Service\SyncService\PushService.cs" />
     <Compile Include="Env.cs" />
-    <Compile Include="UserConfig.cs" />
+    <Compile Include="Module\UserConfig.cs" />
     <Compile Include="Control\SettingsForm.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Control\SettingsForm.Designer.cs">
       <DependentUpon>SettingsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Service\SyncService\PullService.cs" />
-    <Compile Include="UpdateChecker.cs" />
+    <Compile Include="Module\UpdateChecker.cs" />
     <Compile Include="Utility\Log.cs" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

SyncClipboard/Utility/HttpWebUtility.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Net;
 using System.Text;
+using SyncClipboard.Module;
 
 namespace SyncClipboard.Utility
 {

SyncClipboard/Utility/Nextcloud.cs

@@ -4,6 +4,7 @@
 using System.Web.Script.Serialization;
 using System.Windows.Forms;
 using SyncClipboard.Control;
+using SyncClipboard.Module;
 
 namespace SyncClipboard.Utility
 {

SyncClipboard/Utility/WebDav.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
+using SyncClipboard.Module;
 
 namespace SyncClipboard.Utility
 {