From 6792f8d55794ad918fb3edadd48798443d6bb1a3 Mon Sep 17 00:00:00 2001
From: Roger Zander <roger@zander.ch>
Date: Sat, 9 Sep 2017 13:33:26 +0200
Subject: [PATCH] API Fixes

allign REST API on all tools to support latest web backend service.
- RZTool changed to import/export json instead of xml
- Cache RZCatalog for 30 min on client (%TEMP%\rzcat.json)
---
 RZ.OneGetProvider/Properties/AssemblyInfo.cs |  4 +-
 RZ.OneGetProvider/RZRestAPI.cs               | 45 ++++++++-------
 RZUpdate/Properties/AssemblyInfo.cs          |  2 +-
 RZUpdate/RZRestAPI.cs                        | 43 +++++++-------
 RuckZuck_Tool/InstallSwPanel.xaml            |  6 +-
 RuckZuck_Tool/InstallSwPanel.xaml.cs         |  2 +-
 RuckZuck_Tool/NewSWPanelxaml.xaml            |  4 +-
 RuckZuck_Tool/NewSWPanelxaml.xaml.cs         | 59 ++++++--------------
 RuckZuck_Tool/RZRestAPI.cs                   | 43 +++++++-------
 RuckZuck_Tool/RZScan.cs                      |  2 +-
 RuckZuck_Tool/RZUpdate.cs                    | 44 ++++++++++++++-
 11 files changed, 142 insertions(+), 112 deletions(-)

diff --git a/RZ.OneGetProvider/Properties/AssemblyInfo.cs b/RZ.OneGetProvider/Properties/AssemblyInfo.cs
index 55e2bb9..08d7366 100644
--- a/RZ.OneGetProvider/Properties/AssemblyInfo.cs
+++ b/RZ.OneGetProvider/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion("1.6.0.2")]
+[assembly: AssemblyFileVersion("1.6.0.2")]
diff --git a/RZ.OneGetProvider/RZRestAPI.cs b/RZ.OneGetProvider/RZRestAPI.cs
index b296750..7b91169 100644
--- a/RZ.OneGetProvider/RZRestAPI.cs
+++ b/RZ.OneGetProvider/RZRestAPI.cs
@@ -103,32 +103,37 @@ public static string GetAuthToken(string Username, string Password)
 
         public static List<GetSoftware> SWGet(string Shortname)
         {
-            /*using (var oClient = new HttpClient())
+            List<GetSoftware> lResult = new List<GetSoftware>();
+
+            try
             {
-                try
+                lResult = SWResults("").Where(t => t.Shortname == Shortname).ToList();
+            }
+            catch { }
+
+            if (lResult.Count() == 0)
+            {
+                using (var oClient = new HttpClient())
                 {
-                    oClient.DefaultRequestHeaders.Add("AuthenticatedToken", Token);
-                    oClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(contentType));
-                    var response = oClient.GetStringAsync(sURL + "/rest/SWGetShort?name=" + WebUtility.UrlEncode(Shortname));
-                    response.Wait(5000);
-                    if (response.IsCompleted)
+                    try
                     {
-                        JavaScriptSerializer ser = new JavaScriptSerializer();
-                        List<GetSoftware> lRes = ser.Deserialize<List<GetSoftware>>(response.Result);
-                        return lRes;
+                        oClient.DefaultRequestHeaders.Add("AuthenticatedToken", Token);
+                        oClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(contentType));
+                        var response = oClient.GetStringAsync(sURL + "/rest/SWGetShort?name=" + WebUtility.UrlEncode(Shortname));
+                        response.Wait(5000);
+                        if (response.IsCompleted)
+                        {
+                            JavaScriptSerializer ser = new JavaScriptSerializer();
+                            List<GetSoftware> lRes = ser.Deserialize<List<GetSoftware>>(response.Result);
+                            return lRes;
+                        }
                     }
+                    catch { }
                 }
-                catch { }
-            }*/
-
-            try
-            {
-                return SWResults("").Where(t => t.Shortname == Shortname).ToList();
             }
-            catch { }
 
 
-            return new List<GetSoftware>();
+            return lResult;
         }
 
         public static List<GetSoftware> SWGet(string PackageName, string PackageVersion)
@@ -206,7 +211,7 @@ public static List<GetSoftware> SWResults(string Searchstring)
                             try
                             {
                                 DateTime dCreationDate = File.GetCreationTime(Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), "rzcat.json"));
