Skip to content

Commit

Permalink
file sandbox: put 'file list' and 'add file' on different pages
Browse files Browse the repository at this point in the history 
file sandbox: use Location: to prevent repeating op on page reload
BUDA: add explanatory text
  • Loading branch information
@davidpanderson
davidpanderson committed Dec 5, 2024
1 parent e14f715 commit f24fc22
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 39 deletions.
35 changes: 19 additions & 16 deletions html/user/buda.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,10 @@ function app_list($notice=null) {
text_start();
echo "
<p>BUDA (BOINC Universal Docker App)
lets you submit Docker jobs through a web interface;
lets you submit Docker jobs using a web interface;
you don't need to log into the BOINC server.
<p>
To use BUDA, you set up a 'science app' and one or more 'variants'.
Each variant includes a Dockerfile,
a main program to run within the container,
and any other files that are needed.
<p>
Typically there is a variant named 'cpu' that uses one CPU.
The names of other variants are plan class names;
these can be versions that use a GPU or multiple CPUs.
<a href=https://github.com/BOINC/boinc/wiki/BUDA-overview>BUDA overview</a>.
";

echo "<h2>Science apps</h2>";
Expand All @@ -73,14 +66,14 @@ function show_app($dir) {
global $buda_root;
echo "<hr><font size=+3>$dir</font>\n";
start_table('table-striped');
table_header('Variant name (click for details)', 'Submit jobs');
table_header('Variant name<br><small>click for details</small>', 'Submit jobs');
$pcs = scandir("$buda_root/$dir");
foreach ($pcs as $pc) {
if ($pc[0] == '.') continue;
table_row(
"<a href=buda.php?action=variant_view&app=$dir&variant=$pc>$pc</href>",
button_text(
"buda_submit.php?app=$dir&variant=$pc", "Submit"
"buda_submit.php?app=$dir&variant=$pc", "Submission form"
)
);
}
Expand Down Expand Up @@ -134,15 +127,25 @@ function variant_form($user) {
$app = get_str('app');
if (!is_valid_filename($app)) die('bad arg');

page_head("Create variant of Docker app $app");
page_head("Create a variant of Docker app $app");
echo "
Details are <a href=https://github.com/BOINC/boinc/wiki/BUDA-job-submission#adding-a-variant>here</a>.
";
$sb = '<br><small>From your <a href=sandbox.php>file sandbox</a></small>';
form_start('buda.php');
form_input_hidden('app', $app);
form_input_hidden('action', 'variant_action');
form_input_text('Plan class', 'variant');
form_select('Dockerfile', 'dockerfile', $sbitems);
form_select_multiple('Application files', 'app_files', $sbitems);
form_input_text('Input file names', 'input_file_names');
form_input_text('Output file names', 'output_file_names');
form_select("Dockerfile$sb", 'dockerfile', $sbitems);
form_select_multiple("Application files$sb", 'app_files', $sbitems);
form_input_text(
'Input file names<br><small>Space-separated</small>',
'input_file_names'
);
form_input_text(
'Output file names<br><small>Space-separated</small>',
'output_file_names'
);
form_submit('OK');
form_end();
page_tail();
Expand Down
2 changes: 1 addition & 1 deletion html/user/buda_submit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function submit_form($user) {
form_input_hidden('app', $app);
form_input_hidden('variant', $variant);
form_select("Batch zip file $desc", 'batch_file', $sbitems_zip);
form_input_text('Command line arguments', 'cmdline');
form_input_text('Command-line arguments', 'cmdline');
form_checkbox(
"Enabled debugging output <br><small>Write Docker commands and output to stderr</small>.",
'wrapper_verbose'
Expand Down
67 changes: 45 additions & 22 deletions html/user/sandbox.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,37 @@

display_errors();

function list_files($user, $notice) {
$dir = sandbox_dir($user);
if (!is_dir($dir)) error_page("Can't open sandbox directory");
page_head("File sandbox");
if ($notice) {
echo "<p>$notice<hr>";
}
function add_form() {
page_head('Upload files to your sandbox');
echo "
There are several ways to upload files:
<p>
<hr>
<h3>Upload files from this computer</h3>
<p>
NOTE: if you upload text files from Windows,
";
form_start('sandbox.php', 'post', 'ENCTYPE="multipart/form-data"');
form_general('',
"NOTE: if you upload text files from Windows,
they will be given CRLF line endings.
Then, if they are shell scripts, they won't work on Linux.
Add shell scripts using 'Add text file' below.
<p>
If they are shell scripts, they won't work on Linux.
Add shell scripts using 'Add text file' below."
);
form_input_hidden('action', 'upload_file');
form_general('',
'<input size=80 type=file name="new_file[]" multiple="multiple">'
);
form_submit('Upload');
form_end();
if (0) {
echo "
<form action=sandbox.php method=post ENCTYPE=\"multipart/form-data\">
<input type=hidden name=action value=upload_file>
<p><p><input size=80 type=file name=\"new_file[]\" multiple=\"multiple\">
<p> <input class=\"btn btn-success\" type=submit value=Upload>
</form>
";
}
echo "
<hr>
<h3>Add text file</h3>
";
Expand All @@ -72,9 +81,20 @@ function list_files($user, $notice) {
form_input_text('URL', 'url');
form_submit('OK');
form_end();
page_tail();
}

function list_files($user) {
$dir = sandbox_dir($user);
if (!is_dir($dir)) error_page("Can't open sandbox directory");
page_head("File sandbox");
$notice = get_str('notice', true);
if ($notice) {
echo "<p>$notice<hr>";
}
echo "
<hr>
<h3>Sandbox contents</h3>
<p>
Your 'File sandbox' is where you store files to this BOINC server.
";
$files = array();
foreach (scandir($dir) as $f) {
Expand All @@ -86,7 +106,7 @@ function list_files($user, $notice) {
} else {
sort($files);
start_table();
table_header("Name<br><p class=\"text-muted\">(click to view text files)</p>", "Modified", "Size (bytes)", "MD5", "Delete","Download");
table_header("Name<br><small>(click to view text files)</small>", "Modified", "Size (bytes)", "MD5", "Delete","Download");
foreach ($files as $f) {
[$md5, $size] = sandbox_parse_info_file($user, $f);
$path = "$dir/$f";
Expand All @@ -108,6 +128,7 @@ function list_files($user, $notice) {
}
end_table();
}
show_button('sandbox.php?action=add_form', 'Upload files');
page_tail();
}

Expand Down Expand Up @@ -139,12 +160,13 @@ function upload_file($user) {

$notice .= "Uploaded file <strong>$name</strong><br/>";
}
list_files($user, $notice);
header(sprintf('Location: sandbox.php?notice=%s', urlencode($notice)));
}

function add_file($user) {
$dir = sandbox_dir($user);
$name = post_str('name');
if (!$name) error_page('No name given');
if (file_exists("$dir/$name")) {
error_page("file $name exists");
}
Expand All @@ -155,8 +177,8 @@ function add_file($user) {
[$md5, $size] = get_file_info("$dir/$name");
write_info_file("$dir/.md5/$name", $md5, $size);

$notice = "Uploaded file <strong>$name</strong><br/>";
list_files($user, $notice);
$notice = "Added file <strong>$name</strong> ($size bytes)";
header(sprintf('Location: sandbox.php?notice=%s', urlencode($notice)));
}

function get_file($user) {
Expand All @@ -169,7 +191,7 @@ function get_file($user) {
}
copy($url, $path);
$notice = "Fetched file from <strong>$url</strong><br/>";
list_files($user, $notice);
header(sprintf('Location: sandbox.php?notice=%s', urlencode($notice)));
}

// delete a sandbox file.
Expand All @@ -180,7 +202,7 @@ function delete_file($user) {
unlink("$dir/$name");
unlink("$dir/.md5/$name");
$notice = "<strong>$name</strong> was deleted from your sandbox<br/>";
list_files($user, $notice);
header(sprintf('Location: sandbox.php?notice=%s', urlencode($notice)));
}

function download_file($user) {
Expand Down Expand Up @@ -208,13 +230,14 @@ function view_file($user) {
if (!$action) $action = post_str('action', true);

switch ($action) {
case '': list_files($user,""); break;
case '': list_files($user); break;
case 'upload_file': upload_file($user); break;
case 'add_file': add_file($user); break;
case 'get_file': get_file($user); break;
case 'delete_file': delete_file($user); break;
case 'download_file': download_file($user); break;
case 'view_file': view_file($user); break;
case 'add_form': add_form($user); break;
default: error_page("no such action: $action");
}

Expand Down

0 comments on commit f24fc22

Please sign in to comment.