Implémentation de la publication d'un billet

src/Yavsc/Controllers/Communicating/BlogspotController.cs

@@ -1,22 +1,14 @@
-
-using System.Linq;
 using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Authorization;
 using Yavsc.Models;
 using Yavsc.ViewModels.Auth;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Yavsc.Models.Blog;
 using Yavsc.Helpers;
-using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.Options;
 using Microsoft.EntityFrameworkCore;
-using System.Diagnostics;
 using Yavsc.ViewModels.Blog;
-using System.Collections;
 
 // For more information on enabling Web API for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
 
@@ -69,12 +61,13 @@ namespace Yavsc.Controllers
             }
             else 
             {
-                 posts = _context.BlogSpot
-                .Include(b => b.Author)
-                .Include(p=>p.ACL)
-                .Include(p=>p.Tags)
-                .Include(p=>p.Comments)
-                .Where(p => p.ACL.Count == 0 ).ToArray();
+                 posts = _context.blogspotPublications
+                 .Include(p=>p.BlogPost)
+                .Include(b => b.BlogPost.Author)
+                .Include(p=>p.BlogPost.ACL)
+                .Include(p=>p.BlogPost.Tags)
+                .Include(p=>p.BlogPost.Comments)
+                .Where(p => p.BlogPost.ACL.Count == 0 ).Select(p=>p.BlogPost).ToArray();
             }
           
             var data = posts.OrderByDescending( p=> p.DateCreated);

src/Yavsc/Helpers/AsciiDocTagHelper.cs

@@ -6,9 +6,9 @@ namespace Yavsc.Helpers
 {
     public class AsciidocTagHelper : TagHelper
     {
-        public override async Task ProcessAsync (TagHelperContext context, TagHelperOutput output)
+        public override async Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
         {
-            if (context.AllAttributes.ContainsName ("summary"))
+            if (context.AllAttributes.ContainsName("summary"))
             {
                 var summaryLength = context.AllAttributes["summary"].Value;
             }
@@ -16,12 +16,23 @@ namespace Yavsc.Helpers
             var content = await output.GetChildContentAsync();
             string text = content.GetContent();
             if (string.IsNullOrWhiteSpace(text)) return;
-            Document document = Document.Parse(text);
-            var html = document.ToHtml(2);
-            using var stringWriter = new StringWriter();
-            html.WriteTo(stringWriter, HtmlEncoder.Default);
-            var processedHere = stringWriter.ToString();
-            output.Content.AppendHtml(processedHere);
+            try
+            {
+
+                Document document = Document.Parse(text);
+                var html = document.ToHtml(2);
+                using var stringWriter = new StringWriter();
+                html.WriteTo(stringWriter, HtmlEncoder.Default);
+                var processedHere = stringWriter.ToString();
+                output.Content.AppendHtml(processedHere);
+            }
+            catch (ArgumentException ex)
+            {
+                // silently render the text
+                output.Content.AppendHtml("<pre>" + text + "</pre>\n");
+                // and an error
+                output.Content.AppendHtml("<pre class=\"parsingError\">" + ex.Message + "</pre>\n");
+            }
         }
     }
 }

src/Yavsc/Makefile

@@ -1,6 +1,6 @@
 DESTDIR=/srv/www/yavsc
 CONFIGURATION=Release
-USER=www-data
+USER_AND_GROUP=www-data:www-data
 SERVICE_PROD=yavsc
 DOTNET_FRAMEWORK=net9.0
 
@@ -22,7 +22,7 @@ install_service:
 pushInProd: publish
 	sudo systemctl stop $(SERVICE_PROD) 
 	sudo cp -a bin/$(CONFIGURATION)/$(DOTNET_FRAMEWORK)/publish/* $(DESTDIR)
-	sudo chown -R $(USER) $(DESTDIR)
+	sudo chown -R $(USER_AND_GROUP) $(DESTDIR)
 	sudo sync
 	sudo systemctl start $(SERVICE_PROD)
 

src/Yavsc/Views/Blogspot/Index.cshtml

@@ -47,6 +47,7 @@
 <div class="container">
      
 <table class="table">
+    
 @foreach (var group in Model) {
     var title = group.Key ?? "@";
     string secondclass="";
@@ -95,6 +96,6 @@
 }
 </table>
 
-
+@if(Model.Count()==0){<p>Néant</p>}
 
 </div>