-                                if ((DateTime.Now - dCreationDate) < new TimeSpan(1, 0, 0))
+                                if ((DateTime.Now - dCreationDate) < new TimeSpan(0, 30, 0))
                                 {
                                     //return cached Content
                                     string jRes = File.ReadAllText(Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), "rzcat.json"));
@@ -375,7 +380,7 @@ public static async void TrackDownloads2(long SWId, string Architecture)
                 {
                     oClient.DefaultRequestHeaders.Add("AuthenticatedToken", Token);
                     oClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(contentType));
-                    await oClient.GetStringAsync(sURL + "/rest/TrackDownloadsNew?SWId=" + SWId.ToString() +"&arch=" + WebUtility.UrlEncode(Architecture));
+                    await oClient.GetStringAsync(sURL + "/rest/TrackDownloadsNew?SWId=" + SWId.ToString() + "&arch=" + WebUtility.UrlEncode(Architecture));
                 }
                 catch { }
             }
diff --git a/RZUpdate/Properties/AssemblyInfo.cs b/RZUpdate/Properties/AssemblyInfo.cs
index 4f2400f..feb22f3 100644
--- a/RZUpdate/Properties/AssemblyInfo.cs
+++ b/RZUpdate/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.6.0.*")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.2")]
diff --git a/RZUpdate/RZRestAPI.cs b/RZUpdate/RZRestAPI.cs
index 85c471d..7b91169 100644
--- a/RZUpdate/RZRestAPI.cs
+++ b/RZUpdate/RZRestAPI.cs
@@ -103,32 +103,37 @@ public static string GetAuthToken(string Username, string Password)
 
         public static List<GetSoftware> SWGet(string Shortname)
         {
-            /*using (var oClient = new HttpClient())
+            List<GetSoftware> lResult = new List<GetSoftware>();
+
+            try
             {
-                try
+                lResult = SWResults("").Where(t => t.Shortname == Shortname).ToList();
+            }
+            catch { }
+
+            if (lResult.Count() == 0)
+            {
+                using (var oClient = new HttpClient())
                 {
-                    oClient.DefaultRequestHeaders.Add("AuthenticatedToken", Token);
-                    oClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(contentType));
-                    var response = oClient.GetStringAsync(sURL + "/rest/SWGetShort?name=" + WebUtility.UrlEncode(Shortname));
-                    response.Wait(5000);
-                    if (response.IsCompleted)
+                    try
                     {
-                        JavaScriptSerializer ser = new JavaScriptSerializer();
-                        List<GetSoftware> lRes = ser.Deserialize<List<GetSoftware>>(response.Result);
-                        return lRes;
+                        oClient.DefaultRequestHeaders.Add("AuthenticatedToken", Token);
+                        oClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(contentType));
+                        var response = oClient.GetStringAsync(sURL + "/rest/SWGetShort?name=" + WebUtility.UrlEncode(Shortname));
+                        response.Wait(5000);
+                        if (response.IsCompleted)
+                        {
+                            JavaScriptSerializer ser = new JavaScriptSerializer();
+                            List<GetSoftware> lRes = ser.Deserialize<List<GetSoftware>>(response.Result);
+                            return lRes;
+                        }
                     }
+                    catch { }
                 }
-                catch { }
-            }*/
-
-            try
-            {
-                return SWResults("").Where(t => t.Shortname == Shortname).ToList();
             }
-            catch { }
 
 
-            return new List<GetSoftware>();
+            return lResult;
         }
 
         public static List<GetSoftware> SWGet(string PackageName, string PackageVersion)
@@ -206,7 +211,7 @@ public static List<GetSoftware> SWResults(string Searchstring)
                             try
                             {
                                 DateTime dCreationDate = File.GetCreationTime(Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), "rzcat.json"));
-                                if ((DateTime.Now - dCreationDate) < new TimeSpan(1, 0, 0))
+                                if ((DateTime.Now - dCreationDate) < new TimeSpan(0, 30, 0))
                                 {
                                     //return cached Content
                                     string jRes = File.ReadAllText(Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), "rzcat.json"));
diff --git a/RuckZuck_Tool/InstallSwPanel.xaml b/RuckZuck_Tool/InstallSwPanel.xaml
index a25a41e..32fa1c7 100644
--- a/RuckZuck_Tool/InstallSwPanel.xaml
+++ b/RuckZuck_Tool/InstallSwPanel.xaml
@@ -29,12 +29,12 @@
                                     <Image Source="Images/Star.ico" />
                                 </MenuItem.Icon>
                             </MenuItem>
