infrastructure/blender-buildbot-www
1
0
Fork 2
Code Issues 4 Pull Requests 1 Projects Releases Wiki Activity

Add support for JSON listing #1

Merged
Francesco Siddi merged 7 commits from json-view into develop 2023-11-01 12:08:09 +01:00
Conversation 2 Commits 7 Files Changed 2 +57 -6
2 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/BuildsRenderer.php
View File

@ -8,6 +8,31 @@ class BuildsRenderer {
$this->builds = $builds; $this->builds = $builds;
} }
public function renderJSON() {
/* Return a JSON formatted list of builds. */
$builds_json = array();
foreach ($this->builds as $build) {
$builds_json[] = array(
'url' => $this->getFileNameURL($build),
'app' => $build->app,
'version' => $build->version,
'risk_id' => $build->risk_id,
'branch' => $build->branch,
'patch' => $build->patch,
'hash' => $build->hash,
'platform' => $build->platform,
'architecture' => $build->architecture,
'bitness' => $build->bitness,
'file_mtime' => $build->file_mtime,
'file_name' => $build->file_name,
'file_size' => $build->file_size,
'file_extension' => $build->file_extension,
'release_cycle' => $build->release_cycle,
);
}
echo(json_encode($builds_json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
}
public function renderPage() { public function renderPage() {
$platform_filters = array( $platform_filters = array(
'windows', 'windows',
@ -257,7 +282,7 @@ class BuildsRenderer {
$request_uri = ($_SERVER['REQUEST_URI'] == "/" || $request_uri = ($_SERVER['REQUEST_URI'] == "/" ||
stringContains($_SERVER['REQUEST_URI'], "bpy")) ? stringContains($_SERVER['REQUEST_URI'], "bpy")) ?
"/download/daily" : $_SERVER['REQUEST_URI']; "/download/daily" : strtok($_SERVER['REQUEST_URI'], '?');
$env_id = getEnvId(); $env_id = getEnvId();

36
source/main.php
View File

@ -13,6 +13,29 @@ function handleNotFoundRequest() {
return; return;
} }
function renderDownloadResponseAsJSON($lister) {
header('Content-Type: application/json; charset=utf-8');
// Require v=1 to be specified
if (!isset($_GET['v']) || $_GET['v'] != '1') {
$data = [ 'error' => 'Missing supported format version, for example v=1'];
echo json_encode( $data );
http_response_code(400);
return;
}
$builds = $lister->getBuilds();
$renderer = new BuildsRenderer($builds);
$renderer->renderJSON();
return;
}
function renderDownloadResponseAsHTML($lister) {
// Serve the directory listing as HTML.
require 'templates/header.php';
// Logic inside content_build_lister.php will render the list of builds
require 'templates/content_build_lister.php';
require 'templates/footer.php';
}
function handleDownloadRequest() { function handleDownloadRequest() {
$lister = createListerForCurrentRequest(); $lister = createListerForCurrentRequest();
$is_valid = $lister->isValid(); $is_valid = $lister->isValid();
@ -29,11 +52,14 @@ function handleDownloadRequest() {
return; return;
} }
// Serve the directory listing. // Check if we are requesting a JSON formatted view.
require 'templates/header.php'; if (isset($_GET['format']) && $_GET['format'] == 'json') {
// Logic inside content_build_lister.php will render the list of builds renderDownloadResponseAsJSON($lister);
require 'templates/content_build_lister.php'; return;
require 'templates/footer.php'; }
renderDownloadResponseAsHTML($lister);
} }
function handleDashboardRequest() { function handleDashboardRequest() {