PR Feedback, improve font correlation data

Author: dkbennett

doc/ReleaseNotes.md

@@ -24,4 +24,4 @@ Manifest Schema version updated to 1.12.0 to add support for fonts.
 
 Experimental initial Font Install and Uninstall via manifest for user and machine scopes has been added.
 
-The font 'list' command has been updated with a new '--files' feature for an alternate view of the installed fonts.
+The font 'list' command has been updated with a new '--details' feature for an alternate view of the installed fonts.

src/AppInstallerCLICore/Argument.cpp

@@ -203,8 +203,8 @@ namespace AppInstaller::CLI
         // Font command
         case Execution::Args::Type::Family:
             return { type, "family"_liv, ArgTypeCategory::None };
-        case Execution::Args::Type::Files:
-            return { type, "files"_liv, ArgTypeCategory::None };
+        case Execution::Args::Type::Details:
+            return { type, "details"_liv, ArgTypeCategory::None };
 
         // Configuration commands
         case Execution::Args::Type::ConfigurationFile:
@@ -474,8 +474,8 @@ namespace AppInstaller::CLI
             return Argument{ type, Resource::String::NoProxyArgumentDescription, ArgumentType::Flag, TogglePolicy::Policy::ProxyCommandLineOptions, BoolAdminSetting::ProxyCommandLineOptions };
         case Args::Type::Family:
             return Argument{ type, Resource::String::FontFamilyNameArgumentDescription, ArgumentType::Positional, false };
-        case Args::Type::Files:
-            return Argument{ type, Resource::String::FontFilesArgumentDescription, ArgumentType::Flag, false };
+        case Args::Type::Details:
+            return Argument{ type, Resource::String::FontDetailsArgumentDescription, ArgumentType::Flag, false };
         case Args::Type::Correlation:
             return Argument{ type, Resource::String::CorrelationArgumentDescription, ArgumentType::Standard, Argument::Visibility::Hidden };
         default:

src/AppInstallerCLICore/Commands/FontCommand.cpp

@@ -51,7 +51,7 @@ namespace AppInstaller::CLI
     {
         return {
             Argument::ForType(Args::Type::Family),
-            Argument::ForType(Args::Type::Files),
+            Argument::ForType(Args::Type::Details),
         };
     }
 

src/AppInstallerCLICore/ExecutionArgs.h

@@ -125,7 +125,7 @@ namespace AppInstaller::CLI::Execution
 
             // Font Command
             Family,
-            Files,
+            Details,
 
             // Stub package (extended features)
             ExtendedFeaturesEnable,

src/AppInstallerCLICore/Resources.h

@@ -311,7 +311,7 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(FontFamily);
         WINGET_DEFINE_RESOURCE_STRINGID(FontFamilyNameArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(FontFileNotSupported);
-        WINGET_DEFINE_RESOURCE_STRINGID(FontFilesArgumentDescription);
+        WINGET_DEFINE_RESOURCE_STRINGID(FontDetailsArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(FontFilePaths);
         WINGET_DEFINE_RESOURCE_STRINGID(FontInstallFailed);
         WINGET_DEFINE_RESOURCE_STRINGID(FontListCommandLongDescription);

src/AppInstallerCLICore/Workflows/FontFlow.cpp

@@ -139,7 +139,7 @@ namespace AppInstaller::CLI::Workflow
 
             OutputInstalledFontFacesTable(context, lines);
         }
-        else if (context.Args.Contains(Args::Type::Files))
+        else if (context.Args.Contains(Args::Type::Details))
         {
             const auto& fontFiles = AppInstaller::Fonts::GetInstalledFontFiles();
             std::vector<InstalledFontFilesTableLine> lines;
@@ -159,19 +159,9 @@ namespace AppInstaller::CLI::Workflow
                     break;
                 }
 
-                std::wstring packageId;
-                if (!fontFile.PackageId.empty())
-                {
-                    packageId = fontFile.PackageId;
-                }
-                else
-                {
-                    packageId = fontFile.PackageIdentifier;
-                }
-
                 InstalledFontFilesTableLine line(
                     Utility::LocIndString(Utility::ConvertToUTF8(fontFile.Title)),
-                    Utility::LocIndString(Utility::ConvertToUTF8(packageId)),
+                    Utility::LocIndString(Utility::ConvertToUTF8(fontFile.PackageIdentifier)),
                     status,
                     fontFile.FilePath.u8string());
 
@@ -267,6 +257,7 @@ namespace AppInstaller::CLI::Workflow
                 AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_FONT_INSTALL_FAILED);
             }
 
+            context.Add<Execution::Data::CorrelatedAppsAndFeaturesEntries>({ fontContext.GetAppsAndFeaturesEntry() });
             context.Add<Execution::Data::OperationReturnCode>(installResult.HResult);
         }
         catch (...)
@@ -317,9 +308,9 @@ namespace AppInstaller::CLI::Workflow
             }
             else
             {
-                const std::string packageId = context.Get<Execution::Data::InstalledPackageVersion>()->GetProperty(AppInstaller::Repository::PackageVersionProperty::Id);
+                const std::string moniker = context.Get<Execution::Data::InstalledPackageVersion>()->GetProperty(AppInstaller::Repository::PackageVersionProperty::Moniker);
                 const std::string version = context.Get<Execution::Data::InstalledPackageVersion>()->GetProperty(AppInstaller::Repository::PackageVersionProperty::Version);
-                fontContext.PackageId = ConvertToUTF16(packageId);
+                fontContext.PackageId = ConvertToUTF16(moniker);
                 fontContext.PackageVersion = ConvertToUTF16(version);
                 fontContext.Scope = scope;
             }

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

@@ -3426,8 +3426,8 @@ An unlocalized JSON fragment will follow on another line.</comment>
   <data name="APPINSTALLER_CLI_ERROR_FONT_ROLLBACK_FAILED" xml:space="preserve">
     <value>Font rollback failed. The font may not be in a good state. Try uninstalling after a restart.</value>
   </data>
-  <data name="FontFilesArgumentDescription" xml:space="preserve">
-    <value>Show fonts by installed font file</value>
+  <data name="FontDetailsArgumentDescription" xml:space="preserve">
+    <value>Show font file detailed information.</value>
   </data>
   <data name="FontValidationFailed" xml:space="preserve">
     <value>Validation of the font package failed.</value>

src/AppInstallerCLITests/AppInstallerCLITests.vcxproj.filters

@@ -386,6 +386,9 @@
     <ClCompile Include="ContextOrchestrator.cpp">
       <Filter>Source Files\CLI</Filter>
     </ClCompile>
+    <ClCompile Include="FontHelper.cpp">
+      <Filter>Source Files\Repository</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="PropertySheet.props" />