Disable the creation of XML and YAML bundles. XML and YAML bundles will still be importable

marticliment · marticliment · commit 87f788e411b7 · 2025-07-12T00:55:26.000+02:00
diff --git a/src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs b/src/UniGetUI.PackageEngine.Serializable/InstallOptions.cs
@@ -148,7 +148,7 @@ this.CustomParameters_Uninstall.Count is 0 &&
             this.OverridesNextLevelOpts = data[nameof(OverridesNextLevelOpts)]?.GetValue<bool>() ?? DiffersFromDefault();
         }
 
-        public override JsonNode AsJsonNode()
+        public override JsonObject AsJsonNode()
         {
             JsonObject obj = new();
 
diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializableBundle.cs b/src/UniGetUI.PackageEngine.Serializable/SerializableBundle.cs
@@ -58,7 +58,7 @@ public override void LoadFromJson(JsonNode data)
             }
         }
 
-        public override JsonNode AsJsonNode()
+        public override JsonObject AsJsonNode()
         {
             JsonObject obj = new();
             obj.Add(nameof(export_version), export_version);
diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializableComponent.cs b/src/UniGetUI.PackageEngine.Serializable/SerializableComponent.cs
@@ -31,7 +31,7 @@ public string AsJsonString()
     /// Serializes this object into a JsonNode object
     /// </summary>
     /// <returns>A pretty-formatted JSON string representing the current data</returns>
-    public abstract JsonNode AsJsonNode();
+    public abstract JsonObject AsJsonNode();
 
     /// <summary>
     /// Creates an instance of this object with the default data
diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializableIncompatiblePackage.cs b/src/UniGetUI.PackageEngine.Serializable/SerializableIncompatiblePackage.cs
@@ -27,7 +27,7 @@ public override void LoadFromJson(JsonNode data)
             this.Source = data[nameof(Source)]?.GetVal<string>() ?? "";
         }
 
-        public override JsonNode AsJsonNode()
+        public override JsonObject AsJsonNode()
         {
             JsonObject obj = new();
             obj.Add(nameof(Id), Id);
diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializablePackage.cs b/src/UniGetUI.PackageEngine.Serializable/SerializablePackage.cs
@@ -41,16 +41,27 @@ public override void LoadFromJson(JsonNode data)
             this.Updates = new(data[nameof(Updates)] ?? new JsonObject());
         }
 
-        public override JsonNode AsJsonNode()
+        public override JsonObject AsJsonNode()
         {
             JsonObject obj = new();
             obj.Add(nameof(Id), Id);
             obj.Add(nameof(Name), Name);
             obj.Add(nameof(Version), Version);
             obj.Add(nameof(Source), Source);
             obj.Add(nameof(ManagerName), ManagerName);
-            obj.Add(nameof(InstallationOptions), InstallationOptions.AsJsonNode());
-            obj.Add(nameof(Updates), Updates.AsJsonNode());
+
+            var ioNode = InstallationOptions.AsJsonNode();
+            if (ioNode.Count > 0)
+            {
+                obj.Add(nameof(InstallationOptions), InstallationOptions.AsJsonNode());
+            }
+
+            var updNode = Updates.AsJsonNode();
+            if (updNode.Count > 0)
+            {
+                obj.Add(nameof(Updates), updNode);
+            }
+
             return obj;
         }
 
diff --git a/src/UniGetUI.PackageEngine.Serializable/SerializableUpdatesOptions.cs b/src/UniGetUI.PackageEngine.Serializable/SerializableUpdatesOptions.cs
@@ -20,7 +20,7 @@ public override void LoadFromJson(JsonNode data)
             this.IgnoredVersion = data[nameof(IgnoredVersion)]?.GetVal<string>() ?? "";
         }
 
-        public override JsonNode AsJsonNode()
+        public override JsonObject AsJsonNode()
         {
             JsonObject obj = new();
             if(UpdatesIgnored is not false) obj.Add(nameof(UpdatesIgnored), UpdatesIgnored);
diff --git a/src/UniGetUI/Pages/SettingsPages/GeneralPages/Internet.xaml.cs b/src/UniGetUI/Pages/SettingsPages/GeneralPages/Internet.xaml.cs
@@ -17,12 +17,12 @@ namespace UniGetUI.Pages.SettingsPages.GeneralPages
     /// </summary>
     public sealed partial class Internet : Page, ISettingsPage
     {
-        
+
 
         public Internet()
         {
             this.InitializeComponent();
-            
+
 
             UsernameBox.PlaceholderText = CoreTools.Translate("Username");
             PasswordBox.PlaceholderText = CoreTools.Translate("Password");
@@ -85,7 +85,7 @@ public Internet()
                 });
 
             }
