-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* log * log * log * next * array * corrected and complete * insert * typo * style * css * update grid creation * debug * correct * refactor * simplify * style * typo * \n * innertext * innertext * test * description * test * test * test * indent * indent * cleanup * typo * clean css * unlock width * img src * typo * typo * do not allow hidden or deprecated * typo * log * missing parenthesis * log * debug * log * debug * log * log * log * log * log * log * enum * log * license * insert license * debug * license * test * license * correct * typo * typo * skip documentation url * typo * test * $ * base_type * forge url * typo * name * debug * 0 * debug * typo * log * debug * debug * debug * needs_robot_content * typo * typo * typo * typo * slot type * ; * remove log * check for license * fetch doc * log * content * test * log * test * json * restrict queried field * typo * replace * typo * log * json * remove log * try * move * test * move * path * test * htaccess * cors * .. * base_type * typo * free * return * test * test * test * test * result * branch * branch * branch * test * test * test * test * rowg * test * test * test * test * array * test * test * arrayg * test * test * test * test * test * condition * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * slot_type * test * test * test * test * test * typo * udpate * clean up * cleanup * test * text * typo * log * test * cleanup * empty type slot * update db * clean up * style * typo * style * stars * remove ace * Update httpdocs/js/project.js Co-authored-by: Olivier Michel <[email protected]> * Update httpdocs/js/project.js Co-authored-by: Olivier Michel <[email protected]> * restore testing * Update httpdocs/js/webots-cloud.js Co-authored-by: Olivier Michel <[email protected]> * Update httpdocs/ajax/proto/create.php Co-authored-by: Olivier Michel <[email protected]> * style * const * Update httpdocs/ajax/proto/insertable.php Co-authored-by: Olivier Michel <[email protected]> * Update httpdocs/ajax/proto/list.php Co-authored-by: Olivier Michel <[email protected]> * column * try dynamic import * debug * log * get the right version * test * yaml folder * yaml * test * try with ending slash * escape * test * test * test * worlds * debug * debug * debug * test * test * remove debug * differentiate errors * lower case * base_type * url * test * debug * typo * debug text * debug * test * test * test * remove print * test * test * test * index * test * typo * typo * typo * remove print * page * test * test * test * remove print * go to last page * test * test * fix title * remove showdown * test * test * test * cleanup --------- Co-authored-by: Olivier Michel <[email protected]>
- Loading branch information
Showing
13 changed files
with
1,226 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,254 @@ | ||
| <?php # This script initializes a new proto | ||
| # exit and error message | ||
| function error($message) { | ||
| die("{\"error\":\"$message\"}"); | ||
| } | ||
|
|
||
| # get content | ||
| header('Content-Type: application/json'); | ||
| $json = file_get_contents('php://input'); | ||
| $data = json_decode($json); | ||
| require '../../../php/github_oauth.php'; | ||
| require '../../../php/database.php'; | ||
| require '../../../php/github_asset.php'; | ||
| $mysqli = new mysqli($database_host, $database_username, $database_password, $database_name); | ||
| if ($mysqli->connect_errno) | ||
| error("Can't connect to MySQL database: $mysqli->connect_error"); | ||
| $mysqli->set_charset('utf8'); | ||
| $url = $mysqli->escape_string($data->url); | ||
| $id = isset($data->id) ? intval($data->id) : 0; | ||
|
|
||
| # check content | ||
| $check_url = proto_check_url($url); | ||
| if (!is_array($check_url)) | ||
| error($check_url); | ||
| list($username, $repository, $tag_or_branch, $folder, $proto) = $check_url; | ||
| $proto_url = "https://raw.githubusercontent.com/$username/$repository/$tag_or_branch$folder$proto"; | ||
| $proto_content = @file_get_contents($proto_url); | ||
| if ($proto_content === false) { | ||
| $query = "DELETE FROM proto WHERE id=$id"; | ||
| $mysqli->query($query) or error($mysqli->error); | ||
| if ($mysqli->affected_rows === 0) | ||
| error("Failed to delete proto with proto file '$proto'"); | ||
| error("Failed to fetch proto file $proto"); | ||
| } | ||
|
|
||
| # check and retrieve information from webots.yaml file | ||
| $check_yaml = github_check_yaml($check_url, true); | ||
| if (!is_array($check_yaml)) { | ||
| $query = "DELETE FROM proto WHERE id=$id"; | ||
| $mysqli->query($query) or error($mysqli->error); | ||
| error($check_yaml); | ||
| } | ||
|
|
||
| # retrieve the title and infos from the header. | ||
| $info = false; | ||
| $title = ''; | ||
| $description = ''; | ||
| $license = ''; | ||
| $license_url = ''; | ||
| $line = strtok($proto_content, "\r\n"); | ||
| $version = $mysqli->escape_string(substr($line, 10, 6)); // "#VRML_SIM R2022b utf8" -> "R2022b" | ||
| $line = strtok("\r\n"); | ||
| $externprotos = []; | ||
| while ($line !== false) { | ||
| $line == trim($line); | ||
| if ($line[0] === '#') { | ||
| $line = trim(str_replace('#', '', $line)); | ||
| if (strtolower(substr($line, 0, 8)) !== 'template' && strtolower(substr($line, 0, 17)) !== 'documentation url' && substr($line, 0, 4) !== 'VRML') { | ||
| if(strtolower(substr($line, 0, 4)) !== 'tags') { | ||
| if (strpos($line, 'deprecated') || strpos($line, 'hidden')) | ||
| error("This proto is either deprecated or hidden and should not be added."); | ||
| elseif (strtolower(substr($line, 0, 11)) === 'license url') | ||
| $license_url = trim(preg_replace("/license url\s*:/", '', $line)); | ||
| elseif (strtolower(substr($line, 0, 7)) === 'license') | ||
| $license = trim(preg_replace("/license\s*:/", '', $line)); | ||
| else { | ||
| if ($description !== '') | ||
| $description .= "\n"; | ||
| $description .= $mysqli->escape_string($line); | ||
| } | ||
| } | ||
| } | ||
| } elseif (substr($line, 0, 11) === 'EXTERNPROTO') { | ||
| $proto_url = trim(str_replace('"', '',str_replace('EXTERNPROTO', '', $line))); | ||
| $proto_name = str_replace('.proto', '', $proto_url); | ||
| if (strrpos($proto_name, '/')) | ||
| $proto_name = substr($proto_name, strrpos($proto_name, '/') + 1); | ||
| array_push($externprotos, [$proto_name, $proto_url]); | ||
| } elseif (substr($line, 0, 6) === 'PROTO ') | ||
| $title = trim(substr($line, 6)); | ||
| if (!empty($title) && $title[-1] === '[') | ||
| $title = trim(substr($title, 0, -1)); | ||
| $line = strtok("\r\n"); | ||
| } | ||
|
|
||
| $original_externprotos = $externprotos; | ||
| $title = $mysqli->escape_string($title); | ||
| $license = $mysqli->escape_string($license); | ||
| $license_url = $mysqli->escape_string($license_url); | ||
|
|
||
| $base_type = ''; | ||
| preg_match("/(?:\]\s*)\{\s*(?:\%\<[\s\S]*?(?:\>\%\s*))?(?:DEF\s+[^\s]+)?\s+([a-zA-Z0-9\_\-\+]+)\s*\{/", $proto_content, $match); | ||
| if ($match) | ||
| $base_type = $match[1]; | ||
| $base_proto = $base_type; | ||
| $base_nodes = ['Gyro', 'DistanceSensor', 'Recognition', 'TouchSensor', 'ContactProperties', 'TextureCoordinate', 'Color', | ||
| 'Camera', 'Accelerometer', 'Slot', 'Radar', 'Transform', 'Zoom', 'RangeFinder', 'PointSet', 'Capsule', 'Speaker', 'Lens', | ||
| 'Viewpoint', 'IndexedFaceSet', 'Solid', 'Group', 'Muscle', 'Lidar', 'InertialUnit', 'DirectionalLight', | ||
| 'HingeJointParameters', 'Compass', 'Normal', 'Propeller', 'Physics', 'RotationalMotor', 'Microphone', 'ImageTexture', 'Fog', | ||
| 'Mesh', 'Track', 'Background', 'LED', 'Material', 'Box', 'PointLight', 'Cylinder', 'Damping', 'GPS', 'Radio', 'Pen', 'Cone', | ||
| 'WorldInfo', 'SpotLight', 'TextureTransform', 'LinearMotor', 'Receiver', 'Coordinate', 'Hinge2JointParameters', 'CadShape', | ||
| 'LensFlare', 'TrackWheel', 'PBRAppearance', 'Shape', 'Altimeter', 'PositionSensor', 'Connector', 'HingeJoint', 'Plane', | ||
| 'Brake', 'Appearance', 'ElevationGrid', 'BallJointParameters', 'Fluid', 'Robot', 'SolidReference', 'Sphere', 'Skin', | ||
| 'IndexedLineSet', 'ImmersionProperties', 'JointParameters', 'Focus', 'SliderJoint', 'Emitter', 'Hinge2Joint', 'BallJoint', | ||
| 'LightSensor', 'Display', 'Billboard', 'Charger']; | ||
|
|
||
| # search for the base type | ||
| $parent_url = $url; | ||
| while(!in_array($base_type, $base_nodes)) { | ||
| $results = get_parent($externprotos, $base_type, $parent_url); | ||
| $externprotos = $results[0]; | ||
| $base_type = $results[1]; | ||
| $parent_url = $results[3]; | ||
| $found_parent = $results[4]; | ||
| if(!$found_parent) | ||
| error("Base type: seems like the parent node is missing from the EXTERNPROTO."); | ||
| } | ||
|
|
||
| $device_regex = "/(\s+Brake\s*|\s+LinearMotor\s*|\s+PositionSensor\s*|\s+RotationalMotor\s*|\s+Skin\s*|\s+Accelerometer\s*|\s+Altimeter\s*|\s+Camera\s*|\s+Compass\s*|\s+Compass\s*|\s+Display\s*|\s+DistanceSensor\s*|\s+Emitter\s*|\s+GPS\s*|\s+Gyro\s*|\s+InertialUnit\s*|\s+LED\s*|\s+Lidar\s*|\s+LightSensor\s*|\s+Pen\s*|\s+Radar\s*|\s+RangeFinder\s*|\s+Receiver\s*|\s+Speaker\s*|\s+TouchSensor\s*|\s+Track\s*)/"; | ||
| $needs_robot_ancestor = 0; | ||
| if (in_array($base_type, ['Solid', 'Transform', 'Group'])) | ||
| $needs_robot_ancestor = preg_match($device_regex, $proto_content); | ||
|
|
||
| $slot_type = ''; | ||
| if ($base_type === "Slot") { | ||
| $found = false; | ||
| $current_proto_content = $proto_content; | ||
| $externprotos = $original_externprotos; | ||
| $parent_url = $url; | ||
| while(!$found) { | ||
| preg_match("/type\s+\"([a-zA-Z0-9\_\-\+\s]+)\"/", $current_proto_content, $match); | ||
| if ($match) { | ||
| $slot_type = $match[1]; | ||
| $found = true; | ||
| } else { | ||
| $results = get_parent($externprotos, $base_proto, $parent_url); | ||
| $externprotos = $results[0]; | ||
| $base_proto = $results[1]; | ||
| $current_proto_content = $results[2]; | ||
| $parent_url = $results[3]; | ||
| $found_parent = $results[4]; | ||
| if(!$found_parent) | ||
| error("Slot type: seems like the parent node is missing from the EXTERNPROTO."); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| $auth = "Authorization: Basic " . base64_encode("$github_oauth_client_id:$github_oauth_client_secret"); | ||
| $context = stream_context_create(['http' => ['method' => 'GET', 'header' => ['User-Agent: PHP', $auth]]]); | ||
| $info_json = @file_get_contents("https://api.github.com/repos/$username/$repository", false, $context); | ||
| $info = json_decode($info_json); | ||
| $stars = intval($info->{'stargazers_count'}); | ||
| $competitors = 0; | ||
| $query = "SELECT viewed FROM proto WHERE url=\"$url\" AND id=$id"; | ||
| $result = $mysqli->query($query) or error($mysqli->error); | ||
| $row = $result->fetch_array(MYSQLI_ASSOC); | ||
| $viewed = ($result && $row) ? $row['viewed'] : 0; | ||
| $branch = basename(dirname(__FILE__, 4)); | ||
| if ($id === 0) | ||
| $query = "INSERT IGNORE INTO proto(url, viewed, stars, title, description, version, branch, license_url, license, " | ||
| ."base_type, needs_robot_ancestor, slot_type) " | ||
| ."VALUES(\"$url\", $viewed, $stars, \"$title\", \"$description\", \"$version\", \"$branch\", \"$license_url\", " | ||
| ."\"$license\", \"$base_type\", \"$needs_robot_ancestor\", \"$slot_type\")"; | ||
| else | ||
| $query = "UPDATE proto SET viewed=$viewed, stars=$stars, title=\"$title\", description=\"$description\", " | ||
| ."version=\"$version\", updated=NOW(), license_url=\"$license_url\", license=\"$license\", " | ||
| ."base_type=\"$base_type\", needs_robot_ancestor=\"$needs_robot_ancestor\", slot_type=\"$slot_type\" " | ||
| ."WHERE url=\"$url\" AND id=$id"; | ||
| $mysqli->query($query) or error($mysqli->error); | ||
| if ($mysqli->affected_rows != 1) { | ||
| if ($id === 0) | ||
| error("This proto already exists"); | ||
| else | ||
| error("Failed to update the proto"); | ||
| } | ||
|
|
||
| # return answer | ||
| $search = isset($data->search) ? $data->search : ""; | ||
| $condition = "branch=\"$branch\""; | ||
| if ($search != "") | ||
| $condition .= " AND LOWER(title) LIKE LOWER('%$search%')"; | ||
|
|
||
| $result = $mysqli->query("SELECT COUNT(*) AS count FROM proto WHERE $condition") or error($mysqli->error); | ||
| $count = $result->fetch_array(MYSQLI_ASSOC); | ||
| $total = intval($count['count']); | ||
|
|
||
| $answer = array(); | ||
| $answer['id'] = ($id === 0) ? $mysqli->insert_id : $id; | ||
| $answer['url'] = $url; | ||
| $answer['viewed'] = $viewed; | ||
| $answer['stars'] = $stars; | ||
| $answer['title'] = $title; | ||
| $answer['description'] = $description; | ||
| $answer['version'] = $version; | ||
| $answer['updated'] = date("Y-m-d H:i:s"); | ||
| $answer['total'] = $total; | ||
| die(json_encode($answer)); | ||
|
|
||
| function get_parent($externprotos, $base_proto, $parent_url) { | ||
| $found_parent = false; | ||
| $current_proto_content = false; | ||
| for($i = 0; $i < count($externprotos); $i++) { | ||
| if ($externprotos[$i][0] === $base_proto) { | ||
| $found_parent = true; | ||
| $extern_url = $externprotos[$i][1]; | ||
| if (str_starts_with($extern_url, "webots://")) | ||
| $extern_url = str_replace("webots://", "https://github.com/cyberbotics/webots/blob/released/", $extern_url); | ||
| else if (!str_starts_with($extern_url, "https")) | ||
| $extern_url = substr($parent_url, 0, strrpos($parent_url, '/') + 1).$extern_url; | ||
| $parent_url = $extern_url; | ||
| $check_url = proto_check_url($extern_url); | ||
| if (!is_array($check_url)) | ||
| error($check_url); | ||
| list($extern_username, $extern_repository, $extern_tag_or_branch, $extern_folder, $extern_proto) = $check_url; | ||
| $extern_proto_url = "https://raw.githubusercontent.com/$extern_username/$extern_repository/$extern_tag_or_branch$extern_folder$extern_proto"; | ||
| $extern_proto_content = @file_get_contents($extern_proto_url); | ||
| if ($extern_proto_content === false) | ||
| error("Could not retrieve parent proto with url'$extern_url'"); | ||
| $current_proto_content = $extern_proto_content; | ||
|
|
||
| $line = strtok($extern_proto_content, "\r\n"); | ||
| $line = strtok("\r\n"); | ||
| $externprotos = []; | ||
| while ($line !== false) { | ||
| $line == trim($line); | ||
| if (substr($line, 0, 11) === 'EXTERNPROTO') { | ||
| $proto_url = trim(str_replace('"', '',str_replace('EXTERNPROTO', '', $line))); | ||
| $proto_name = str_replace('.proto', '', $proto_url); | ||
| if (strrpos($proto_name, '/')) | ||
| $proto_name = substr($proto_name, strrpos($proto_name, '/') + 1); | ||
| array_push($externprotos, [$proto_name, $proto_url]); | ||
| } | ||
| $line = strtok("\r\n"); | ||
| } | ||
|
|
||
| preg_match("/(?:\]\s*)\{\s*(?:\%\<[\s\S]*?(?:\>\%\s*))?(?:DEF\s+[^\s]+)?\s+([a-zA-Z0-9\_\-\+]+)\s*\{/", | ||
| $extern_proto_content, $match); | ||
| if ($match) | ||
| $base_proto = $match[1]; | ||
|
|
||
| break; | ||
| } | ||
| } | ||
| if (!$found_parent) { | ||
| $str = ''; | ||
| for($i = 0; $i < count($externprotos); $i++) { | ||
| $str .= $externprotos[$i][0]; | ||
| } | ||
| error(" $str base: $base_proto parent_url: $parent_url"); | ||
| } | ||
| return array($externprotos, $base_proto, $current_proto_content, $parent_url, $found_parent); | ||
| } | ||
| ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| <?php | ||
| function error($message) { | ||
| die("{\"error\":\"$message\"}"); | ||
| } | ||
| header('Content-Type: application/json'); | ||
| $json = file_get_contents('php://input'); | ||
| $data = json_decode($json); | ||
| require '../../../php/database.php'; | ||
| $mysqli = new mysqli($database_host, $database_username, $database_password, $database_name); | ||
| if ($mysqli->connect_errno) | ||
| error("Can't connect to MySQL database: $mysqli->connect_error"); | ||
| $mysqli->set_charset('utf8'); | ||
| $user = isset($data->user) ? intval($data->user) : 0; | ||
| $password = isset($data->password) ? $mysqli->escape_string($data->password) : ''; | ||
| $id = isset($data->id) ? intval($data->id) : 0; | ||
| $query = "DELETE FROM proto WHERE id=$id AND EXISTS (SELECT * FROM user WHERE id=$user AND password='$password' AND email LIKE '%@cyberbotics.com')"; | ||
| $mysqli->query($query) or error($mysqli->error); | ||
| if ($mysqli->affected_rows === 0) | ||
| error("Could not delete proto"); | ||
| die('{"status":1}'); | ||
| ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?php # This script list available protos | ||
| function error($message) { | ||
| die("{\"error\":\"$message\"}"); | ||
| } | ||
| header('Content-Type: application/json'); | ||
| $json = file_get_contents('php://input'); | ||
| $data = json_decode($json); | ||
| require '../../../php/database.php'; | ||
| $mysqli = new mysqli($database_host, $database_username, $database_password, $database_name); | ||
| if ($mysqli->connect_errno) | ||
| error("Can't connect to MySQL database: $mysqli->connect_error"); | ||
| $mysqli->set_charset('utf8'); | ||
| $branch = basename(dirname(__FILE__, 4)); | ||
| $url = $mysqli->escape_string($data->url); | ||
| $condition = "branch=\"$branch\" AND url=\"$url\""; | ||
| $query = "SELECT base_type, description, version, license, license_url FROM proto WHERE $condition"; | ||
| $result = $mysqli->query($query) or error($mysqli->error); | ||
| die(json_encode($result->fetch_array(MYSQLI_ASSOC))); | ||
| ?> |
Oops, something went wrong.