update episode patch

bangumi · Aug 29, 2024 · 2853f81 · 2853f81
1 parent e41ab23
commit 2853f81
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 39 deletions.
diff --git a/server/patch.py b/server/patch.py
@@ -116,15 +116,15 @@ async def get_episode_patch(patch_id: uuid.UUID, request: Request) -> Template:
 
     diff = {}
 
-    keys = {
-        "name": "标题",
-        "name_cn": "简体中文标题",
-        "duration": "时长",
-        "airdate": "放送日期",
-        "description": "简介",
-    }
-
-    for key, cn in keys.items():
+    keys = [
+        ("name", "标题"),
+        ("name_cn", "简体中文标题"),
+        ("duration", "时长"),
+        ("airdate", "放送日期"),
+        ("description", "简介"),
+    ]
+
+    for key, _ in keys:
         after = p[key]
         if after is None:
             continue
@@ -133,7 +133,7 @@ async def get_episode_patch(patch_id: uuid.UUID, request: Request) -> Template:
 
         if original != after:
             if key != "description":
-                diff[(key, cn)] = "".join(
+                diff[key] = "".join(
                     # need a tailing new line to generate correct diff
                     difflib.unified_diff(
                         [original + "\n"],
@@ -143,7 +143,7 @@ async def get_episode_patch(patch_id: uuid.UUID, request: Request) -> Template:
                     )
                 )
             else:
-                diff[(key, cn)] = "".join(
+                diff[key] = "".join(
                     # need a tailing new line to generate correct diff
                     difflib.unified_diff(
                         (original + "\n").splitlines(True),
@@ -167,6 +167,7 @@ async def get_episode_patch(patch_id: uuid.UUID, request: Request) -> Template:
             "patch": p,
             "reason": p["reason"],
             "auth": request.auth,
+            "keys": keys,
             "diff": diff,
             "reviewer": reviewer,
             "submitter": submitter,

diff --git a/server/templates/episode/patch.html.jinja2 b/server/templates/episode/patch.html.jinja2
@@ -58,35 +58,43 @@
   <h3>具体变动</h3>
 
   <script>
-      const outputFormatOpt = {'description': 'side-by-side'}
+    const outputFormatOpt = {'description': 'side-by-side'}
   </script>
 
-  {% for (key, cn), value in diff.items() %}
-    <div class="row">
-      <h4>{{ cn }}</h4>
-      <div id="{{ key }}diff" class="diff"></div>
-    </div>
+  {% for (key, cn) in keys %}
+    {% if key in diff %}
+      <div class="row">
+        <h4>{{ cn }}</h4>
+        <div id="{{ key }}diff" class="diff"></div>
+      </div>
 
-    <script>
+      <script>
         (() => {
-            const diffString = {{ value | tojson }};
-            const key = '{{ key }}'
-            const targetElement = document.getElementById('{{ key }}diff');
-            const configuration = {
-                drawFileList: false,
-                fileListToggle: false,
-                fileListStartVisible: false,
-                fileContentToggle: false,
-                matching: 'words',
-                maxLineSizeInBlockForComparison: 80,
-                outputFormat: 'line-by-line',
-                synchronisedScroll: true,
-                renderNothingWhenEmpty: false,
-            };
-            const diff2htmlUi = new Diff2HtmlUI(targetElement, diffString, configuration);
-            diff2htmlUi.draw();
+          const diffString = {{ diff[key] | tojson }};
+          const key = '{{ key }}'
+          const targetElement = document.getElementById('{{ key }}diff');
+          const configuration = {
+            drawFileList: false,
+            fileListToggle: false,
+            fileListStartVisible: false,
+            fileContentToggle: false,
+            matching: 'words',
+            maxLineSizeInBlockForComparison: 80,
+            outputFormat: 'line-by-line',
+            synchronisedScroll: true,
+            renderNothingWhenEmpty: false,
+          };
+          const diff2htmlUi = new Diff2HtmlUI(targetElement, diffString, configuration);
+          diff2htmlUi.draw();
         })()
-    </script>
+      </script>
+    {% else %}
+      <div class="row">
+        <h4>{{ cn }}</h4>
+        <p class="blockquote"
+           style="background-color: #f7f7f9">{{ patch['original_' + key] }}</p>
+      </div>
+    {% endif %}
   {% endfor %}
 
   <div class="row">
@@ -102,10 +110,10 @@
         </div>
 
         <script>
-            function onRejectSelectFormChange() {
-                const el = $('#reject-reason-select');
-                $('#reject-reason-input').val(el.val())
-            }
+          function onRejectSelectFormChange() {
+            const el = $('#reject-reason-select');
+            $('#reject-reason-input').val(el.val())
+          }
         </script>
 
         <div class="col">