-                            <MenuItem x:Name="btIssue" Header="Issues" ToolTip="Get 10 Software-Items with worst success ratio" Click="btIssue_Click" Height="24">
+                            <MenuItem x:Name="btIssue" Header="Issues" ToolTip="Get 10 Software-Items with worst success ratio" Click="btIssue_Click" Height="24" Visibility="Collapsed">
                                 <MenuItem.Icon>
                                     <Image Source="Images/Star.ico" />
                                 </MenuItem.Icon>
                             </MenuItem>
-                            <MenuItem x:Name="btBadRatio" Click="btBadRatio_Click" Height="24" Header="Bad success ratio" ToolTip="Get 10 Software-Items with worst success ratio">
+                            <MenuItem x:Name="btBadRatio" Click="btBadRatio_Click" Height="24" Header="Bad success ratio" ToolTip="Get 10 Software-Items with worst success ratio" Visibility="Collapsed">
                                 <MenuItem.Icon>
                                     <Image Source="Images/Star.ico" />
                                 </MenuItem.Icon>
@@ -44,7 +44,7 @@
                                     <Image Source="Images/Star.ico" />
                                 </MenuItem.Icon>
                             </MenuItem>
-                            <MenuItem x:Name="btApproval" Height="24" Header="Waiting for Approval" ToolTip="Waiting for Approval" Click="btApproval_Click">
+                            <MenuItem x:Name="btApproval" Height="24" Header="Waiting for Approval" ToolTip="Waiting for Approval" Click="btApproval_Click" Visibility="Collapsed">
                                 <MenuItem.Icon>
                                     <Image Source="Images/Star.ico" />
                                 </MenuItem.Icon>
