From bedf8cc93ee9f9b77edf193c4e0256cea0a7c4d9 Mon Sep 17 00:00:00 2001 From: DrHacknik Date: Thu, 23 Jan 2020 14:00:43 -0500 Subject: [PATCH] Cleaned the code - Cleaned up the private and public fields --- Ryujinx/Ui/GtkDialog.cs | 4 +- Ryujinx/Updater/Parser/UpdateParser.cs | 81 +++++++++++++------------- Ryujinx/Updater/Update.cs | 12 ++-- 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/Ryujinx/Ui/GtkDialog.cs b/Ryujinx/Ui/GtkDialog.cs index 0a98a92d1f..9eba88cfe6 100644 --- a/Ryujinx/Ui/GtkDialog.cs +++ b/Ryujinx/Ui/GtkDialog.cs @@ -71,8 +71,8 @@ namespace Ryujinx.Ui SecondaryText = secText, WindowPosition = WindowPosition.Center }; - Uri URL = new Uri(UpdateParser._BuildArt); - UpdateParser._Package.DownloadFileAsync(URL, Path.Combine(UpdateParser._RyuDir, "Data", "Update", "RyujinxPackage.zip")); + Uri URL = new Uri(UpdateParser.BuildArt); + UpdateParser.Package.DownloadFileAsync(URL, Path.Combine(UpdateParser.RyuDir, "Data", "Update", "RyujinxPackage.zip")); messageDialog.SetSizeRequest(100, 20); return messageDialog; } diff --git a/Ryujinx/Updater/Parser/UpdateParser.cs b/Ryujinx/Updater/Parser/UpdateParser.cs index 1181e977da..cd265d5a58 100644 --- a/Ryujinx/Updater/Parser/UpdateParser.cs +++ b/Ryujinx/Updater/Parser/UpdateParser.cs @@ -19,47 +19,48 @@ namespace Ryujinx.Updater.Parser { public class UpdateParser { - private static string _JobID; - private static string _BuildVer; - private static string _BuildURL = "https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master"; - public static string _BuildArt; - private static string _BuildCommit; - private static string _Branch; - private static string _PlatformExt; - public static string _RyuDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"); - public static WebClient _Package = new WebClient(); - public static int _PackageProgress; - public static double _Percentage; + private static string _jobid; + private static string _buildver; + private static string _buildurl = "https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master"; + private static string _buildcommit; + private static string _branch; + private static string _platformext; + + public static string BuildArt; + public static string RyuDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx"); + public static WebClient Package = new WebClient(); + public static int PackageProgress; + public static double Percentage; public static void BeginParse() { try { //Detect current platform if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - _PlatformExt = "osx_x64.zip"; + _platformext = "osx_x64.zip"; else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - _PlatformExt = "win_x64.zip"; + _platformext = "win_x64.zip"; else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) - _PlatformExt = "linux_x64.tar.gz"; + _platformext = "linux_x64.tar.gz"; //Begin the Appveyor parsing WebClient JSONClient = new WebClient(); - string FetchedJSON = JSONClient.DownloadString(_BuildURL); + string FetchedJSON = JSONClient.DownloadString(_buildurl); var __JSONRoot = JObject.Parse(FetchedJSON); var __Build = __JSONRoot["build"]; string __Version = (string)__Build["version"]; string __JobsID = (string)__Build["jobs"][0]["jobId"]; - string __Branch = (string)__Build["branch"]; - string __BuildCommit = (string)__Build["commitId"]; - _JobID = __JobsID; - _BuildVer = __Version; - _BuildArt = "https://ci.appveyor.com/api/buildjobs/" + _JobID + "/artifacts/ryujinx-" + _BuildVer + "-" + _PlatformExt; - _BuildCommit = __BuildCommit.Substring(0, 7); - _Branch = __Branch; - Logger.PrintInfo(LogClass.Application, "Fetched JSON and Parsed:" + Environment.NewLine + "MetaData: JobID(" + __JobsID + ") BuildVer(" + __Version + ")" + Environment.NewLine + "BuildURL(" + _BuildArt + ")"); - Logger.PrintInfo(LogClass.Application, "Commit-id: (" + _BuildCommit + ")" + " Branch: (" + _Branch + ")"); + string __branch = (string)__Build["branch"]; + string __buildcommit = (string)__Build["commitId"]; + _jobid = __JobsID; + _buildver = __Version; + BuildArt = "https://ci.appveyor.com/api/buildjobs/" + _jobid + "/artifacts/ryujinx-" + _buildver + "-" + _platformext; + _buildcommit = __buildcommit.Substring(0, 7); + _branch = __branch; + Logger.PrintInfo(LogClass.Application, "Fetched JSON and Parsed:" + Environment.NewLine + "MetaData: JobID(" + __JobsID + ") BuildVer(" + __Version + ")" + Environment.NewLine + "BuildURL(" + BuildArt + ")"); + Logger.PrintInfo(LogClass.Application, "Commit-id: (" + _buildcommit + ")" + " Branch: (" + _branch + ")"); - using (MessageDialog dialog = GtkDialog.CreateAcceptDialog("Update", _BuildVer)) + using (MessageDialog dialog = GtkDialog.CreateAcceptDialog("Update", _buildver)) { if (dialog.Run() == (int)ResponseType.Yes) { @@ -77,31 +78,31 @@ namespace Ryujinx.Updater.Parser } //UpdateData data = new UpdateData() //{ - // JobID = _JobID, - // BuildVer = _BuildVer, - // BuildURL = _BuildURL, - // BuildArt = _BuildArt, - // BuildCommit = _BuildCommit, - // Branch = _Branch + // JobID = _jobid, + // BuildVer = _buildver, + // BuildURL = _buildurl, + // BuildArt = BuildArt, + // BuildCommit = _buildcommit, + // Branch = _branch //}; } private static async void GrabPackage() { //Check if paths exist - if (!Directory.Exists(Path.Combine(_RyuDir, "Data", "Update")) || !Directory.Exists(Path.Combine(_RyuDir, "Data")) || !Directory.Exists(Path.Combine(Environment.CurrentDirectory, "temp"))) + if (!Directory.Exists(Path.Combine(RyuDir, "Data", "Update")) || !Directory.Exists(Path.Combine(RyuDir, "Data")) || !Directory.Exists(Path.Combine(Environment.CurrentDirectory, "temp"))) { - Directory.CreateDirectory(Path.Combine(_RyuDir, "Data", "Update")); - Directory.CreateDirectory(Path.Combine(_RyuDir, "Data")); + Directory.CreateDirectory(Path.Combine(RyuDir, "Data", "Update")); + Directory.CreateDirectory(Path.Combine(RyuDir, "Data")); Directory.CreateDirectory(Path.Combine(Environment.CurrentDirectory, "temp")); } try { //Attempt to grab the latest package - _Package.DownloadProgressChanged += new DownloadProgressChangedEventHandler(PackageDownloadProgress); - _Package.DownloadFileCompleted += new AsyncCompletedEventHandler(PackageDownloadedAsync); - using (MessageDialog dialog = GtkDialog.CreateProgressDialog("Update", "Ryujinx - Update", "Downloading update " + _BuildVer, "Please wait while we download the latest package and extract it.")) + Package.DownloadProgressChanged += new DownloadProgressChangedEventHandler(PackageDownloadProgress); + Package.DownloadFileCompleted += new AsyncCompletedEventHandler(PackageDownloadedAsync); + using (MessageDialog dialog = GtkDialog.CreateProgressDialog("Update", "Ryujinx - Update", "Downloading update " + _buildver, "Please wait while we download the latest package and extract it.")) { dialog.Run(); } @@ -130,15 +131,15 @@ namespace Ryujinx.Updater.Parser private static void PackageDownloadProgress(object sender, DownloadProgressChangedEventArgs e) { - _Percentage = e.ProgressPercentage; - _PackageProgress = e.ProgressPercentage; + Percentage = e.ProgressPercentage; + PackageProgress = e.ProgressPercentage; } public static async Task ExtractPackageAsync() { try { //Begin the extaction process - using (Ionic.Zip.ZipFile Package = Ionic.Zip.ZipFile.Read(Path.Combine(_RyuDir, "Data", "Update", "RyujinxPackage.zip"))) + using (Ionic.Zip.ZipFile Package = Ionic.Zip.ZipFile.Read(Path.Combine(RyuDir, "Data", "Update", "RyujinxPackage.zip"))) { await Task.Run(() => Package.ExtractAll(Path.Combine(Environment.CurrentDirectory,"temp"), ExtractExistingFileAction.OverwriteSilently)); } diff --git a/Ryujinx/Updater/Update.cs b/Ryujinx/Updater/Update.cs index ed067f15b9..ab60af4363 100644 --- a/Ryujinx/Updater/Update.cs +++ b/Ryujinx/Updater/Update.cs @@ -11,9 +11,9 @@ namespace Ryujinx.Updater { public class Update { - public static string RyuDir = Environment.CurrentDirectory; - private static string[] UpdateFiles = Directory.GetFiles(Path.Combine(Environment.CurrentDirectory),"*", SearchOption.AllDirectories); - private static string ParentDir = Path.Combine(@"..\.."); + private static string[] _updatefiles = Directory.GetFiles(Path.Combine(Environment.CurrentDirectory),"*", SearchOption.AllDirectories); + private static string _parentdir = Path.Combine(@"..\.."); + public static string RyuDir = Environment.CurrentDirectory; public static void PerformUpdate() { try @@ -21,15 +21,15 @@ namespace Ryujinx.Updater //Get list of files from the current directory, and copy them to the parent directory. foreach (string _PathDir in Directory.GetDirectories(RyuDir, "*", SearchOption.AllDirectories)) - Directory.CreateDirectory(_PathDir.Replace(RyuDir, ParentDir)); + Directory.CreateDirectory(_PathDir.Replace(RyuDir, _parentdir)); foreach (string _PathNew in Directory.GetFiles(RyuDir, "*.*", SearchOption.AllDirectories)) - File.Copy(_PathNew, _PathNew.Replace(RyuDir, ParentDir), true); + File.Copy(_PathNew, _PathNew.Replace(RyuDir, _parentdir), true); Logger.PrintInfo(LogClass.Application, "Package installation was completed.\n"); GtkDialog.CreateInfoDialog("Update", "Ryujinx - Update", "Almost finished","The package was installed.\nPlease click ok, and the update will complete."); try { - Process.Start(new ProcessStartInfo(Path.Combine(ParentDir, "Ryujinx.exe"), "/C") { UseShellExecute = true }); + Process.Start(new ProcessStartInfo(Path.Combine(_parentdir, "Ryujinx.exe"), "/C") { UseShellExecute = true }); } catch (System.ComponentModel.Win32Exception) {