Move parseMetadata function to Utils

DOMjudge · Dec 4, 2024 · f3ec76d · f3ec76d
1 parent c802b1b
commit f3ec76d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/webapp/src/Controller/Jury/SubmissionController.php b/webapp/src/Controller/Jury/SubmissionController.php
@@ -397,7 +397,7 @@ public function viewAction(
                 $runs[] = $runResult[0];
                 unset($runResult[0]);
                 if (!empty($runResult['metadata'])) {
-                    $metadata = $this->dj->parseMetadata($runResult['metadata']);
+                    $metadata = Utils::parseMetadata($runResult['metadata']);
                     $runResult['output_limit'] = $metadata['output-truncated'] ?? 'n/a';
                 }
                 $runResult['terminated'] = preg_match('/timelimit exceeded.*hard (wall|cpu) time/',

diff --git a/webapp/src/Service/DOMJudgeService.php b/webapp/src/Service/DOMJudgeService.php
@@ -1407,24 +1407,6 @@ public function loadTeam(string $teamId, Contest $contest): Team
         return $team;
     }
 
-    /**
-     * @return array<string, string>
-     */
-    public function parseMetadata(string $raw_metadata): array
-    {
-        // TODO: Reduce duplication with judgedaemon code.
-        $contents = explode("\n", $raw_metadata);
-        $res = [];
-        foreach ($contents as $line) {
-            if (str_contains($line, ":")) {
-                [$key, $value] = explode(":", $line, 2);
-                $res[$key] = trim($value);
-            }
-        }
-
-        return $res;
-    }
-
     public function getRunConfig(ContestProblem $problem, Submission $submission, int $overshoot = 0): string
     {
         $memoryLimit = $problem->getProblem()->getMemlimit();

diff --git a/webapp/src/Twig/TwigExtension.php b/webapp/src/Twig/TwigExtension.php
@@ -1209,7 +1209,7 @@ public function printMetadata(?string $metadata): string
         if ($metadata === null) {
             return '';
         }
-        $metadata = $this->dj->parseMetadata($metadata);
+        $metadata = Utils::parseMetadata($metadata);
         return '<span style="display:inline; margin-left: 5px;">'
             . '<i class="fas fa-stopwatch" title="runtime"></i> '
             . $metadata['cpu-time'] . 's CPU, '

diff --git a/webapp/src/Utils/Utils.php b/webapp/src/Utils/Utils.php
@@ -966,4 +966,22 @@ public static function jsonEncode(mixed $data): string
     {
         return json_encode($data, JSON_PRESERVE_ZERO_FRACTION | JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR);
     }
+
+    /**
+     * @return array<string, string>
+     */
+    public static function parseMetadata(string $raw_metadata): array
+    {
+        // TODO: Reduce duplication with judgedaemon code.
+        $contents = explode("\n", $raw_metadata);
+        $res = [];
+        foreach ($contents as $line) {
+            if (str_contains($line, ":")) {
+                [$key, $value] = explode(":", $line, 2);
+                $res[$key] = trim($value);
+            }
+        }
+
+        return $res;
+    }
 }