diff --git a/RuckZuck_Tool/InstallSwPanel.xaml.cs b/RuckZuck_Tool/InstallSwPanel.xaml.cs
index 97a426b..03d217d 100644
--- a/RuckZuck_Tool/InstallSwPanel.xaml.cs
+++ b/RuckZuck_Tool/InstallSwPanel.xaml.cs
@@ -563,7 +563,7 @@ private void btNew_Click(object sender, RoutedEventArgs e)
             try
             {
                 tSearch.Stop();
-                var badSW = RZRestAPI.SWResults("--NEW--").Distinct().Select(x => new GetSoftware() { Categories = x.Categories.ToList(), Description = x.Description, Downloads = x.Downloads, IconId = x.IconId, Image = x.Image, Manufacturer = x.Manufacturer, ProductName = x.ProductName, ProductURL = x.ProductURL, ProductVersion = x.ProductVersion, Quality = x.Quality, Shortname = x.Shortname, isInstalled = false }).ToList();
+                var badSW = RZRestAPI.SWResults("--NEW--").ToList();
                 tbSearch.Text = "";
 
                 //Mark all installed...
diff --git a/RuckZuck_Tool/NewSWPanelxaml.xaml b/RuckZuck_Tool/NewSWPanelxaml.xaml
index a33e42b..55f5b7e 100644
--- a/RuckZuck_Tool/NewSWPanelxaml.xaml
+++ b/RuckZuck_Tool/NewSWPanelxaml.xaml
@@ -20,8 +20,8 @@
                 <DockPanel DockPanel.Dock="Bottom">
                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" HorizontalAlignment="Center">
                         <Button x:Name="btUpload"  Content="Upload" Width="130" Height="30" Click="Button_Click" IsEnabled="False" ToolTip="URL must be specified before SW upload is possible." Margin="0,0,5,0" />
-                        <Button x:Name="btSaveAsXML" Content="Save as XML..." Width="130" Height="30" ToolTip="Save settings as XML..." Click="btSaveAsXML_Click" Margin="0,0,5,0"  />
-                        <Button x:Name="btOpenXML" Content="Open an XML..." Width="130" Height="30" ToolTip="Open settings from XML..." Click="btOpenXML_Click" Margin="0,0,5,0" />
+                        <Button x:Name="btSaveAsXML" Content="Save..." Width="130" Height="30" ToolTip="Save settings as JSON file..." Click="btSaveAsXML_Click" Margin="0,0,5,0"  />
+                        <Button x:Name="btOpenXML" Content="Open..." Width="130" Height="30" ToolTip="Open settings from JSON file..." Click="btOpenXML_Click" Margin="0,0,5,0" />
                         <Button x:Name="btCreateEXE" Content="Create EXE..." Width="130" Height="30" ToolTip="Create a Setup.EXE without dependency to RuckZuck.tools" Margin="0,0,5,0" Click="btCreateEXE_Click" />
                         <Button x:Name="btTest" Content="Test Install" Width="130" Height="30" ToolTip="Open settings from XML..." Click="btTest_Click" />
                     </StackPanel>
diff --git a/RuckZuck_Tool/NewSWPanelxaml.xaml.cs b/RuckZuck_Tool/NewSWPanelxaml.xaml.cs
index 4614eb3..8254796 100644
--- a/RuckZuck_Tool/NewSWPanelxaml.xaml.cs
+++ b/RuckZuck_Tool/NewSWPanelxaml.xaml.cs
@@ -18,6 +18,7 @@
 using RZUpdate;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
+using System.Web.Script.Serialization;
 
 namespace RuckZuck_Tool
 {
@@ -427,8 +428,8 @@ private void UserControl_SizeChanged(object sender, SizeChangedEventArgs e)
 
         private void btSaveAsXML_Click(object sender, RoutedEventArgs e)
         {
-            string sFilename = "EXP_" + tbProductName.Text + tbVersion.Text + tbArchitecture.Text + ".xml";
-            var ofd = new Microsoft.Win32.SaveFileDialog() { Filter = "XML Files (*.xml)|*.xml" };
+            string sFilename = "EXP_" + tbProductName.Text + tbVersion.Text + tbArchitecture.Text.Trim() + ".json";
+            var ofd = new Microsoft.Win32.SaveFileDialog() { Filter = "JSON Files (*.json)|*.json" };
             ofd.FileName = sFilename;
             var result = ofd.ShowDialog();
             if (result != false)
@@ -440,8 +441,8 @@ private void btSaveAsXML_Click(object sender, RoutedEventArgs e)
         private void SaveAsXML(string sFile)
         {
             AddSoftware oSoftware = new AddSoftware();
-            oSoftware.Architecture = tbArchitecture.Text;
-            oSoftware.ContentID = tbContentId.Text;
+            oSoftware.Architecture = tbArchitecture.Text.Trim();
+            oSoftware.ContentID = tbContentId.Text.Trim();
             oSoftware.Description = tbDescription.Text;
             try
             {
@@ -458,49 +459,29 @@ private void SaveAsXML(string sFile)
                 oSoftware.Files = ((List<contentFiles>)dgSourceFiles.ItemsSource);
             }
             catch { }
-            oSoftware.Manufacturer = tbManufacturer.Text;
+            oSoftware.Manufacturer = tbManufacturer.Text.Trim();
             oSoftware.MSIProductID = tbMSIId.Text;
-            oSoftware.ProductName = tbProductName.Text;
-            oSoftware.ProductVersion = tbVersion.Text;
+            oSoftware.ProductName = tbProductName.Text.Trim();
+            oSoftware.ProductVersion = tbVersion.Text.Trim();
             oSoftware.PSDetection = tbPSDetection.Text;
             oSoftware.PSInstall = tbPSInstall.Text;
             oSoftware.PSPreReq = tbPSPrereq.Text;
             oSoftware.PSUninstall = tbPSUnInstall.Text;
-            oSoftware.ProductURL = tbProductURL.Text;
+            oSoftware.ProductURL = tbProductURL.Text.Trim();
             oSoftware.Author = Properties.Settings.Default.UserKey;
             oSoftware.PSPreInstall = tbPSPreInstall.Text;
             oSoftware.PSPostInstall = tbPSPostInstall.Text;
             oSoftware.PreRequisites = tbPreReq.Text.Split(';');
+            oSoftware.Shortname = tbShortname.Text.Trim();
+            oSoftware.Category = tbCategories.Text.Trim();
 
             if (imgIcon.Tag != null)
                 oSoftware.Image = imgIcon.Tag as byte[];
 
-
-            System.Xml.Serialization.XmlSerializerNamespaces ns = new System.Xml.Serialization.XmlSerializerNamespaces();
-            ns.Add("", "");
-            System.Xml.Serialization.XmlSerializer x = new System.Xml.Serialization.XmlSerializer(oSoftware.GetType(), "");
-
-            StreamWriter file = new System.IO.StreamWriter(sFile);
-            x.Serialize(file, oSoftware, ns);
-            file.Close();
-
-
-            //remove all namespaces
-            XDocument doc = XDocument.Load(sFile);
-            foreach (var node in doc.Root.Descendants())
-            {
-                try
-                {
-                    // If we have an empty namespace...
-                    if (node.Name.NamespaceName != "")
-                    {
-                        node.Attributes("xmlns").Remove();
-                        node.Name = node.Parent.Name.Namespace + node.Name.LocalName;
-                    }
-                }
-                catch { }
-            }
-            doc.Save(sFile);
+            //Convert to JSON
+            JavaScriptSerializer ser = new JavaScriptSerializer();
+            string sJson = ser.Serialize(oSoftware);
+            File.WriteAllText(sFile, sJson);
         }
 
         private void btOpenXML_Click(object sender, RoutedEventArgs e)
@@ -517,7 +498,7 @@ private void btOpenXML_Click(object sender, RoutedEventArgs e)
 
         public void OpenXML(AddSoftware oSoftware)
         {
-            tbArchitecture.Text = oSoftware.Architecture;
+            tbArchitecture.Text = oSoftware.Architecture.Trim();
             tbContentId.Text = oSoftware.ContentID;
 
             if (string.IsNullOrEmpty(tbContentId.Text))
@@ -525,8 +506,6 @@ public void OpenXML(AddSoftware oSoftware)
 
             tbDescription.Text = oSoftware.Description;
 
-
-
             if (oSoftware.Files != null)
             {
                 foreach (contentFiles vFiles in oSoftware.Files)
@@ -543,8 +522,6 @@ public void OpenXML(AddSoftware oSoftware)
                 dgSourceFiles.Items.Clear();
             }
 
-
-
             tbManufacturer.Text = oSoftware.Manufacturer;
             tbMSIId.Text = oSoftware.MSIProductID;
             tbProductName.Text = oSoftware.ProductName;
@@ -567,8 +544,8 @@ public void OpenXML(AddSoftware oSoftware)
             }
             catch { }
 
-            tbCategories.Text = oSoftware.Category;
-            tbShortname.Text = oSoftware.Shortname;
+            tbCategories.Text = oSoftware.Category ?? "";
+            tbShortname.Text = oSoftware.Shortname ?? "";
         }
 
         private void tbContentId_MouseDoubleClick(object sender, MouseButtonEventArgs e)
diff --git a/RuckZuck_Tool/RZRestAPI.cs b/RuckZuck_Tool/RZRestAPI.cs
index b296750..f4458d6 100644
--- a/RuckZuck_Tool/RZRestAPI.cs
+++ b/RuckZuck_Tool/RZRestAPI.cs
@@ -103,32 +103,37 @@ public static string GetAuthToken(string Username, string Password)
 
         public static List<GetSoftware> SWGet(string Shortname)
         {
-            /*using (var oClient = new HttpClient())
+            List<GetSoftware> lResult = new List<GetSoftware>();
+
+            try
             {
-                try
+                lResult = SWResults("").Where(t => t.Shortname == Shortname).ToList();
+            }
+            catch { }
+
+            if (lResult.Count() == 0)
+            {
+                using (var oClient = new HttpClient())
                 {
-                    oClient.DefaultRequestHeaders.Add("AuthenticatedToken", Token);
-                    oClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(contentType));
-                    var response = oClient.GetStringAsync(sURL + "/rest/SWGetShort?name=" + WebUtility.UrlEncode(Shortname));
-                    response.Wait(5000);
-                    if (response.IsCompleted)
+                    try
                     {
-                        JavaScriptSerializer ser = new JavaScriptSerializer();
-                        List<GetSoftware> lRes = ser.Deserialize<List<GetSoftware>>(response.Result);
-                        return lRes;
+                        oClient.DefaultRequestHeaders.Add("AuthenticatedToken", Token);
+                        oClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue(contentType));
+                        var response = oClient.GetStringAsync(sURL + "/rest/SWGetShort?name=" + WebUtility.UrlEncode(Shortname));
+                        response.Wait(5000);
+                        if (response.IsCompleted)
+                        {
+                            JavaScriptSerializer ser = new JavaScriptSerializer();
+                            List<GetSoftware> lRes = ser.Deserialize<List<GetSoftware>>(response.Result);
+                            return lRes;
+                        }
                     }
+                    catch { }
                 }
-                catch { }
-            }*/
-
-            try
-            {
-                return SWResults("").Where(t => t.Shortname == Shortname).ToList();
             }
-            catch { }
 
 
-            return new List<GetSoftware>();
+            return lResult;
         }
 
         public static List<GetSoftware> SWGet(string PackageName, string PackageVersion)
@@ -206,7 +211,7 @@ public static List<GetSoftware> SWResults(string Searchstring)
                             try
                             {
                                 DateTime dCreationDate = File.GetCreationTime(Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), "rzcat.json"));
-                                if ((DateTime.Now - dCreationDate) < new TimeSpan(1, 0, 0))
+                                if ((DateTime.Now - dCreationDate) < new TimeSpan(0, 30, 0))
                                 {
                                     //return cached Content
                                     string jRes = File.ReadAllText(Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), "rzcat.json"));