-            
+
         }
 
         public bool CanGoBack => true;
diff --git a/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs b/src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs
@@ -1342,7 +1342,7 @@ private void ABSTRACT_PAGE_SizeChanged(object sender, SizeChangedEventArgs e)
                 {
                     _titleHidden = true;
                     MainSubtitle.Visibility = Visibility.Visible;
-                    
+
                 }
             }
 
diff --git a/src/UniGetUI/Pages/SoftwarePages/InstalledPackagesPage.cs b/src/UniGetUI/Pages/SoftwarePages/InstalledPackagesPage.cs
@@ -377,7 +377,7 @@ public static Task<string> GenerateBackupContents()
                 packagesToExport.Add(package);
             }
 
-            return PackageBundlesPage.CreateBundle(packagesToExport.ToArray(), BundleFormatType.UBUNDLE);
+            return PackageBundlesPage.CreateBundle(packagesToExport.ToArray());
         }
 
         public static async Task BackupPackages_CLOUD()
diff --git a/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs b/src/UniGetUI/Pages/SoftwarePages/PackageBundlesPage.cs
@@ -518,7 +518,7 @@ public async Task SaveFile()
             {
                 // Get file
                 string defaultName = CoreTools.Translate("Package bundle") + ".ubundle";
-                string file = (new FileSavePicker(MainApp.Instance.MainWindow.GetWindowHandle())).Show(["*.ubundle", "*.json", "*.yaml", "*.xml"], defaultName);
+                string file = (new FileSavePicker(MainApp.Instance.MainWindow.GetWindowHandle())).Show(["*.ubundle", "*.json"], defaultName);
                 if (file != String.Empty)
                 {
                     // Loading dialog
@@ -527,19 +527,15 @@ public async Task SaveFile()
                     // Select appropriate format
                     BundleFormatType formatType;
                     string EXT = file.Split('.')[^1].ToLower();
-                    if (EXT == "yaml")
-                        formatType = BundleFormatType.YAML;
-                    else if (EXT == "xml")
-                        formatType = BundleFormatType.XML;
-                    else if (EXT == "json")
+                    if (EXT == "json")
                         formatType = BundleFormatType.JSON;
                     else if (EXT == "ubundle")
                         formatType = BundleFormatType.UBUNDLE;
                     else
                         formatType = BundleFormatType.UBUNDLE;
 
                     // Save serialized data
-                    await File.WriteAllTextAsync(file, await CreateBundle(Loader.Packages, formatType));
+                    await File.WriteAllTextAsync(file, await CreateBundle(Loader.Packages));
                     TelemetryHandler.ExportBundle(formatType);
 
                     DialogHelper.HideLoadingDialog();
@@ -574,9 +570,9 @@ public async Task SaveFile()
             }
         }
 
