Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

Add meta data (attributes) to the node of the package to install #100

Merged
merged 1 commit into from
Jan 8, 2022
Merged

Add meta data (attributes) to the node of the package to install #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/TIW11/Resources/data/packages11.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@
<App name="Audacity.Audacity"/>
<App name="XBMCFoundation.Kodi"/>
<App name="VideoLAN.VLC"/>
<App name="yt-dlg.yt-dlg"/>
<App id="yt-dlg.yt-dlg" name="yt-dlg"/>
</Category>

<Category name="File Archivers">
<App name="7zip.7zip"/>
<App name="Bandisoft.Bandizip"/>
<App name="RARLab.WinRAR"/>
<App name="yt-dlg.yt-dlg"/>
<App id="yt-dlg.yt-dlg" name="yt-dlg"/>
<App id="9N4P75DXL6FG" name="WSATools" />
</Category>

<Category name="Frameworks">
Expand Down
21 changes: 16 additions & 5 deletions src/TIW11/Views/PackagesWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,13 @@ private void IntializePackages(TreeView treeview)
moduleNode.Nodes.Add(categories.Attribute("name").Value);
foreach (XElement category in categories.Descendants("App"))
{
categoriesNode.Nodes.Add(category.Attribute("name").Value);
if (category.Attribute("id") != null) {
categoriesNode.Nodes.Add(category.Attribute("id").Value, category.Attribute("name").Value);
}
else
{
categoriesNode.Nodes.Add(category.Attribute("name").Value);
}
}
}
}
Expand All @@ -84,6 +90,11 @@ private void IntializePackages(TreeView treeview)
{ MessageBox.Show("Packages database could not be found.\nPlease make sure that a \"packages*.xml\" file is available in the data directory of this app.", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning); }
}

private string NodeText(TreeNode node)
{
return node.Name == "" ? node.Text : node.Name;
}

private IEnumerable<TreeNode> CollectPackages(TreeNodeCollection nodes)
{
foreach (TreeNode node in nodes)
Expand Down Expand Up @@ -115,8 +126,8 @@ private void btnCreatePackage_Click(object sender, EventArgs e)
if (node.Checked)

{
selectedItems.Add("winget install --id=" + node.Text + " -e");
message.AppendLine("- " + node.Text);
selectedItems.Add("winget install --id=" + NodeText(node) + " -e");
message.AppendLine("- " + NodeText(node));
}
}

Expand Down Expand Up @@ -147,12 +158,12 @@ private async void btnRunPackage_Click(object sender, EventArgs e)
progress.Style = ProgressBarStyle.Marquee;
progress.MarqueeAnimationSpeed = 30;
rtbPS.Clear();
message.AppendLine("- " + node.Text);
message.AppendLine("- " + NodeText(node));

rtbPS.Text += Environment.NewLine + "Installing " + Environment.NewLine + message.ToString() +
Environment.NewLine + "You can continue working while we install.";

await Task.Run(() => InstallPackages("winget install --id=" + node.Text + " -e --accept-package-agreements --accept-source-agreements"));
await Task.Run(() => InstallPackages("winget install --id=" + NodeText(node) + " -e --accept-package-agreements --accept-source-agreements"));
}
}

Expand Down