* Added ability to export to JSON

CodeDead · CodeDead · commit a7d896ca33b0 · 2020-01-24T00:18:35.000+01:00
diff --git a/PK Finder/Classes/ExportManager.cs b/PK Finder/Classes/ExportManager.cs
@@ -33,16 +33,14 @@ internal ExportManager(KeyInfo keyInfo)
         /// <param name="content">The content that should be stored in the file</param>
         private static void Export(string path, string content)
         {
-            using (StreamWriter sw = new StreamWriter(path))
-            {
-                sw.Write(content);
-            }
+            using StreamWriter sw = new StreamWriter(path);
+            sw.Write(content);
         }
 
         /// <summary>
         /// Export the KeyInfo object to a storage device in plain text format
         /// </summary>
-        /// <param name="path">The path where the KeyInfo object can be stored in plain text format</param>
+        /// <param name="path">The path where the KeyInfo object should be stored in plain text format</param>
         internal void ExportToTxt(string path)
         {
             string content = "Product name: " + _keyInfo.GetProductName() + Environment.NewLine + "Product key: " +
@@ -53,7 +51,7 @@ internal void ExportToTxt(string path)
         /// <summary>
         /// Export the KeyInfo object to a storage device in CSV format
         /// </summary>
-        /// <param name="path">The path where the KeyInfo object can be stored in CSV format</param>
+        /// <param name="path">The path where the KeyInfo object should be stored in CSV format</param>
         internal void ExportToCsv(string path)
         {
             ExportDelimiter(path, ",");
@@ -62,16 +60,27 @@ internal void ExportToCsv(string path)
         /// <summary>
         /// Export the KeyInfo object to a storage device in CSV format using the Excel delimiter
         /// </summary>
-        /// <param name="path">The path where the KeyInfo object can be stored in CSV format using the Excel delimiter</param>
+        /// <param name="path">The path where the KeyInfo object should be stored in CSV format using the Excel delimiter</param>
         internal void ExportToExcel(string path)
         {
             ExportDelimiter(path, ";");
         }
+        
+        /// <summary>
+        /// Export the KeyInfo object to a storage device in JSON format
+        /// </summary>
+        /// <param name="path">The path where the KeyInfo object should be stored in JSON format</param>
+        internal void ExportToJson(string path)
+        {
+            string content = "{\"productName\":\"" + _keyInfo.GetProductName() + "\",\"productKey\":\"" +
+                             _keyInfo.GetProductKey() + "\"}";
+            Export(path, content);
+        }
 
         /// <summary>
         /// Export the KeyInfo object to a storage device using a specific delimiter character
         /// </summary>
-        /// <param name="path">The path where the KeyInfo object can be stored</param>
+        /// <param name="path">The path where the KeyInfo object should be stored</param>
         /// <param name="delimiter">The delimiter that should be used to split the data</param>
         private void ExportDelimiter(string path, string delimiter)
         {
@@ -83,12 +92,11 @@ private void ExportDelimiter(string path, string delimiter)
         /// <summary>
         /// Export the KeyInfo object to a storage device in HTML format
         /// </summary>
-        /// <param name="path">The path where the KeyInfo object can be stored in HTML format</param>
+        /// <param name="path">The path where the KeyInfo object should be stored in HTML format</param>
         internal void ExportToHtml(string path)
-        {
-            string content =
-                "<html><head><title>PK Finder</title></head><body><table border='1'><tr><th>Product name</th><th>Product key</th></tr><tr><td>" +
-                _keyInfo.GetProductName() + "</td><td>" + _keyInfo.GetProductKey() + "</td></tr></table></body></html>";
+        { 
+            string content = "<html><head><meta charset=\"UTF-8\"><title>PK Finder</title></head><body><table border='1'><tbody><tr><th>Product name</th><th>Product key</th></tr><tr><td>" +
+                           _keyInfo.GetProductName() + "</td><td>" + _keyInfo.GetProductKey() + "</td></tr></tbody></table></body></html>";
             Export(path, content);
         }
     }
diff --git a/PK Finder/Windows/MainWindow.xaml.cs b/PK Finder/Windows/MainWindow.xaml.cs
@@ -158,7 +158,7 @@ private void ExportItem_OnClick(object sender, RoutedEventArgs e)
             if (_keyInfo == null) return;
 
             SaveFileDialog sfd = new SaveFileDialog
-                {Filter = "Text file (*.txt)|*.txt|HTML (*.html)|*.html|CSV (*.csv)|*.csv|Excel (*.csv)|*.csv"};
+                {Filter = "Text file (*.txt)|*.txt|HTML (*.html)|*.html|CSV (*.csv)|*.csv|Excel (*.csv)|*.csv|JSON (*.json)|*.json"};
             ExportManager exportManager = new ExportManager(_keyInfo);
 
             if (sfd.ShowDialog() != true) return;
@@ -178,6 +178,9 @@ private void ExportItem_OnClick(object sender, RoutedEventArgs e)
                     case 4:
                         exportManager.ExportToExcel(sfd.FileName);
                         break;
+                    case 5:
+                        exportManager.ExportToJson(sfd.FileName);
+                        break;
                 }
 
                 MessageBox.Show("Key exported!", "PK Finder", MessageBoxButton.OK, MessageBoxImage.Information);
