From 060c8ccc4ec8b675e9154c0adc422b9916e14531 Mon Sep 17 00:00:00 2001 From: 1kamma Date: Sat, 9 Oct 2021 12:55:15 +0300 Subject: [PATCH] new regions and starting to split to functions --- Installizer/Registrazier.cs | 68 ++++++++++++------------------------- Installizer/Tasker.cs | 9 +++++ 2 files changed, 30 insertions(+), 47 deletions(-) diff --git a/Installizer/Registrazier.cs b/Installizer/Registrazier.cs index 39d2df7..8630f84 100644 --- a/Installizer/Registrazier.cs +++ b/Installizer/Registrazier.cs @@ -1,88 +1,62 @@ -namespace Installizer -{ - class Registrayzier - { +namespace Installizer { + class Registrayzier { private string regJson; private string[] regFiles; private System.Collections.Generic.List> listOfRegistries = new(); - public Registrayzier(string Folder) - { + public Registrayzier(string Folder) { this.regFiles = System.IO.Directory.GetFiles(Folder, "*.reg", System.IO.SearchOption.AllDirectories); } - private string[] CropLocations(string regFileText) - { + private string[] CropLocations(string regFileText) { return regFileText.Split("[")[1..^0]; } - private string GetKey(string regFileText) - { + private string GetKey(string regFileText) { regFileText = regFileText.Replace(@"\", @"\\"); - if (regFileText.StartsWith("hk")) - { + if (regFileText.StartsWith("hk")) { regFileText = regFileText.Replace("hklm", "HKEY_LOCAL_MACHINE").Replace("hkcu", "HKEY_CURRENT_USER").Replace("hkcr", @"HKEY_LOCAL_MACHINE\SOFTWARE\Classes"); } - if (regFileText.Contains(']')) - { + if (regFileText.Contains(']')) { return regFileText.Split("]")[0]; - } - else if (regFileText.Contains("\r\n")) - { + } else if (regFileText.Contains("\r\n")) { return regFileText.Split("\r\n")[0]; - } - else if (regFileText.Contains("\n")) - { + } else if (regFileText.Contains("\n")) { return regFileText.Split("\n")[0]; } return regFileText; } - private string[]? SplitReg(string regFileText) - { - if (regFileText.Contains("=")) - { + private string[]? SplitReg(string regFileText) { + if (regFileText.Contains("=")) { return regFileText.Split("="); } return null; } - private string GetName(string regFileText) - { + private string GetName(string regFileText) { string name = SplitReg(regFileText)[0] ?? ""; return name; } - private string GetType(string regFileText) - { + private string GetType(string regFileText) { string type = SplitReg(regFileText)[1] ?? ""; - if (type.Length == 0) - { + if (type.Length == 0) { return "None"; - } - else if (type.StartsWith("\"")) - { + } else if (type.StartsWith("\"")) { return "string"; - } - else if (type.StartsWith("hex")) - { + } else if (type.StartsWith("hex")) { return "hex"; } return "dword"; } - private string GetValue(string regFileText) - { + private string GetValue(string regFileText) { string value; string tempValue = SplitReg(regFileText)[1]; string type = GetType(regFileText); - if(type == "string") - { + if (type == "string") { value = tempValue; - } - else if(type == "dword") - { + } else if (type == "dword") { value = tempValue.Split("dword:")[1]; - } - else - { + } else { value = ""; } return value; } - //private string + //private string } } diff --git a/Installizer/Tasker.cs b/Installizer/Tasker.cs index d413451..333111c 100644 --- a/Installizer/Tasker.cs +++ b/Installizer/Tasker.cs @@ -255,6 +255,15 @@ namespace Installizer { // trigger.StartBoundary = new DateTime[dates.Length]; //} + #region Exports + private static string TaskNameExport(Tasker task) { + return task.TaskName; + } + private static string TaskPathExport(Tasker task) { + return task.TaskPath; + } + //private static string + #endregion #region Jsoner public static void ExportJson(string path, Tasker task) { var tas = Newtonsoft.Json.JsonConvert.SerializeObject(task, Newtonsoft.Json.Formatting.Indented);