From b07c3a9f110d673a179a7b725772c10645a29c9b Mon Sep 17 00:00:00 2001
From: Hamid Reza Mohammadi <mohammadi.hr@gmail.com>
Date: Wed, 6 Oct 2021 13:00:48 +0330
Subject: [PATCH] #219 support for VersePosition.Comment

---
 GanjooRazor/Areas/User/Pages/Editor.cshtml.cs          |  2 ++
 GanjooRazor/Areas/User/Pages/Translate.cshtml.cs       |  2 ++
 GanjooRazor/Pages/AudioClip.cshtml                     |  2 +-
 GanjooRazor/Pages/Bp.cshtml                            |  2 +-
 GanjooRazor/Pages/Error.cshtml                         |  2 +-
 GanjooRazor/Pages/Golha.cshtml                         |  2 +-
 GanjooRazor/Pages/Index.cshtml                         |  2 +-
 GanjooRazor/Pages/Login.cshtml                         |  2 +-
 GanjooRazor/Pages/Pin.cshtml                           |  2 +-
 GanjooRazor/Pages/ReportComment.cshtml                 |  2 +-
 GanjooRazor/Pages/ResetPassword.cshtml                 |  2 +-
 GanjooRazor/Pages/Search.cshtml                        |  2 +-
 GanjooRazor/Pages/Shared/_AdminLayout.cshtml           |  2 +-
 GanjooRazor/Pages/Shared/_Layout.cshtml                |  2 +-
 GanjooRazor/Pages/SignUp.cshtml                        |  2 +-
 GanjooRazor/Pages/Spotify.cshtml                       |  2 +-
 GanjooRazor/Pages/Trans.cshtml                         |  2 +-
 GanjooRazor/Pages/errors/404.cshtml                    |  2 +-
 GanjooRazor/wwwroot/css/p8.css                         |  4 ++--
 RMuseum/Models/Ganjoor/VersePosition.cs                |  4 ++++
 RMuseum/RMuseum.xml                                    |  5 +++++
 .../Services/Implementation/GanjoorNumberingService.cs |  2 +-
 .../GanjoorService-MySqlImports.cs                     | 10 ++++++++--
 .../GanjoorService-SQLiteUtils.cs                      |  5 +++++
 24 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs b/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
index 31d51428..0a4d8c6d 100644
--- a/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
+++ b/GanjooRazor/Areas/User/Pages/Editor.cshtml.cs
@@ -51,6 +51,8 @@ namespace GanjooRazor.Areas.User.Pages
                     return "پاراگراف نثر";
                 case VersePosition.Single:
                     return "نیمایی یا آزاد";
+                case VersePosition.Comment:
+                    return "توضیح";
             }
             return "نامعتبر";
         }
diff --git a/GanjooRazor/Areas/User/Pages/Translate.cshtml.cs b/GanjooRazor/Areas/User/Pages/Translate.cshtml.cs
index b8a664a1..a703fc78 100644
--- a/GanjooRazor/Areas/User/Pages/Translate.cshtml.cs
+++ b/GanjooRazor/Areas/User/Pages/Translate.cshtml.cs
@@ -65,6 +65,8 @@ namespace GanjooRazor.Areas.User.Pages
                     return "پاراگراف نثر";
                 case VersePosition.Single:
                     return "نیمایی یا آزاد";
+                case VersePosition.Comment:
+                    return "توضیح";
             }
             return "نامعتبر";
         }
diff --git a/GanjooRazor/Pages/AudioClip.cshtml b/GanjooRazor/Pages/AudioClip.cshtml
index 581fd0de..fd4477ea 100644
--- a/GanjooRazor/Pages/AudioClip.cshtml
+++ b/GanjooRazor/Pages/AudioClip.cshtml
@@ -15,7 +15,7 @@
         گنجور &raquo; نمایش خوانش
     </title>
     <link href="~/dist/skin/pink.flag/css/jplayer.pink.flag.min.css" rel="stylesheet" type="text/css" />
