Fix URL links being incorrect

NumyAddon · Aug 30, 2024 · 107eca9 · 107eca9
1 parent b16fb48
commit 107eca9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/bin/annotate b/bin/annotate
@@ -36,6 +36,7 @@ $fileList = [];
 if (is_file($inputDir) && (str_ends_with($inputDir, '.lua') || str_ends_with($inputDir, '.xml'))) {
     $fileList[$inputDir] = pathinfo($inputDir, PATHINFO_EXTENSION);
 } elseif (is_dir($inputDir)) {
+    $inputDir = rtrim($inputDir, '/');
     $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($inputDir));
     $iterator->rewind();
     /** @var $iterator RecursiveDirectoryIterator */
@@ -62,7 +63,7 @@ foreach ($fileList as $filePath => $extension) {
     if ('xml' === $extension) {
         $xmlFileParser->parse($filePath);
     } elseif ('lua' === $extension) {
-        $luaFileParser->parse($filePath, $linkPrefix);
+        $luaFileParser->parse($filePath, $inputDir, $linkPrefix);
     }
     $progressBar->advance();
 }

diff --git a/src/LuaFileParser.php b/src/LuaFileParser.php
@@ -11,9 +11,13 @@ class LuaFileParser
     /** @var array<string, array<string, string> [filename => [function name => function data]] */
     private array $functions = [];
 
-    public function parse(string $filename, ?string $linkPrefix): void
+    public function parse(string $filename, string $prefixToStrip, ?string $linkPrefix): void
     {
         $fileContents = file_get_contents($filename);
+        if (str_starts_with($filename, $prefixToStrip)) {
+            $linkFilename = substr($filename, strlen($prefixToStrip));
+            $linkPrefix = $linkPrefix ? str_replace('//', '/', $linkPrefix . '/' . $linkFilename) : null;
+        }
 
         $mixins = $this->extractMixins($fileContents, $linkPrefix);
         $functions = $this->extractFunctions($fileContents, $mixins, $linkPrefix);

diff --git a/src/XmlFileParser.php b/src/XmlFileParser.php
@@ -78,7 +78,7 @@ public function writeAnnotationsToFile(string $filename, string $outDir, string
 
         if (str_starts_with($filename, $prefixToStrip)) {
             $filename = substr($filename, strlen($prefixToStrip));
-            $linkPrefix = $linkPrefix ? ($linkPrefix . '/' . $filename) : null;
+            $linkPrefix = $linkPrefix ? str_replace('//', '/', $linkPrefix . '/' . $filename) : null;
         }
         $targetFile = $outDir . '/' . $filename . '.annotated.lua';
         if (!is_dir(dirname($targetFile))) {