Check for binary files in diff editor

Author: Kevinjil

webapp/src/Controller/Jury/SubmissionController.php

@@ -906,7 +906,7 @@ public function sourceAction(
         foreach ($oldFiles as $f) {
             $submitId = $f->getSubmission()->getSubmitid();
             $otherFiles[$submitId] ??= [];
-            $otherFiles[$submitId][] = $f;
+            $otherFiles[$submitId][$f->getFilename()] = $f;
         }
 
         return $this->render('jury/submission_source.html.twig', [

webapp/src/Twig/TwigExtension.php

@@ -941,15 +941,16 @@ public function getMonacoModel(SubmissionFile $file): string
         }
         $this->renderedSources[$file->getSubmitfileid()] = true;
 
+        $source = mb_check_encoding($file->getSourcecode(), 'UTF-8') ? $file->getSourcecode() : "Could not display binary file";
         return sprintf(
             <<<JS
 monaco.editor.createModel(
-    "%s",
+    %s,
     undefined,
     monaco.Uri.parse("diff/%d/%s")
 );
 JS,
-            $this->twig->getRuntime(EscaperRuntime::class)->escape($file->getSourcecode(), 'js'),
+            $this->serializer->serialize($source, 'json'),
             $file->getSubmitfileid(),
             $file->getFilename(),
         );
@@ -968,7 +969,7 @@ public function showDiff(string $editorId, string $diffId, SubmissionFile $newFi
     const models = %s;
     require(['vs/editor/editor.main'], () => {
         const modifiedModel = %s;
-        initDiffEditorTab(editorId, diffId, rank, models, modifiedModel)
+        initDiffEditorTab(editorId, diffId, rank, models, modifiedModel);
     });
 });
 </script>
@@ -977,11 +978,12 @@ public function showDiff(string $editorId, string $diffId, SubmissionFile $newFi
         $others = [];
         foreach ($otherFiles as $submissionId => $files) {
             foreach ($files as $f) {
-                if ($f->getFilename() == $newFile->getFilename()) {
+                // TODO: this renames the old file to multiple files, need more data in `showDiff`.
+                if (($newFile->getRank() === 1 && count($files) === 1) || ($f->getFilename() == $newFile->getFilename())) {
                     // TODO: add `tag` containing `previous` / `original`
                     $others[$submissionId] = [
                         'filename' => $f->getFilename(),
-                        'source'   => $f->getSourcecode(),
+                        'source'   => mb_check_encoding($f->getSourcecode(), 'UTF-8') ? $f->getSourcecode() : "Could not display binary file",
                     ];
                 }
             }