-    <link href="~/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="~/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script>
diff --git a/GanjooRazor/Pages/Bp.cshtml b/GanjooRazor/Pages/Bp.cshtml
index 94c678e1..7df4aa0b 100644
--- a/GanjooRazor/Pages/Bp.cshtml
+++ b/GanjooRazor/Pages/Bp.cshtml
@@ -11,7 +11,7 @@
     <title>انتخاب قطعهٔ موسیقی مرتبط با شعر از بیپتونز</title>
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
 
     <script src="/lib/jquery/dist/jquery.min.js"></script>
diff --git a/GanjooRazor/Pages/Error.cshtml b/GanjooRazor/Pages/Error.cshtml
index 270bdc58..628297a1 100644
--- a/GanjooRazor/Pages/Error.cshtml
+++ b/GanjooRazor/Pages/Error.cshtml
@@ -14,7 +14,7 @@
         @ViewData["Title"]
     </title>
 
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
 
diff --git a/GanjooRazor/Pages/Golha.cshtml b/GanjooRazor/Pages/Golha.cshtml
index 3b10e739..f84494d1 100644
--- a/GanjooRazor/Pages/Golha.cshtml
+++ b/GanjooRazor/Pages/Golha.cshtml
@@ -10,7 +10,7 @@
     <title>انتخاب قطعه‌ای از برنامهٔ گلها مرتبط با این شعر</title>
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/js/golha.js"></script>
diff --git a/GanjooRazor/Pages/Index.cshtml b/GanjooRazor/Pages/Index.cshtml
index 6e4f4fb8..f4d572eb 100644
--- a/GanjooRazor/Pages/Index.cshtml
+++ b/GanjooRazor/Pages/Index.cshtml
@@ -17,7 +17,7 @@
         <meta name="robots" content="noindex, nofollow" />
     }
     <link href="/dist/skin/blue.monday/css/jplayer.blue.monday.min.css" rel="stylesheet" type="text/css" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link href="/css/fab.css" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
diff --git a/GanjooRazor/Pages/Login.cshtml b/GanjooRazor/Pages/Login.cshtml
index 7daeb856..93261f95 100644
--- a/GanjooRazor/Pages/Login.cshtml
+++ b/GanjooRazor/Pages/Login.cshtml
@@ -13,7 +13,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <div id="hdr">
diff --git a/GanjooRazor/Pages/Pin.cshtml b/GanjooRazor/Pages/Pin.cshtml
index c3b95610..07cb292e 100644
--- a/GanjooRazor/Pages/Pin.cshtml
+++ b/GanjooRazor/Pages/Pin.cshtml
@@ -11,7 +11,7 @@
     <title>پیشنهاد شعر مرتبط با تصویر</title>
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
 
     <script src="/lib/jquery/dist//jquery.min.js"></script>
