Implement logic for TigerVNC

BornToBeRoot · BornToBeRoot · commit a3a69562eec2 · 2022-02-20T20:41:08.000+01:00
diff --git a/Source/NETworkManager.Profiles/Application/PowerShell.cs b/Source/NETworkManager.Profiles/Application/PowerShell.cs
@@ -10,16 +10,14 @@ public static PowerShellSessionInfo CreateSessionInfo(ProfileInfo profile)
             // Get group info
             GroupInfo group = ProfileManager.GetGroup(profile.Group);
 
-            var info = new PowerShellSessionInfo
+            return new PowerShellSessionInfo
             {                
                 EnableRemoteConsole = profile.PowerShell_EnableRemoteConsole,
                 Host = profile.Host,
                 
                 AdditionalCommandLine = profile.PowerShell_OverrideAdditionalCommandLine ? profile.PowerShell_AdditionalCommandLine : (group.PowerShell_OverrideAdditionalCommandLine ? group.PowerShell_AdditionalCommandLine : SettingsManager.Current.PowerShell_AdditionalCommandLine),
                 ExecutionPolicy = profile.PowerShell_OverrideExecutionPolicy ? profile.PowerShell_ExecutionPolicy : (group.PowerShell_OverrideExecutionPolicy ? group.PowerShell_ExecutionPolicy : SettingsManager.Current.PowerShell_ExecutionPolicy)
             };
-
-            return info;
         }
     }
 }
diff --git a/Source/NETworkManager.Profiles/Application/TigerVNC.cs b/Source/NETworkManager.Profiles/Application/TigerVNC.cs
@@ -6,15 +6,17 @@ namespace NETworkManager.Profiles.Application
 {
     public static class TigerVNC
     {
-        public static TigerVNCSessionInfo CreateSessionInfo(ProfileInfo profileInfo)
+        public static TigerVNCSessionInfo CreateSessionInfo(ProfileInfo profile)
         {
-            var info = new TigerVNCSessionInfo
+            // Get group info
+            GroupInfo group = ProfileManager.GetGroup(profile.Group);
+
+            return new TigerVNCSessionInfo
             {
-                Host = profileInfo.TigerVNC_Host,
-                Port = profileInfo.TigerVNC_OverridePort ? profileInfo.TigerVNC_Port : SettingsManager.Current.TigerVNC_Port
-            };
+                Host = profile.TigerVNC_Host,
 
-            return info;
+                Port = profile.TigerVNC_OverridePort ? profile.TigerVNC_Port : (group.TigerVNC_OverridePort ? group.TigerVNC_Port : SettingsManager.Current.TigerVNC_Port)
+            };
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,16 +10,14 @@ public static PowerShellSessionInfo CreateSessionInfo(ProfileInfo profile)`
`10`	`10`	`// Get group info`
`11`	`11`	`GroupInfo group = ProfileManager.GetGroup(profile.Group);`
`12`	`12`
`13`		`- var info = new PowerShellSessionInfo`
	`13`	`+ return new PowerShellSessionInfo`
`14`	`14`	`{`
`15`	`15`	`EnableRemoteConsole = profile.PowerShell_EnableRemoteConsole,`
`16`	`16`	`Host = profile.Host,`
`17`	`17`
`18`	`18`	`AdditionalCommandLine = profile.PowerShell_OverrideAdditionalCommandLine ? profile.PowerShell_AdditionalCommandLine : (group.PowerShell_OverrideAdditionalCommandLine ? group.PowerShell_AdditionalCommandLine : SettingsManager.Current.PowerShell_AdditionalCommandLine),`
`19`	`19`	`ExecutionPolicy = profile.PowerShell_OverrideExecutionPolicy ? profile.PowerShell_ExecutionPolicy : (group.PowerShell_OverrideExecutionPolicy ? group.PowerShell_ExecutionPolicy : SettingsManager.Current.PowerShell_ExecutionPolicy)`
`20`	`20`	`};`
`21`		`-`
`22`		`- return info;`
`23`	`21`	`}`
`24`	`22`	`}`
`25`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,17 @@ namespace NETworkManager.Profiles.Application`
`6`	`6`	`{`
`7`	`7`	`public static class TigerVNC`
`8`	`8`	`{`
`9`		`- public static TigerVNCSessionInfo CreateSessionInfo(ProfileInfo profileInfo)`
	`9`	`+ public static TigerVNCSessionInfo CreateSessionInfo(ProfileInfo profile)`
`10`	`10`	`{`
`11`		`- var info = new TigerVNCSessionInfo`
	`11`	`+ // Get group info`
	`12`	`+ GroupInfo group = ProfileManager.GetGroup(profile.Group);`
	`13`	`+`
	`14`	`+ return new TigerVNCSessionInfo`
`12`	`15`	`{`
`13`		`- Host = profileInfo.TigerVNC_Host,`
`14`		`- Port = profileInfo.TigerVNC_OverridePort ? profileInfo.TigerVNC_Port : SettingsManager.Current.TigerVNC_Port`
`15`		`- };`
	`16`	`+ Host = profile.TigerVNC_Host,`
`16`	`17`
`17`		`- return info;`
	`18`	`+ Port = profile.TigerVNC_OverridePort ? profile.TigerVNC_Port : (group.TigerVNC_OverridePort ? group.TigerVNC_Port : SettingsManager.Current.TigerVNC_Port)`
	`19`	`+ };`
`18`	`20`	`}`
`19`	`21`	`}`
`20`	`22`	`}`