From 66276643c58b1b9bd362341cb4129bb07117196d Mon Sep 17 00:00:00 2001 From: CreepyCrafter24 <33260128+CreepyCrafter24@users.noreply.github.com> Date: Sat, 9 Nov 2019 21:28:41 +0100 Subject: [PATCH] Possibly fixed --- Meta.xml | 6 +++--- UpTool2/Program.cs | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Meta.xml b/Meta.xml index 6f1269d..0b1f6c2 100644 --- a/Meta.xml +++ b/Meta.xml @@ -1,6 +1,6 @@ - 11 - https://github.com/CreepyCrafter24/UpTool2/releases/download/v1.9/UpTool2.exe - 524A3E5F7EAF3EF147B4C2A614A15FEB2F059CDE0A23E1626E54E5CF1AF2FEF3 + 12 + https://github.com/CreepyCrafter24/UpTool2/releases/download/v1.10/UpTool2.exe + 27139FF2797C25C04100F1BF587C4F10BB2C1B7C837052906414F831F2B8CB10 \ No newline at end of file diff --git a/UpTool2/Program.cs b/UpTool2/Program.cs index 2f23b1d..4f58abd 100644 --- a/UpTool2/Program.cs +++ b/UpTool2/Program.cs @@ -12,6 +12,7 @@ using System.Windows.Forms; using System.Xml.Linq; using System.Drawing; using System.Linq; +using System.Collections.Generic; namespace UpTool2 { @@ -80,13 +81,16 @@ namespace UpTool2 Directory.CreateDirectory(dir + @"\Apps"); string xml = dir + @"\info.xml"; string metaXml = "https://raw.githubusercontent.com/CreepyCrafter24/UpTool2/master/Meta.xml"; - if (!File.Exists(xml)) + if ((!File.Exists(xml)) || XDocument.Load(xml).Element("meta") == null || XDocument.Load(xml).Element("meta").Element("Repos") == null || XDocument.Load(xml).Element("meta").Element("Repos").Elements("Repo").Count() == 0) new XElement("meta", new XElement("Version", 0), new XElement("Repos", new XElement("Repo", new XElement("Name", "UpTool2 official Repo"), new XElement("Link", "https://raw.githubusercontent.com/CreepyCrafter24/UpTool2/master/Repo.xml"))), new XElement("LocalRepo")).Save(xml); else { //Update old app repo to in-git repo XDocument x = XDocument.Load(xml); - x.Element("meta").Element("Repos").Elements("Repo").Select(s => s.Element("Link")).Where(s => s.Value == "https://github.com/CreepyCrafter24/UpTool2/releases/download/Repo/Repo.xml").ToList().ForEach(s => s.Value = "https://raw.githubusercontent.com/CreepyCrafter24/UpTool2/master/Repo.xml"); + XElement meta = x.Element("meta"); + XElement repos = meta.Element("Repos"); + IEnumerable reposa = repos.Elements("Repo"); + reposa.Select(s => s.Element("Link")).Where(s => s.Value == "https://github.com/CreepyCrafter24/UpTool2/releases/download/Repo/Repo.xml").ToList().ForEach(s => s.Value = "https://raw.githubusercontent.com/CreepyCrafter24/UpTool2/master/Repo.xml"); x.Save(xml); } online = Ping(metaXml);