-        public static async Task<string> CreateBundle(IReadOnlyList<IPackage> unsorted_packages, BundleFormatType formatType = BundleFormatType.UBUNDLE)
+        public static async Task<string> CreateBundle(IReadOnlyList<IPackage> unsorted_packages)
         {
-            SerializableBundle exportable = new();
+            SerializableBundle exportableData = new();
 
             List<IPackage> packages = unsorted_packages.ToList();
             packages.Sort(Comparison);
@@ -591,37 +587,15 @@ static int Comparison(IPackage x, IPackage y)
             foreach (IPackage package in packages)
             {
                 if (package is Package && !package.Source.IsVirtualManager)
-                    exportable.packages.Add(await package.AsSerializableAsync());
+                    exportableData.packages.Add(await package.AsSerializableAsync());
                 else
-                    exportable.incompatible_packages.Add(package.AsSerializable_Incompatible());
-            }
-
-            Logger.Debug("Finished loading serializable objects. Serializing with format " + formatType);
-            string ExportableData;
-
-            if (formatType is BundleFormatType.JSON or BundleFormatType.UBUNDLE)
-                ExportableData = exportable.AsJsonString();
-
-            else if (formatType is BundleFormatType.YAML)
-            {
-                ISerializer serializer = new SerializerBuilder()
-                    .Build();
-                ExportableData = serializer.Serialize(exportable);
-            }
-            else
-            {
-                string tempfile = Path.GetTempFileName();
-                StreamWriter writer = new(tempfile);
-                XmlSerializer serializer = new(typeof(SerializableBundle));
-                serializer.Serialize(writer, exportable);
-                writer.Close();
-                ExportableData = await File.ReadAllTextAsync(tempfile);
-                File.Delete(tempfile);
+                    exportableData.incompatible_packages.Add(package.AsSerializable_Incompatible());
             }
 
+            Logger.Debug("Finished loading serializable objects.");
+            string exportablePayload = exportableData.AsJsonString();
             Logger.Debug("Serialization finished successfully");
-
-            return ExportableData;
+            return exportablePayload;
         }
 
         public async Task<double> AddFromBundle(string content, BundleFormatType format)

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ this.CustomParameters_Uninstall.Count is 0 &&`
`148`	`148`	`this.OverridesNextLevelOpts = data[nameof(OverridesNextLevelOpts)]?.GetValue<bool>() ?? DiffersFromDefault();`
`149`	`149`	`}`
`150`	`150`
`151`		`- public override JsonNode AsJsonNode()`
	`151`	`+ public override JsonObject AsJsonNode()`
`152`	`152`	`{`
`153`	`153`	`JsonObject obj = new();`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public override void LoadFromJson(JsonNode data)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- public override JsonNode AsJsonNode()`
	`61`	`+ public override JsonObject AsJsonNode()`
`62`	`62`	`{`
`63`	`63`	`JsonObject obj = new();`
`64`	`64`	`obj.Add(nameof(export_version), export_version);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public override void LoadFromJson(JsonNode data)`
`27`	`27`	`this.Source = data[nameof(Source)]?.GetVal<string>() ?? "";`
`28`	`28`	`}`
`29`	`29`
`30`		`- public override JsonNode AsJsonNode()`
	`30`	`+ public override JsonObject AsJsonNode()`
`31`	`31`	`{`
`32`	`32`	`JsonObject obj = new();`
`33`	`33`	`obj.Add(nameof(Id), Id);`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public override void LoadFromJson(JsonNode data)`
`20`	`20`	`this.IgnoredVersion = data[nameof(IgnoredVersion)]?.GetVal<string>() ?? "";`
`21`	`21`	`}`
`22`	`22`
`23`		`- public override JsonNode AsJsonNode()`
	`23`	`+ public override JsonObject AsJsonNode()`
`24`	`24`	`{`
`25`	`25`	`JsonObject obj = new();`
`26`	`26`	`if(UpdatesIgnored is not false) obj.Add(nameof(UpdatesIgnored), UpdatesIgnored);`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@ namespace UniGetUI.Pages.SettingsPages.GeneralPages`
`17`	`17`	`/// </summary>`
`18`	`18`	`public sealed partial class Internet : Page, ISettingsPage`
`19`	`19`	`{`
`20`		`-`
	`20`	`+`
`21`	`21`
`22`	`22`	`public Internet()`
`23`	`23`	`{`
`24`	`24`	`this.InitializeComponent();`
`25`		`-`
	`25`	`+`
`26`	`26`
`27`	`27`	`UsernameBox.PlaceholderText = CoreTools.Translate("Username");`
`28`	`28`	`PasswordBox.PlaceholderText = CoreTools.Translate("Password");`
`@@ -85,7 +85,7 @@ public Internet()`
`85`	`85`	`});`
`86`	`86`
`87`	`87`	`}`
`88`		`-`
	`88`	`+`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public bool CanGoBack => true;`
Original file line number	Diff line number	Diff line change
`@@ -1342,7 +1342,7 @@ private void ABSTRACT_PAGE_SizeChanged(object sender, SizeChangedEventArgs e)`
`1342`	`1342`	`{`
`1343`	`1343`	`_titleHidden = true;`
`1344`	`1344`	`MainSubtitle.Visibility = Visibility.Visible;`
`1345`		`-`
	`1345`	`+`
`1346`	`1346`	`}`
`1347`	`1347`	`}`
`1348`	`1348`
Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ public static Task<string> GenerateBackupContents()`
`377`	`377`	`packagesToExport.Add(package);`
`378`	`378`	`}`
`379`	`379`
`380`		`- return PackageBundlesPage.CreateBundle(packagesToExport.ToArray(), BundleFormatType.UBUNDLE);`
	`380`	`+ return PackageBundlesPage.CreateBundle(packagesToExport.ToArray());`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`public static async Task BackupPackages_CLOUD()`