diff --git a/RuckZuck_Tool/RZScan.cs b/RuckZuck_Tool/RZScan.cs
index 18f9b19..abd63bd 100644
--- a/RuckZuck_Tool/RZScan.cs
+++ b/RuckZuck_Tool/RZScan.cs
@@ -311,7 +311,7 @@ internal void _CheckUpdates(List<AddSoftware> aSWCheck)
                     ProductVersion = item.ProductVersion,
                     MSIProductID = item.MSIProductID,
                     Shortname = item.Shortname,
-                    IconId = item.IconId
+                    SWId = item.SWId
                 }).ToList();
 
                 //Only take updated Versions
diff --git a/RuckZuck_Tool/RZUpdate.cs b/RuckZuck_Tool/RZUpdate.cs
index daa5f64..b3f0f18 100644
--- a/RuckZuck_Tool/RZUpdate.cs
+++ b/RuckZuck_Tool/RZUpdate.cs
@@ -12,6 +12,7 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Xml.Linq;
+using System.Web.Script.Serialization;
 
 namespace RZUpdate
 {
@@ -37,9 +38,17 @@ public RZUpdater(string Username, string Password)
             SoftwareUpdate = new SWUpdate(oSW);
         }
 
-        public RZUpdater(string sXMLFile)
+        public RZUpdater(string sSWFile)
         {
-            SoftwareUpdate = new SWUpdate(ParseXML(sXMLFile));
+            if (sSWFile.EndsWith(".xml", StringComparison.CurrentCultureIgnoreCase))
+            {
+                SoftwareUpdate = new SWUpdate(ParseXML(sSWFile));
+            }
+
+            if (sSWFile.EndsWith(".json", StringComparison.CurrentCultureIgnoreCase))
+            {
+                SoftwareUpdate = new SWUpdate(ParseJSON(sSWFile));
+            }
         }
 
         /// <summary>
