Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into MR-975_Replace_TreeView_with_TreeListview

Browse Source
This commit is contained in:
David Sparer
2016-10-03 10:46:49 -06:00
parent d6bd7e0886 707e3bc08f
commit 85b6e09ea6
3 changed files with 51 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
mRemoteV1/App/Update/AppUpdater.cs
View File

@@ -22,31 +22,13 @@ namespace mRemoteNG.App.Update
private Thread _getAnnouncementInfoThread;
#region Public Properties
public UpdateInfo CurrentUpdateInfo
{
get
{
return _currentUpdateInfo;
}
}
public string ChangeLog
{
get
{
return _changeLog;
}
}
public AnnouncementInfo CurrentAnnouncementInfo
{
get
{
return _currentAnnouncementInfo;
}
}
public bool IsGetUpdateInfoRunning
public UpdateInfo CurrentUpdateInfo => _currentUpdateInfo;
public string ChangeLog => _changeLog;
public AnnouncementInfo CurrentAnnouncementInfo => _currentAnnouncementInfo;
public bool IsGetUpdateInfoRunning
{
get
{
@@ -91,22 +73,17 @@ namespace mRemoteNG.App.Update
}
}
public bool IsDownloadUpdateRunning
{
get
{
return (_downloadUpdateWebClient != null);
}
}
#endregion
public bool IsDownloadUpdateRunning => (_downloadUpdateWebClient != null);
#endregion
#region Public Methods
public AppUpdater()
{
SetProxySettings();
}
public void SetProxySettings()
private void SetProxySettings()
{
var shouldWeUseProxy = Settings.Default.UpdateUseProxy;
var proxyAddress = Settings.Default.UpdateProxyAddress;
@@ -123,23 +100,9 @@ namespace mRemoteNG.App.Update
{
if (useProxy && !string.IsNullOrEmpty(address))
{
if (!(port == 0))
{
_webProxy = new WebProxy(address, port);
}
else
{
_webProxy = new WebProxy(address);
}
if (useAuthentication)
{
_webProxy.Credentials = new NetworkCredential(username, password);
}
else
{
_webProxy.Credentials = null;
}
_webProxy = port != 0 ? new WebProxy(address, port) : new WebProxy(address);
_webProxy.Credentials = useAuthentication ? new NetworkCredential(username, password) : null;
}
else
{
@@ -174,7 +137,7 @@ namespace mRemoteNG.App.Update
_getUpdateInfoThread.Abort();
}
_getUpdateInfoThread = new Thread(new ThreadStart(GetUpdateInfo));
_getUpdateInfoThread = new Thread(GetUpdateInfo);
_getUpdateInfoThread.SetApartmentState(ApartmentState.STA);
_getUpdateInfoThread.IsBackground = true;
_getUpdateInfoThread.Start();
@@ -192,7 +155,7 @@ namespace mRemoteNG.App.Update
_getChangeLogThread.Abort();
}
_getChangeLogThread = new Thread(new ThreadStart(GetChangeLog));
_getChangeLogThread = new Thread(GetChangeLog);
_getChangeLogThread.SetApartmentState(ApartmentState.STA);
_getChangeLogThread.IsBackground = true;
_getChangeLogThread.Start();
@@ -205,7 +168,7 @@ namespace mRemoteNG.App.Update
_getAnnouncementInfoThread.Abort();
}
_getAnnouncementInfoThread = new Thread(new ThreadStart(GetAnnouncementInfo));
_getAnnouncementInfoThread = new Thread(GetAnnouncementInfo);
_getAnnouncementInfoThread.SetApartmentState(ApartmentState.STA);
_getAnnouncementInfoThread.IsBackground = true;
_getAnnouncementInfoThread.Start();
@@ -262,9 +225,9 @@ namespace mRemoteNG.App.Update
{
Type type = typeof(DownloadStringCompletedEventArgs);
const BindingFlags bindingFlags = BindingFlags.NonPublic | BindingFlags.Instance;
Type[] argumentTypes = new Type[] {typeof(string), typeof(Exception), typeof(bool), typeof(object)};
Type[] argumentTypes = {typeof(string), typeof(Exception), typeof(bool), typeof(object)};
ConstructorInfo constructor = type.GetConstructor(bindingFlags, null, argumentTypes, null);
object[] arguments = new object[] {result, exception, cancelled, userToken};
object[] arguments = {result, exception, cancelled, userToken};
return (DownloadStringCompletedEventArgs)constructor.Invoke(arguments);
}
@@ -307,10 +270,9 @@ namespace mRemoteNG.App.Update
Settings.Default.UpdatePending = IsUpdateAvailable();
}
}
if (GetUpdateInfoCompletedEventEvent != null)
GetUpdateInfoCompletedEventEvent(this, e);
}
GetUpdateInfoCompletedEventEvent?.Invoke(this, e);
}
private void GetChangeLog()
{
@@ -320,10 +282,9 @@ namespace mRemoteNG.App.Update
{
_changeLog = e.Result;
}
if (GetChangeLogCompletedEventEvent != null)
GetChangeLogCompletedEventEvent(this, e);
}
GetChangeLogCompletedEventEvent?.Invoke(this, e);
}
private void GetAnnouncementInfo()
{
@@ -339,16 +300,14 @@ namespace mRemoteNG.App.Update
Settings.Default.LastAnnouncement = _currentAnnouncementInfo.Name;
}
}
if (GetAnnouncementInfoCompletedEventEvent != null)
GetAnnouncementInfoCompletedEventEvent(this, e);
}
GetAnnouncementInfoCompletedEventEvent?.Invoke(this, e);
}
private void DownloadUpdateProgressChanged(object sender, DownloadProgressChangedEventArgs e)
{
if (DownloadUpdateProgressChangedEventEvent != null)
DownloadUpdateProgressChangedEventEvent(sender, e);
}
DownloadUpdateProgressChangedEventEvent?.Invoke(sender, e);
}
private void DownloadUpdateCompleted(object sender, AsyncCompletedEventArgs e)
{
@@ -384,11 +343,10 @@ namespace mRemoteNG.App.Update
{
File.Delete(_currentUpdateInfo.UpdateFilePath);
}
if (DownloadUpdateCompletedEventEvent != null)
DownloadUpdateCompletedEventEvent(this, raiseEventArgs);
_downloadUpdateWebClient.Dispose();
DownloadUpdateCompletedEventEvent?.Invoke(this, raiseEventArgs);
_downloadUpdateWebClient.Dispose();
_downloadUpdateWebClient = null;
}
#endregion

