Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load link using ajax when page loaded and when export complete #78

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Load link using ajax when page loaded and when export complete #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions backup-module/backup_controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@ function backup_controller()
}
}

if ($route->action == 'exportlink') {
$route->format = "text";
$backup_filename="emoncms-backup-".gethostname()."-".date("Y-m-d").".tar.gz";
if (file_exists($parsed_ini['backup_location']."/".$backup_filename) && !file_exists("/tmp/backuplock")) {
$result = '<br><br><b>Right Click > Download:</b><br><a href="'.$path.'backup/download">'.$backup_filename.'</a>';
} else {
$result = '<br><br>No backup file exists for today<b></b>';
}
}

if ($route->action == 'importlog') {
$route->format = "text";
if (file_exists($import_logfile)) {
Expand Down
18 changes: 11 additions & 7 deletions backup-module/backup_view.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,8 @@
<button id="emonpi-backup" class="btn btn-info"><?php echo _('Create backup'); ?></button>
<br><br>
<pre id="export-log-bound" class="log"><div id="export-log"></div></pre>
<?php
$backup_filename="emoncms-backup-".gethostname()."-".date("Y-m-d").".tar.gz";
if (file_exists($parsed_ini['backup_location']."/".$backup_filename) && !file_exists("/tmp/backuplock")) {
echo '<br><br><b>Right Click > Download:</b><br><a href="'.$path.'backup/download">'.$backup_filename.'</a>';
}
?>
<div id="export-link"></div>
<br><br>
<p>Once export is complete refresh page to see download link.</p>
<p><i>Note: Export can take a long time; please be patient.</i></p>
</div>
</div>
Expand Down Expand Up @@ -136,6 +130,7 @@ function selectTab(hash) {
export_updater = setInterval(export_log_update,1000);
import_updater = setInterval(import_log_update,1000);
usb_import_updater = setInterval(usb_import_log_update,1000);
export_log_link();

$("#emonpi-backup").click(function() {
$.ajax({ url: path+"backup/start", async: true, dataType: "text", success: function(result) {
Expand Down Expand Up @@ -163,11 +158,20 @@ function export_log_update() {

if (result.indexOf("=== Emoncms export complete! ===")!=-1 || result.indexOf("=== Emoncms export completed with ERRORS! ===")!=-1) {
clearInterval(export_updater);
export_log_link();
}
}
});
}

function export_log_link() {
$.ajax({ url: path+"backup/exportlink", async: true, dataType: "text", success: function(result)
{
$("#export-link").html(result);
}
});
}

function import_log_update() {
$.ajax({ url: path+"backup/importlog", async: true, dataType: "text", success: function(result)
{
Expand Down