@@ -231,6 +240,23 @@ internal static AddSoftware ParseXML(string sFile)
 
             return oSoftware;
         }
+
+        internal static AddSoftware ParseJSON(string sFile)
+        {
+            if (File.Exists(sFile))
+            {
+                try
+                {
+                    JavaScriptSerializer ser = new JavaScriptSerializer();
+                    AddSoftware lRes = ser.Deserialize<AddSoftware>(File.ReadAllText(sFile));
+                    return lRes;
+                }
+                catch { }
+            }
+
+
+            return new AddSoftware();
+        }
     }
 
     /// <summary>
@@ -260,6 +286,8 @@ public SWUpdate(AddSoftware Software)
             downloadTask.SWUpd = this;
             if (SW.Files == null)
                 SW.Files = new List<contentFiles>();
+            if (SW.PreRequisites == null)
+                SW.PreRequisites = new string[0];
 
             foreach (contentFiles vFile in SW.Files)
             {
@@ -506,7 +534,17 @@ private bool _Download(bool Enforce, string DLPath)
                             else
                             {
                                 if (SendFeedback)
-                                    RZRestAPI.TrackDownloads(SW.ContentID);
+                                {
+                                    if (SW.SWId > 0)
+                                    {
+                                        RZRestAPI.TrackDownloads2(SW.SWId, SW.Architecture);
+                                    }
+                                    else
+                                    {
+                                        //Legacy
+                                        RZRestAPI.TrackDownloads(SW.ContentID);
+                                    }
+                                }
                             }
 
                             //Sleep 1s to complete