UpTool
/
UpTool2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix applinks

This commit is contained in:
CreepyCrafter24 2020-03-13 20:58:08 +01:00
parent 07d8649bb2
commit 59809bf9ec
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UpTool2/MainForm.cs
View File

@ -168,11 +168,6 @@ namespace UpTool2
private void Action_run_Click(object sender, EventArgs e)
{
Console.WriteLine(new string('-', 10));
Console.WriteLine(((App) action_run.Tag).dataPath);
Console.WriteLine("\\");
Console.WriteLine(((App) action_run.Tag).MainFile);
Console.WriteLine(((App) action_run.Tag).dataPath);
string path = Path.Combine(((App) action_run.Tag).dataPath, ((App) action_run.Tag).MainFile);
try
{

2
UpTool2/Program.cs
View File

@ -53,7 +53,7 @@ namespace UpTool2
catch (AbandonedMutexException)
{
#if DEBUG
Console.WriteLine("Mutex abandoned");
Debug.WriteLine("Mutex abandoned");
#endif
hasHandle = true;
}

11
UpTool2/Tool/RepoManagement.cs
View File

@ -8,6 +8,7 @@ using System.Linq;
using System.Net;
using System.Windows.Forms;
using System.Xml.Linq;
using CC_Functions.Misc;
using UpTool2.DataStructures;
using UpTool2.Properties;
@ -31,7 +32,7 @@ namespace UpTool2.Tool
try
{
#endif
XDocument repo = XDocument.Load(repArr[i]);
XDocument repo = XDocument.Load(new Uri(repArr[i]).Unshorten().AbsoluteUri);
repArr.AddRange(repo.Element("repo").Elements("repolink").Select(s => s.Value)
.Where(s => !repArr.Contains(s)));
XElement[] tmp_apparray = repo.Element("repo").Elements("app").Where(app =>
@ -40,7 +41,7 @@ namespace UpTool2.Tool
.Where(a => a.Element("ID").Value == app.Element("ID").Value).Any(a =>
GetVer(a.Element("Version")) >= app.Element("Version").GetVer())).ToArray()
.Concat(repo.Element("repo").Elements("applink")
.Select(s => XDocument.Load(s.Value).Element("app"))).ToArray();
.Select(s => XDocument.Load(new Uri(s.Value).Unshorten().AbsoluteUri).Element("app"))).ToArray();
for (int i1 = 0; i1 < tmp_apparray.Length; i1++)
{
XElement app = tmp_apparray[i1];
@ -62,7 +63,7 @@ namespace UpTool2.Tool
try
{
//Scale Image and save as Base64
Image src = Image.FromStream(client.OpenRead(app.Element("Icon").Value));
Image src = Image.FromStream(client.OpenRead(new Uri(app.Element("Icon").Value).Unshorten()));
Bitmap dest = new Bitmap(70, 70);
dest.SetResolution(src.HorizontalResolution, src.VerticalResolution);
using (Graphics g = Graphics.FromImage(dest))
@ -142,10 +143,6 @@ namespace UpTool2.Tool
? app.Element("MainFile") == null ? "" : app.Element("MainFile").Value
: locIn.Element("MainFile").Value
));
#if DEBUG
Console.WriteLine(locIn.Element("MainFile") == null ? "NULL" : locIn.Element("MainFile").Value);
Console.WriteLine(GlobalVariables.Apps[id].MainFile);
#endif
});
Directory.GetDirectories(PathTool.appsPath)
.Where(s => Guid.TryParse(Path.GetFileName(s), out Guid guid) &&