Skip to content

Commit

Permalink
Merge #4262 Include supports relationship in ckan show
Browse files Browse the repository at this point in the history
  • Loading branch information
HebaruSan committed Nov 21, 2024
2 parents b3ecbda + 3c33835 commit d6a721a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
- [Multiple] Start installing mods while downloads are still in progress (#4249, #4255 by: HebaruSan)
- [Multiple] Sort dependencies first in modpacks (#4252 by: HebaruSan)
- [Multiple] Allow installs and removals to be cancelled (#4253 by: HebaruSan)
- [CLI] Include `supports` relationship in `ckan show` (#4262 by: HebaruSan)

### Bugfixes

Expand Down
22 changes: 16 additions & 6 deletions Cmdline/Action/Show.cs
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ private int ShowMod(CkanModule module, ShowOptions opts)
{
user.RaiseMessage("");
user.RaiseMessage(Properties.Resources.ShowDependsHeader);
foreach (RelationshipDescriptor dep in module.depends)
foreach (var dep in module.depends)
{
user.RaiseMessage(" - {0}", RelationshipToPrintableString(dep));
}
Expand All @@ -227,27 +227,37 @@ private int ShowMod(CkanModule module, ShowOptions opts)
{
user.RaiseMessage("");
user.RaiseMessage(Properties.Resources.ShowRecommendsHeader);
foreach (RelationshipDescriptor dep in module.recommends)
foreach (var rec in module.recommends)
{
user.RaiseMessage(" - {0}", RelationshipToPrintableString(dep));
user.RaiseMessage(" - {0}", RelationshipToPrintableString(rec));
}
}

if (module.suggests != null && module.suggests.Count > 0)
{
user.RaiseMessage("");
user.RaiseMessage(Properties.Resources.ShowSuggestsHeader);
foreach (RelationshipDescriptor dep in module.suggests)
foreach (var sug in module.suggests)
{
user.RaiseMessage(" - {0}", RelationshipToPrintableString(dep));
user.RaiseMessage(" - {0}", RelationshipToPrintableString(sug));
}
}

if (module.supports != null && module.supports.Count > 0)
{
user.RaiseMessage("");
user.RaiseMessage(Properties.Resources.ShowSupportsHeader);
foreach (var sup in module.supports)
{
user.RaiseMessage(" - {0}", RelationshipToPrintableString(sup));
}
}

if (module.provides != null && module.provides.Count > 0)
{
user.RaiseMessage("");
user.RaiseMessage(Properties.Resources.ShowProvidesHeader);
foreach (string prov in module.provides)
foreach (var prov in module.provides)
{
user.RaiseMessage(" - {0}", prov);
}
Expand Down
1 change: 1 addition & 0 deletions Cmdline/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ Try `ckan list` for a list of installed mods.</value></data>
<data name="ShowDependsHeader" xml:space="preserve"><value>Depends:</value></data>
<data name="ShowRecommendsHeader" xml:space="preserve"><value>Recommends:</value></data>
<data name="ShowSuggestsHeader" xml:space="preserve"><value>Suggests:</value></data>
<data name="ShowSupportsHeader" xml:space="preserve"><value>Supports:</value></data>
<data name="ShowProvidesHeader" xml:space="preserve"><value>Provides:</value></data>
<data name="ShowResourcesHeader" xml:space="preserve"><value>Resources:</value></data>
<data name="ShowHomePage" xml:space="preserve"><value> Home page: {0}</value></data>
Expand Down

0 comments on commit d6a721a

Please sign in to comment.