44
mRemoteV1/App/Update/UpdateFile.cs
View File

@@ -8,14 +8,9 @@ namespace mRemoteNG.App.Update
#region Public Properties
private Dictionary<string, string> _items = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase);
// ReSharper disable MemberCanBePrivate.Local
public Dictionary<string, string> Items
{
// ReSharper restore MemberCanBePrivate.Local
get
{
return _items;
}
}
// ReSharper disable once MemberCanBePrivate.Global
public Dictionary<string, string> Items => _items;
#endregion
#region Public Methods
@@ -25,6 +20,7 @@ namespace mRemoteNG.App.Update
}
// ReSharper disable MemberCanBePrivate.Local
// ReSharper disable once MemberCanBePrivate.Global
public void FromString(string content)
{
// ReSharper restore MemberCanBePrivate.Local
@@ -33,9 +29,9 @@ namespace mRemoteNG.App.Update
}
else
{
char[] lineSeparators = new char[] { '\n', '\r' };
char[] keyValueSeparators = new char[] { ':', '=' };
char[] commentCharacters = new char[] { '#', ';', '\'' };
char[] lineSeparators = { '\n', '\r' };
char[] keyValueSeparators = { ':', '=' };
char[] commentCharacters = { '#', ';', '\'' };
string[] lines = content.Split(lineSeparators.ToString().ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
foreach (string line in lines)
@@ -45,13 +41,13 @@ namespace mRemoteNG.App.Update
{
continue;
}
if (!(trimmedLine.Substring(0, 1).IndexOfAny(commentCharacters.ToString().ToCharArray()) == -1))
if (trimmedLine.Substring(0, 1).IndexOfAny(commentCharacters.ToString().ToCharArray()) != -1)
{
continue;
}
string[] parts = trimmedLine.Split(keyValueSeparators.ToString().ToCharArray(), 2);
if (!(parts.Length == 2))
if (parts.Length != 2)
{
continue;
}
@@ -67,31 +63,19 @@ namespace mRemoteNG.App.Update
public string GetString(string key)
{
// ReSharper restore MemberCanBePrivate.Local
if (!Items.ContainsKey(key))
{
return string.Empty;
}
return this._items[key];
return !Items.ContainsKey(key) ? string.Empty : this._items[key];
}
public Version GetVersion(string key)
{
string value = GetString(key);
if (string.IsNullOrEmpty(value))
{
return null;
}
return new Version(value);
var value = GetString(key);
return string.IsNullOrEmpty(value) ? null : new Version(value);
}
public Uri GetUri(string key)
{
string value = GetString(key);
if (string.IsNullOrEmpty(value))
{
return null;
}
return new Uri(value);
var value = GetString(key);
return string.IsNullOrEmpty(value) ? null : new Uri(value);
}
public string GetThumbprint(string key)

3
mRemoteV1/mRemoteV1.csproj
View File

@@ -1204,7 +1204,7 @@
<Reference Include="mscorlib" />
</ItemGroup>
<PropertyGroup>
<PostBuildEvent>powershell sleep 2
<PostBuildEvent>powershell -noprofile -command "sleep 2"
call "$(DevEnvDir)..\tools\vsvars32.bat"
set /p buildenv=&lt;buildenv.tmp
@@ -1213,6 +1213,7 @@ copy /Y "$(SolutionDir)mRemoteV1\Resources\PuTTYNG.exe" .\
REM Move Help files to correct directory
move /Y Resources\Help .\
powershell -noprofile -command "sleep 2"
rmdir /s /q Resources
REM Set LargeAddressAware on binary