Adds arg to supress auto opening of browser for html output. Issue for docker.

Author: Guy Acosta

AppInspector/AppInspector.csproj

@@ -14,14 +14,14 @@
     <PackageId>ApplicationInspector</PackageId>
     <Product>Application Inspector</Product>
     <Authors>Microsoft</Authors>
-    <Version>1.0.26</Version>
+    <Version>1.0.28</Version>
     <AssemblyName>AppInspector</AssemblyName>
     <RootNamespace>ApplicationInspector</RootNamespace>
     <StartupObject>Microsoft.AppInspector.Program</StartupObject>
     <Company>Microsoft</Company>
     <SignAssembly>true</SignAssembly>
-    <AssemblyVersion>1.0.26.0</AssemblyVersion>
-    <FileVersion>1.0.26.0</FileVersion>
+    <AssemblyVersion>1.0.28.0</AssemblyVersion>
+    <FileVersion>1.0.28.0</FileVersion>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 

AppInspector/AppMetaData.cs

@@ -49,6 +49,8 @@ public class AppProfile
         public bool SimpleTagsOnly { get; set; }
         [JsonIgnore]
         public bool UniqueTagsOnly { get; }
+        [JsonIgnore]
+        public bool AutoBrowserOpen { get; set; }
 
 
         /// <summary>
@@ -59,7 +61,7 @@ public class AppProfile
         /// <param name="excludeRollup">omit aggregated rollup e.g. simple output with matches</param>
         /// <param name="simpleTagsOnly">simple output override</param>
         /// <param name="uniqueTagsOnly">avoid duplicate tag reporting</param>
-        public AppProfile(string sourcePath, List<string> rulePaths, bool excludeRollup, bool simpleTagsOnly, bool uniqueTagsOnly)
+        public AppProfile(string sourcePath, List<string> rulePaths, bool excludeRollup, bool simpleTagsOnly, bool uniqueTagsOnly, bool autoOpenBrowser=true)
         {
             SourcePath = sourcePath;
             Version = Program.GetVersion();
@@ -76,6 +78,7 @@ public AppProfile(string sourcePath, List<string> rulePaths, bool excludeRollup,
             ExcludeRollup = excludeRollup;
             SimpleTagsOnly = simpleTagsOnly;
             UniqueTagsOnly = uniqueTagsOnly;
+            AutoBrowserOpen = autoOpenBrowser;
 
             MetaData = new AppMetaData(sourcePath, rulePaths)
             {

AppInspector/Commands/AnalyzeCommand.cs

@@ -61,6 +61,7 @@ public DateTime LastUpdated
         private string _arg_customRulesPath;
         private bool _arg_ignoreDefaultRules;
         private bool _arg_outputUniqueTagsOnly;
+        private bool _arg_autoBrowserOpen;
         private string _arg_confidenceFilters;
         private bool _arg_simpleTagsOnly;
         private Confidence _arg_confidence;
@@ -79,6 +80,7 @@ public AnalyzeCommand(AnalyzeCommandOptions opts)
             _arg_outputUniqueTagsOnly = !opts.AllowDupTags;
             _arg_customRulesPath = opts.CustomRulesPath;
             _arg_confidenceFilters = opts.ConfidenceFilters;
+            _arg_autoBrowserOpen = !opts.AutoBrowserOpen;
             _arg_ignoreDefaultRules = opts.IgnoreDefaultRules;
             _arg_simpleTagsOnly = opts.SimpleTagsOnly;
 
@@ -185,7 +187,7 @@ void ConfigRules()
                 }
             }
 
-            _appProfile = new AppProfile(_arg_sourcePath, rulePaths, false, _arg_simpleTagsOnly, _arg_outputUniqueTagsOnly);
+            _appProfile = new AppProfile(_arg_sourcePath, rulePaths, false, _arg_simpleTagsOnly, _arg_outputUniqueTagsOnly, _arg_autoBrowserOpen);
             _appProfile.Args = "analyze -f " + _arg_fileFormat + " -u " + _arg_outputUniqueTagsOnly.ToString().ToLower() + " -v " +
                 WriteOnce.Verbosity.ToString() + " -x " + _arg_confidence + " -i " + _arg_ignoreDefaultRules.ToString().ToLower();
         }
@@ -289,7 +291,11 @@ public int Run()
             else if (_appProfile.MatchList.Count == 0)
                 WriteOnce.Error(ErrMsg.GetString(ErrMsg.ID.ANALYZE_NOPATTERNS));
             else
+            {
                 WriteOnce.Operation(ErrMsg.FormatString(ErrMsg.ID.CMD_COMPLETED, "Analyze"));
+                if (!_arg_autoBrowserOpen)
+                    WriteOnce.Any(ErrMsg.FormatString(ErrMsg.ID.ANALYZE_OUTPUT_FILE, "output.html"));
+            }
 
             return _appProfile.MatchList.Count() == 0 ? (int)ExitCode.NoMatches :
                 (int)ExitCode.MatchesFound;

AppInspector/Program.cs

@@ -46,6 +46,9 @@ public class AnalyzeCommandOptions
         [Option('d', "allow-dup-tags", Required = false, HelpText = "Output contains unique and non-unique tag matches", Default = false)]
         public bool AllowDupTags { get; set; }
 
+        [Option('b', "supress-browser-open", Required = false, HelpText = "HTML formatted output is automatically opened to default browser", Default = false)]
+        public bool AutoBrowserOpen { get; set; }
+
         [Option('c', "confidence-filters", Required = false, HelpText = "Output only matches with specified confidence <value>,<value> [high|medium|low]", Default = "high,medium")]
         public string ConfidenceFilters { get; set; }
 

AppInspector/Properties/launchSettings.json

@@ -1,7 +1,8 @@
 {
   "profiles": {
     "ApplicationInspector": {
-      "commandName": "Project"
+      "commandName": "Project",
+      "commandLineArgs": "analyze -s c:\\temp\\main.cpp -b"
     }
   }
 }

AppInspector/Writers/LiquidWriter.cs

@@ -83,7 +83,8 @@ public override void WriteApp(AppProfile app)
                 WriteOnce.Info(ErrMsg.GetString(ErrMsg.ID.ANALYZE_REPORTSIZE_WARN));
             }  
 
-            Utils.OpenBrowser(htmlOutputFilePath);
+            if (app.AutoBrowserOpen)
+                Utils.OpenBrowser(htmlOutputFilePath);
         }