Layout for ProjectJson support

Author: JoshVarty

src/SourceBrowser.Generator/SolutionAnalyzer.cs

@@ -21,6 +21,7 @@ namespace SourceBrowser.Generator
 {
     public class SolutionAnalayzer
     {
+        public bool WorkspaceFailed { get; set; } 
         MSBuildWorkspace _workspace;
         Solution _solution;
         private ReferencesourceLinkProvider _refsourceLinkProvider = new ReferencesourceLinkProvider();
@@ -35,6 +36,7 @@ public SolutionAnalayzer(string solutionPath)
 
         private void _workspace_WorkspaceFailed(object sender, WorkspaceDiagnosticEventArgs e)
         {
+            WorkspaceFailed = true;
             try
             {
                 var logDirectory = System.Web.Hosting.HostingEnvironment.MapPath("/WorkspaceLogs/");

src/SourceBrowser.Site/Controllers/UploadController.cs

@@ -7,7 +7,7 @@
     using SourceBrowser.Site.Repositories;
     using System;
     using System.Linq;
-
+    using Generator.Model;
     public class UploadController : Controller
     {
         // GET: Upload
@@ -62,49 +62,45 @@ public ActionResult Submit(string githubUrl)
                 var omnisharpPaths = Directory.GetFiles(repoRootPath, "omnisharp.json", SearchOption.AllDirectories);
                 var projectJsonPaths= Directory.GetFiles(repoRootPath, "project.json", SearchOption.AllDirectories);
 
-                // TODO: Use parallel for.
-                // TODO: Process all solutions.
-                // For now, we're assuming the shallowest and shortest .sln file is the one we're interested in
-                foreach (var solutionPath in solutionPaths.OrderBy(n => n.Length).Take(1))
-                {
-                    try
-                    {
-                        var workspaceModel = UploadRepository.ProcessSolution(solutionPath, repoRootPath);
-
-                        //One pass to lookup all declarations
-                        var typeTransformer = new TokenLookupTransformer();
-                        typeTransformer.Visit(workspaceModel);
-                        var tokenLookup = typeTransformer.TokenLookup;
-
-                        //Another pass to generate HTMLs
-                        var htmlTransformer = new HtmlTransformer(tokenLookup, repoPath);
-                        htmlTransformer.Visit(workspaceModel);
+                string solutionPath = solutionPaths.OrderBy(n => n.Length).FirstOrDefault();
+                string omnisharpPath = omnisharpPaths.OrderBy(n => n.Length).FirstOrDefault();
 
-                        var searchTransformer = new SearchIndexTransformer(retriever.UserName, retriever.RepoName);
-                        searchTransformer.Visit(workspaceModel);
+                WorkspaceModel workspaceModel = null;
+                if(solutionPath != null)
+                {
+                    workspaceModel = UploadRepository.ProcessSolution(solutionPath, repoRootPath);
+                }
 
-                        // Generate HTML of the tree view
-                        var treeViewTransformer = new TreeViewTransformer(repoPath, retriever.UserName, retriever.RepoName);
-                        treeViewTransformer.Visit(workspaceModel);
-                    }
-                    catch (Exception ex)
-                    {
-                        // TODO: Log this
-                        ViewBag.Error = "There was an error processing solution " + Path.GetFileName(solutionPath);
-                        return View("Index");
-                    }
+                if(workspaceModel == null && omnisharpPath != null)
+                {
+                    workspaceModel = UploadRepository.ProcessOmnisharp(omnisharpPath, repoRootPath);
                 }
 
-                try
+                if(workspaceModel == null && projectJsonPaths.Count() > 0)
                 {
-                    UploadRepository.SaveReadme(repoPath, retriever.ProvideParsedReadme());
+                    workspaceModel = UploadRepository.ProcessProjectJson(projectJsonPaths, repoRootPath);
                 }
-                catch (Exception ex)
+
+                if (workspaceModel != null)
                 {
-                    // TODO: Log and swallow - readme is not essential.
+                    //One pass to lookup all declarations
+                    var typeTransformer = new TokenLookupTransformer();
+                    typeTransformer.Visit(workspaceModel);
+                    var tokenLookup = typeTransformer.TokenLookup;
+
+                    //Another pass to generate HTMLs
+                    var htmlTransformer = new HtmlTransformer(tokenLookup, repoPath);
+                    htmlTransformer.Visit(workspaceModel);
+
+                    var searchTransformer = new SearchIndexTransformer(retriever.UserName, retriever.RepoName);
+                    searchTransformer.Visit(workspaceModel);
+
+                    // Generate HTML of the tree view
+                    var treeViewTransformer = new TreeViewTransformer(repoPath, retriever.UserName, retriever.RepoName);
+                    treeViewTransformer.Visit(workspaceModel);
+                    processingSuccessful = true;
                 }
 
-                processingSuccessful = true;
                 return Redirect("/Browse/" + retriever.UserName + "/" + retriever.RepoName);
             }
             finally

src/SourceBrowser.Site/Repositories/UploadRepository.cs

@@ -7,6 +7,7 @@
 using System.Security;
 using System.IO;
 using System.Configuration;
+using SourceBrowser.Generator.Model;
 
 namespace SourceBrowser.Site.Repositories
 {
@@ -18,7 +19,7 @@ public class UploadRepository
         [DllImport("kernel32.dll", CharSet = CharSet.Auto)]
         private extern static bool CloseHandle(IntPtr handle);
 
-        internal static Generator.Model.WorkspaceModel ProcessSolution(string solutionPath, string repoRootPath)
+        internal static WorkspaceModel ProcessSolution(string solutionPath, string repoRootPath)
         {
             SafeTokenHandle safeTokenHandle;
             string safeUserName = ConfigurationManager.AppSettings["safeUserName"];
@@ -28,6 +29,11 @@ internal static Generator.Model.WorkspaceModel ProcessSolution(string solutionPa
             if (String.IsNullOrEmpty(safeUserName))
             {
                 var sourceGenerator = new Generator.SolutionAnalayzer(solutionPath);
+                if(sourceGenerator.WorkspaceFailed)
+                {
+                    return null;
+                }
+
                 var workspaceModel = sourceGenerator.BuildWorkspaceModel(repoRootPath);
                 return workspaceModel;
             }
@@ -54,13 +60,27 @@ internal static Generator.Model.WorkspaceModel ProcessSolution(string solutionPa
                 using (WindowsImpersonationContext impersonatedUser = WindowsIdentity.Impersonate(safeTokenHandle.DangerousGetHandle()))
                 {
                     var sourceGenerator = new Generator.SolutionAnalayzer(solutionPath);
+                    if (sourceGenerator.WorkspaceFailed)
+                    {
+                        return null;
+                    }
                     var workspaceModel = sourceGenerator.BuildWorkspaceModel(repoRootPath);
                     return workspaceModel;
                 }
                 // Releasing the context object stops the impersonation 
             }
         }
 
+        internal static WorkspaceModel ProcessOmnisharp(string omnisharpPath, string repoRootPath)
+        {
+            throw new NotImplementedException();
+        }
+
+        internal static WorkspaceModel ProcessProjectJson(string[] projectJsonPaths, string repoRootPath)
+        {
+            throw new NotImplementedException();
+        }
+
         internal static void SaveReadme(string repoPath, string readmeInHtml)
         {
             string readmePath = Path.Combine(repoPath, "readme.html");