Changeset 277311 in webkit

Timestamp:

May 10, 2021, 5:41:50 PM (5 years ago)

Author:

Chris Gambrell

Message:

[LayoutTests] Decouple http/tests/media/resources/create-id3-db.php from webserver
​https://bugs.webkit.org/show_bug.cgi?id=224561
<rdar://problem/76653054>

Reviewed by Jonathan Bedard.

Replacing the creation of metadata.db with JSON into a new file named metadata.json. This standalone script remains in PHP to be able to still use getid3.

• http/tests/media/resources/create-id3-db.php: Removed.
• http/tests/resources/dir-helpers.php: Removed.
• http/tests/resources/portabilityLayer.php: Removed.
• media/content/create-id3-db: Copied from LayoutTests/http/tests/media/resources/create-id3-db.php.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/resources/dir-helpers.php (deleted)
• http/tests/resources/portabilityLayer.php (deleted)
• media/content/create-id3-db (moved) (moved from trunk/LayoutTests/http/tests/media/resources/create-id3-db.php ) (5 diffs, 1 prop)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-10  Chris Gambrell  <cgambrell@apple.com>
+
+        [LayoutTests] Decouple http/tests/media/resources/create-id3-db.php from webserver
+        https://bugs.webkit.org/show_bug.cgi?id=224561
+        <rdar://problem/76653054>
+
+        Reviewed by Jonathan Bedard.
+
+        Replacing the creation of metadata.db with JSON into a new file named metadata.json. This standalone script remains in PHP to be able to still use getid3.
+
+        * http/tests/media/resources/create-id3-db.php: Removed.
+        * http/tests/resources/dir-helpers.php: Removed.
+        * http/tests/resources/portabilityLayer.php: Removed.
+        * media/content/create-id3-db: Copied from LayoutTests/http/tests/media/resources/create-id3-db.php.
+
 2021-05-10  Amir Mark Jr  <amir_mark@apple.com>
 

trunk/LayoutTests/media/content/create-id3-db

@@ +1 @@
+#!/usr/bin/env php
+
 <?php
 
@@ -7 +9 @@
 
 
-    // This script creates, overwriting if needed, the "metadata.db"
+    // This script creates, overwriting if needed, the "metadata.json"
     // file used by scripts such as "serve-video.py".
     //
-    // For creating or updating an existing file you have to run the
-    // http server used by the tests with:
-    //
-    // $ Tools/Scripts/run-webkit-httpd
-    //
-    // Then you will just have to use a browser to open an URL of the
-    // type:
-    //
-    // http://127.0.0.1:8000/media/resources/create-id3-db.php?name=../../../../media/content/silence.wav
-    //
-    // With this, a new "metadaba.db" file will be create in the
+    // For creating or updating an existing file you have to run
+    // the file as an executable, passing a single argument which
+    // is the name of the file we are accessing to get the media
+    // directory
+    //
+    // With this, a new "metadaba.json" file will be create in the
     // directory containing the referred file. In this example, the
     // database will be created at:
     //
-    // $ LayoutTests/media/content/metadata.db
-
-
-    require_once '../../resources/portabilityLayer.php';
-    require_once '../../resources/dir-helpers.php';
+    // $ LayoutTests/media/content/metadata.json
+
+
+    function tmpdir($dir=FALSE, $prefix='php')
+    {
+        if ($dir) {
+            $tmpFile = tempnam($dir, $prefix);
+        } else {
+            if (!sys_get_temp_dir())
+                return FALSE;
+            $tmpFile = tempnam(sys_get_temp_dir(), $prefix);
+        }
+
+        if (!file_exists($tmpFile))
+            return FALSE;
+        unlink($tmpFile);
+        mkdir($tmpFile);
+        if (!is_dir($tmpFile))
+            return FALSE;
+
+        return $tmpFile;
+    }
+
+
+    function rrmdir($dir)
+    {
+        if (is_dir($dir)) {
+            $objects = array_diff(scandir($dir), array(".", ".."));
+            foreach ($objects as $object)
+                (is_dir($dir . "/" . $object)) ? rrmdir($dir . "/" . $object) : unlink($dir . "/" . $object);
+            reset($objects);
+            rmdir($dir);
+        }
+    }
+
+
+    function rcopy($src, $dst)
+    {
+        if (file_exists($dst))
+            rrmdir($dst);
+        if (is_dir($src)) {
+            mkdir($dst);
+            $files = array_diff(scandir($src), array(".", ".."));
+            foreach ($files as $file)
+              rcopy("$src/$file", "$dst/$file");
+        } else if (file_exists($src)) {
+            copy($src, $dst);
+        }
+    }
+
+
+    function first_dir($name, $dir=FALSE)
+    {
+        $result = FALSE;
+        $root = $dir ? $dir : "./";
+        $queue = array(realpath($root));
+
+        while (sizeof($queue)) {
+            $vertex = array_pop($queue);
+            $objects = array_diff(scandir($vertex), array(".", ".."));
+            foreach ($objects as $object) {
+                $fullPath = $vertex . "/" . $object;
+                if (is_dir($fullPath)) {
+                    if ($name == basename($fullPath)) {
+                        $result = $fullPath;
+                        return $result;
+                    } else {
+                        array_unshift($queue, $fullPath);
+                    }
+                }
+            }
+        }
+    }
+
 
     // 500 on errors
@@ -34 +100 @@
     $htmlMessage = "";
 
-    if (!array_key_exists("name", $_GET)) {
+    if (sizeof($argv) < 2) {
         trigger_error("You have not specified a 'name' parameter.", E_USER_WARNING);
         goto answering;
     }
-    $mediaDirectory = dirname($_GET["name"]);
+    $mediaDirectory = dirname($argv[1]);
 
     if (!is_dir($mediaDirectory)) {
@@ -44 +110 @@
         goto answering;
     }
-    $databaseFile = realpath($mediaDirectory) . "/metadata.db";
+    $databaseFile = realpath($mediaDirectory) . "/metadata.json";
 
     if (file_exists($databaseFile)) {
@@ -139 +205 @@
     }
 
-    if (!file_put_contents($databaseFile, serialize($playFiles))) {
+    if (!file_put_contents($databaseFile, json_decode($playFiles))) {
         trigger_error("Impossible to write the getid3 db.", E_USER_WARNING);
         goto answering;