diff --git a/GanjooRazor/Pages/ReportComment.cshtml b/GanjooRazor/Pages/ReportComment.cshtml
index e896ec20..a75affe4 100644
--- a/GanjooRazor/Pages/ReportComment.cshtml
+++ b/GanjooRazor/Pages/ReportComment.cshtml
@@ -9,7 +9,7 @@
     <meta charset="utf-8" />
     <title>درخواست حذف حاشیه</title>
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <style>
     label{
 		width:100px;
diff --git a/GanjooRazor/Pages/ResetPassword.cshtml b/GanjooRazor/Pages/ResetPassword.cshtml
index 27003f28..67c16355 100644
--- a/GanjooRazor/Pages/ResetPassword.cshtml
+++ b/GanjooRazor/Pages/ResetPassword.cshtml
@@ -12,7 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <div id="hdr">
diff --git a/GanjooRazor/Pages/Search.cshtml b/GanjooRazor/Pages/Search.cshtml
index 481dfb1a..a8135da7 100644
--- a/GanjooRazor/Pages/Search.cshtml
+++ b/GanjooRazor/Pages/Search.cshtml
@@ -15,7 +15,7 @@
     @Html.Raw(ViewData["Title"])
   </title>
 
-  <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+  <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
   <link href="/css/fab.css" rel="stylesheet" type="text/css" />
   <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
   <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
index 146f6771..c988ec58 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
     <link href="/dist/skin/blue.monday/css/jplayer.blue.monday.min.css" rel="stylesheet" type="text/css" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link href="/css/fab.css" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
diff --git a/GanjooRazor/Pages/Shared/_Layout.cshtml b/GanjooRazor/Pages/Shared/_Layout.cshtml
index 7cb9efe3..55749ac9 100644
--- a/GanjooRazor/Pages/Shared/_Layout.cshtml
+++ b/GanjooRazor/Pages/Shared/_Layout.cshtml
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
     <link href="/dist/skin/blue.monday/css/jplayer.blue.monday.min.css" rel="stylesheet" type="text/css" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link href="/css/fab.css" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
diff --git a/GanjooRazor/Pages/SignUp.cshtml b/GanjooRazor/Pages/SignUp.cshtml
index 52c0a963..4b48355d 100644
--- a/GanjooRazor/Pages/SignUp.cshtml
+++ b/GanjooRazor/Pages/SignUp.cshtml
@@ -12,7 +12,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
 </head>
 <body>
     <div id="hdr">
diff --git a/GanjooRazor/Pages/Spotify.cshtml b/GanjooRazor/Pages/Spotify.cshtml
index 29dd0c92..5033c4c8 100644
--- a/GanjooRazor/Pages/Spotify.cshtml
+++ b/GanjooRazor/Pages/Spotify.cshtml
@@ -11,7 +11,7 @@
     <title>انتخاب قطعهٔ موسیقی مرتبط با شعر از اسپاتیفای</title>
     <meta name="robots" content="noindex, nofollow" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
 
     <script src="/lib/jquery/dist/jquery.min.js"></script>
diff --git a/GanjooRazor/Pages/Trans.cshtml b/GanjooRazor/Pages/Trans.cshtml
index 40736a19..72afecf7 100644
--- a/GanjooRazor/Pages/Trans.cshtml
+++ b/GanjooRazor/Pages/Trans.cshtml
@@ -14,7 +14,7 @@
         گنجور &raquo; برگردان‌ها و نویس‌های شعر
     </title>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
-    <link href="~/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="~/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
 </head>
diff --git a/GanjooRazor/Pages/errors/404.cshtml b/GanjooRazor/Pages/errors/404.cshtml
index 794e0f2e..2e77e7d9 100644
--- a/GanjooRazor/Pages/errors/404.cshtml
+++ b/GanjooRazor/Pages/errors/404.cshtml
@@ -14,7 +14,7 @@
         @ViewData["Title"]
     </title>
 
-    <link href="/css/p8.css?version=3" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=4" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
 
diff --git a/GanjooRazor/wwwroot/css/p8.css b/GanjooRazor/wwwroot/css/p8.css
index c725195b..92af9fd2 100644
--- a/GanjooRazor/wwwroot/css/p8.css
+++ b/GanjooRazor/wwwroot/css/p8.css
@@ -296,7 +296,7 @@ a img {
     background-color: #f99
 }
 
-div.spacer, .item, .b2 {
+div.spacer, .item, .b2, .c {
     clear: both;
 }
 
@@ -358,7 +358,7 @@ div.n, div.l {
     text-align: right;
 }
 
-.b2 p {
+.b2 p, .c p {
     text-align: center;
 }
 
diff --git a/RMuseum/Models/Ganjoor/VersePosition.cs b/RMuseum/Models/Ganjoor/VersePosition.cs
index 1bdc9913..09c366e3 100644
--- a/RMuseum/Models/Ganjoor/VersePosition.cs
+++ b/RMuseum/Models/Ganjoor/VersePosition.cs
@@ -29,6 +29,10 @@
         /// </summary>
         Single = 4, //مصرعهای شعرهای نیمایی یا آزاد
         /// <summary>
+        /// Comment 
+        /// </summary>
+        Comment = 5, //پاراگرافهایی که حالت توضیحی دارند
+        /// <summary>
         /// Non-poem paragraph
         /// </summary>
         Paragraph = -1, //نثر
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index 401bf2f6..57c0b38e 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -5844,6 +5844,11 @@
             Free form verse
             </summary>
         </member>
+        <member name="F:RMuseum.Models.Ganjoor.VersePosition.Comment">
+            <summary>
+            Comment 
+            </summary>
+        </member>
         <member name="F:RMuseum.Models.Ganjoor.VersePosition.Paragraph">
             <summary>
             Non-poem paragraph
diff --git a/RMuseum/Services/Implementation/GanjoorNumberingService.cs b/RMuseum/Services/Implementation/GanjoorNumberingService.cs
index 1bd373fc..e41214ec 100644
--- a/RMuseum/Services/Implementation/GanjoorNumberingService.cs
+++ b/RMuseum/Services/Implementation/GanjoorNumberingService.cs
@@ -281,7 +281,7 @@ namespace RMuseum.Services.Implementation
                             {
                                 totalVerseCount += await context.GanjoorVerses.Where(v => v.PoemId == poem.Id).CountAsync();
                                 var verses = await context.GanjoorVerses.AsNoTracking()
-                                                .Where(v => v.PoemId == poem.Id && v.VersePosition != VersePosition.Left && v.VersePosition != VersePosition.CenteredVerse2)
+                                                .Where(v => v.PoemId == poem.Id && v.VersePosition != VersePosition.Left && v.VersePosition != VersePosition.CenteredVerse2 && v.VersePosition != VersePosition.Comment)
                                                 .OrderBy(v => v.VOrder)
                                                 .ToListAsync();
                                 for (int coupletIndex = 0; coupletIndex < verses.Count; coupletIndex++)
diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-MySqlImports.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-MySqlImports.cs
index e705a7e5..903cd45f 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-MySqlImports.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-MySqlImports.cs
@@ -846,6 +846,8 @@ namespace RMuseum.Services.Implementation
             poemtext = poemtext.Replace("<div class=\"n\">", "s");
             poemtext = poemtext.Replace("<div class=\"l\"><p>", "l");
             poemtext = poemtext.Replace("<div class=\"l\">", "l");
+            poemtext = poemtext.Replace("<div class=\"c\"><p>", "c");
+            poemtext = poemtext.Replace("<div class=\"c\">", "c");
             poemtext = poemtext.Replace("<p>", "p");
             poemtext = poemtext.Replace("bmp", "b");
             poemtext = poemtext.Replace("np", "n");
@@ -859,7 +861,7 @@ namespace RMuseum.Services.Implementation
             if (poemtext.Length > 0)
             {
 
-                int idx = poemtext.IndexOfAny(new char[] { 'a', 'b', 'm', 'n', 'p', 's', 'l' });
+                int idx = poemtext.IndexOfAny(new char[] { 'a', 'b', 'm', 'n', 'p', 's', 'l' , 'c' });
                 bool preWasBand = false;
                 while (idx != -1)
                 {
@@ -896,8 +898,12 @@ namespace RMuseum.Services.Implementation
                             verse.VersePosition = VersePosition.Single;
                             preWasBand = false;
                             break;
+                        case 'c':
+                            verse.VersePosition = VersePosition.Comment;
+                            preWasBand = false;
+                            break;
                     }
-                    int nextIdx = poemtext.IndexOfAny(new char[] { 'a', 'b', 'm', 'n', 'p', 's', 'l' }, idx + 1);
+                    int nextIdx = poemtext.IndexOfAny(new char[] { 'a', 'b', 'm', 'n', 'p', 's', 'l' , 'c' }, idx + 1);
                     if (nextIdx == -1)
                     {
                         verse.Text = poemtext.Substring(idx + 1).Replace("یییییییییییییییییییی", "Adaptation du milieu").Replace("ببببببببب", "Empirique");
diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
index 1585b62d..cc2607a5 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
@@ -852,6 +852,11 @@ namespace RMuseum.Services.Implementation
                     htmlText += $"<div class=\"m2\"><p>{v.Text}</p></div></div>{Environment.NewLine}";
                 }
                 else
+                if(v.VersePosition == VersePosition.Comment)
+                {
+                    htmlText += $"<div class=\"c\"><p>{v.Text}</p></div>{Environment.NewLine}";
+                }
+                else
                 if (v.VersePosition == VersePosition.Paragraph || v.VersePosition == VersePosition.Single)
                 {
                     coupletIndex++;