Fix handling of binary files when editing executables. (#2043)

Fixes #1841.

(cherry picked from commit 6e099ab)

Author: meisterT

webapp/src/Controller/Jury/ExecutableController.php

@@ -241,6 +241,18 @@ public function viewAction(Request $request, string $execId): Response
                 $this->em->persist($executableFile);
                 $files[] = $executableFile;
             }
+            $offset = count($files);
+            foreach ($editorData['skippedBinary'] as $idx => $skippedBinaryData) {
+                $origExecutableFile = $this->em->getRepository(ExecutableFile::class)->find($skippedBinaryData['execfileid']);
+                $executableFile = new ExecutableFile();
+                $executableFile
+                    ->setRank($idx + $offset)
+                    ->setIsExecutable($origExecutableFile->isExecutable())
+                    ->setFilename($origExecutableFile->getFilename())
+                    ->setFileContent($origExecutableFile->getFileContent());
+                $this->em->persist($executableFile);
+                $files[] = $executableFile;
+            }
 
             $immutableExecutable = new ImmutableExecutable($files);
             $this->em->persist($immutableExecutable);
@@ -436,7 +448,10 @@ protected function dataForEditor(Executable $executable): array
             $content = $file->getFileContent();
             $rank = $file->getRank();
             if (!mb_detect_encoding($content, null, true)) {
-                $skippedBinary[] = $filename;
+                $skippedBinary[] = [
+                    'filename' => $filename,
+                    'execfileid' => $file->getExecFileId(),
+                ];
                 continue; // Skip binary files.
             }
             $filenames[] = $filename;

webapp/templates/jury/executable.html.twig

@@ -82,8 +82,8 @@
         <div class="alert alert-warning">
             We exclude these files from editing since we could not detect their encoding (e.g. they are binary files):
             <ul>
-                {% for file in skippedBinary %}
-                    <li><code>{{ file }}</code></li>
+                {% for data in skippedBinary %}
+                    <li><code>{{ data.filename }}</code></li>
                 {% endfor %}
             </ul>
         </div>