Improve status tab

README.md

@@ -21,5 +21,5 @@ Script Usage
 You most likely won't need this. But if you need to re-parse the CSV into individual files for easier usage, run this:
 
 ```shell
-$ ./parse_csv resources/OWASP_Application_Security_Verification_Standard_4.0-en.csv
+$ ./csvparse resources/OWASP_Application_Security_Verification_Standard_4.0-en.csv
 ```

parse_csv → csvparse

@@ -8,18 +8,18 @@ namespace {
         error('No csv file supplied');
     }
 
-    $fp = @fopen($argv[1], 'r');
+    $fp = owasp_asvs\get_input_file_handle($argv[1]);
 
-    if ($fp === false) {
-        error('Unable to read csv file');
-    }
+    while (!feof($fp)) {
+        $elements = fgetcsv($fp);
 
-    fgets($fp); // skip header line
+        if ($elements === false || count($elements) < 8) {
+            error('Invalid csv file');
+        }
 
-    while (!feof($fp)) {
-        [, $name, $item, $desc, $l1, $l2, , $cwe] = fgetcsv($fp);
+        [ , $name, $item, $desc, $l1, $l2, , $cwe] = $elements;
 
-        owasp_asvs\write($name, [$item, owasp_asvs\level($l1, $l2), $desc, $cwe]);
+        owasp_asvs\write($name, [$item, $cwe, owasp_asvs\level($l1, $l2), $desc]);
     }
 }
 
@@ -51,20 +51,34 @@ namespace owasp_asvs {
                 error('Invalid category name');
             }
 
-            $handles[$name] = @fopen(__DIR__ . "/parsed/{$name}.csv", 'w+');
+            $handle = @fopen(__DIR__ . "/parsed/{$name}.csv", 'w+');
 
-            if ($handles[$name] === false) {
+            if ($handle === false) {
                 error('Unable to open output file');
             }
 
-            register_shutdown_function(function () use ($handles, $name) {
-                fclose($handles[$name]);
+            $handles[$name] = $handle;
+
+            register_shutdown_function(function () use (&$handle) {
+                fclose($handle);
             });
         }
 
         return $handles[$name];
     }
 
+    function get_input_file_handle(string $path)
+    {
+        $fp = @fopen($path, 'r');
+
+        if ($fp === false) {
+            error('Unable to read csv file');
+        }
+
+        fgets($fp);
+        return $fp; // skip header line
+    }
+
     function error(string $message): void
     {
         echo $message, PHP_EOL;