Updated index browser and viewer to handle any depth nesting.

photonstorm · photonstorm · commit 40efc325b0f2 · 2014-09-16T22:28:51.000+01:00
diff --git a/docgen/index.php b/docgen/index.php
@@ -24,7 +24,8 @@
 
     function dirToArray($dir) { 
 
-        // $ignore = array('.', '..', 'pixi');
+        global $src;
+
         $ignore = array('.', '..');
         $fileIgnore = array('p2.js');
         $result = array(); 
@@ -33,17 +34,32 @@ function dirToArray($dir) {
 
         foreach ($dirs as $key => $value) 
         { 
-            if (is_dir($dir . DIRECTORY_SEPARATOR . $value)) 
-            { 
-                $result[$value] = dirToArray($dir . DIRECTORY_SEPARATOR . $value); 
+            $path = realpath($dir . DIRECTORY_SEPARATOR . $value);
+
+            if (is_dir($path)) 
+            {
+                $result[$value] = dirToArray($path); 
             } 
             else 
             {
                 if (substr($value, -3) == '.js')
                 {
                     if (!in_array($value, $fileIgnore))
                     {
-                        $result[] = substr($value, 0, -3);
+                        $index = str_replace($src, "", $path);
+                        $index = substr($index, 1);
+
+                        // $slash = strrpos($index, DIRECTORY_SEPARATOR);
+
+                        // if ($slash > 0)
+                        // {
+                        //     // $index = substr($index, 0, $slash);
+                        // }
+
+                        $result[substr($value, 0, -3)] = $index;
+
+                        // $result[$index] = substr($value, 0, -3);
+                        // $result[] = [ substr($value, 0, -3), $index ];
                     }
                 }
             } 
@@ -52,7 +68,7 @@ function dirToArray($dir) {
         return $result; 
     }
 
-    function displaySection($title, $files, $parent = "") {
+    function displaySection($title, $files) {
 
         if ($title === "")
         {
@@ -65,35 +81,30 @@ function displaySection($title, $files, $parent = "") {
 
         echo "<ul>";
 
-        foreach ($files as $key => $file)
+        foreach ($files as $name => $file)
         {
             if (is_array($file))
             {
-                displaySection($key, $file, $title);
+                displaySection($name, $file);
             }
             else
             {
-                $src = $title . "/" . $file;
-
-                if ($parent !== "")
-                {
-                    $src = $parent . "/" . $src;
-                }
-
-                echo "<li><a href=\"view.php?src=$src\">$file</a></li>";
+                echo "<li><a href=\"view.php?src=$file\">$name</a></li>";
             }
         }
 
         echo "</ul>";
 
     }
 
-    $path = realpath('../src');
-    $files = dirToArray($path);
+    $src = realpath('../src');
+
+    $files = dirToArray($src);
 
-    displaySection("", $files, "");
+    displaySection("", $files);
 
     // echo "<pre>";
+    // var_dump($src);
     // print_r($files);
     // echo "</pre>";
 
diff --git a/docgen/view.php b/docgen/view.php
@@ -1,6 +1,6 @@
 <?php
 
-    $src = "loader/Cache";
+    $src = "loader/Cache.js";
     $method = null;
     $property = null;
 
@@ -28,7 +28,7 @@
     require 'src/ReturnType.php';
     require 'src/Processor.php';
 
-    $data = new Processor("../src/" . $src . ".js");
+    $data = new Processor("../src/$src");
 ?>
 <!doctype html>
 <html>

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@`
`24`	`24`
`25`	`25`	`function dirToArray($dir) {`
`26`	`26`
`27`		`- // $ignore = array('.', '..', 'pixi');`
	`27`	`+ global $src;`
	`28`	`+`
`28`	`29`	`$ignore = array('.', '..');`
`29`	`30`	`$fileIgnore = array('p2.js');`
`30`	`31`	`$result = array();`
`@@ -33,17 +34,32 @@ function dirToArray($dir) {`
`33`	`34`
`34`	`35`	`foreach ($dirs as $key => $value)`
`35`	`36`	`{`
`36`		`- if (is_dir($dir . DIRECTORY_SEPARATOR . $value))`
`37`		`- {`
`38`		`- $result[$value] = dirToArray($dir . DIRECTORY_SEPARATOR . $value);`
	`37`	`+ $path = realpath($dir . DIRECTORY_SEPARATOR . $value);`
	`38`	`+`
	`39`	`+ if (is_dir($path))`
	`40`	`+ {`
	`41`	`+ $result[$value] = dirToArray($path);`
`39`	`42`	`}`
`40`	`43`	`else`
`41`	`44`	`{`
`42`	`45`	`if (substr($value, -3) == '.js')`
`43`	`46`	`{`
`44`	`47`	`if (!in_array($value, $fileIgnore))`
`45`	`48`	`{`
`46`		`- $result[] = substr($value, 0, -3);`
	`49`	`+ $index = str_replace($src, "", $path);`
	`50`	`+ $index = substr($index, 1);`
	`51`	`+`
	`52`	`+ // $slash = strrpos($index, DIRECTORY_SEPARATOR);`
	`53`	`+`
	`54`	`+ // if ($slash > 0)`
	`55`	`+ // {`
	`56`	`+ // // $index = substr($index, 0, $slash);`
	`57`	`+ // }`
	`58`	`+`
	`59`	`+ $result[substr($value, 0, -3)] = $index;`
	`60`	`+`
	`61`	`+ // $result[$index] = substr($value, 0, -3);`
	`62`	`+ // $result[] = [ substr($value, 0, -3), $index ];`
`47`	`63`	`}`
`48`	`64`	`}`
`49`	`65`	`}`
`@@ -52,7 +68,7 @@ function dirToArray($dir) {`
`52`	`68`	`return $result;`
`53`	`69`	`}`
`54`	`70`
`55`		`- function displaySection($title, $files, $parent = "") {`
	`71`	`+ function displaySection($title, $files) {`
`56`	`72`
`57`	`73`	`if ($title === "")`
`58`	`74`	`{`
`@@ -65,35 +81,30 @@ function displaySection($title, $files, $parent = "") {`
`65`	`81`
`66`	`82`	`echo "<ul>";`
`67`	`83`
`68`		`- foreach ($files as $key => $file)`
	`84`	`+ foreach ($files as $name => $file)`
`69`	`85`	`{`
`70`	`86`	`if (is_array($file))`
`71`	`87`	`{`
`72`		`- displaySection($key, $file, $title);`
	`88`	`+ displaySection($name, $file);`
`73`	`89`	`}`
`74`	`90`	`else`
`75`	`91`	`{`
`76`		`- $src = $title . "/" . $file;`
`77`		`-`
`78`		`- if ($parent !== "")`
`79`		`- {`
`80`		`- $src = $parent . "/" . $src;`
`81`		`- }`
`82`		`-`
`83`		`- echo "<li><a href=\"view.php?src=$src\">$file</a></li>";`
	`92`	`+ echo "<li><a href=\"view.php?src=$file\">$name</a></li>";`
`84`	`93`	`}`
`85`	`94`	`}`
`86`	`95`
`87`	`96`	`echo "</ul>";`
`88`	`97`
`89`	`98`	`}`
`90`	`99`
`91`		`- $path = realpath('../src');`
`92`		`- $files = dirToArray($path);`
	`100`	`+ $src = realpath('../src');`
	`101`	`+`
	`102`	`+ $files = dirToArray($src);`
`93`	`103`
`94`		`- displaySection("", $files, "");`
	`104`	`+ displaySection("", $files);`
`95`	`105`
`96`	`106`	`// echo "<pre>";`
	`107`	`+ // var_dump($src);`
`97`	`108`	`// print_r($files);`
`98`	`109`	`// echo "</pre>";`
`99`	`110`