Commit 4eacb212 authored by Ozzieisaacs's avatar Ozzieisaacs

Update updater

Update change logfile
code cosmetics js files
parent 6d907094
......@@ -134,6 +134,4 @@ def get_timezone():
from .updater import Updater
updater_thread = Updater()
__all__ = ['app']
updater_thread.start()
......@@ -604,8 +604,8 @@ def _configuration_update_helper():
{"active":0})
element["active"] = 0
_config_int("config_log_level")
_config_string("config_logfile")
reboot_required |= _config_int("config_log_level")
reboot_required |= _config_string("config_logfile")
if not logger.is_valid_logfile(config.config_logfile):
return _configuration_result('Logfile location is not valid, please enter correct path', gdriveError)
......@@ -968,7 +968,7 @@ def get_updater_status():
}
status['text'] = text
updater_thread.status = 0
updater_thread.start()
updater_thread.resume()
status['status'] = updater_thread.get_update_status()
elif request.method == "GET":
try:
......
......@@ -492,7 +492,7 @@ def get_book_cover_internal(book,
# saves book cover from url
def save_cover_from_url(url, book_path):
img = requests.get(url)
img = requests.get(url, timeout=10) # ToDo: Error Handling
return save_cover(img, book_path)
......
......@@ -24,7 +24,7 @@ import signal
import socket
try:
from gevent.pywsgi import WSGIServer
from gevent.pyewsgi import WSGIServer
from gevent.pool import Pool
from gevent import __version__ as _version
VERSION = 'Gevent ' + _version
......@@ -193,6 +193,9 @@ class WebServer(object):
self.stop()
def stop(self, restart=False):
from . import updater_thread
updater_thread.stop()
log.info("webserver stop (restart=%s)", restart)
self.restart = restart
if self.wsgiserver:
......
......@@ -17,8 +17,7 @@
// Upon loading load the logfile for the first option (event log)
$(function() {
if ($("#log_group input").length)
{
if ($("#log_group input").length) {
var element = $("#log_group input[type='radio']:checked").val();
init(element);
}
......
......@@ -61,6 +61,20 @@ $(function() {
$("#RestartDialog").modal("hide");
}
function cleanUp() {
clearInterval(updateTimerID);
$("#spinner2").hide();
$("#updateFinished").removeClass("hidden");
$("#check_for_update").removeClass("hidden");
$("#perform_update").addClass("hidden");
$("#message").alert("close");
$("#update_table > tbody > tr").each(function () {
if ($(this).attr("id") !== "current_version") {
$(this).closest("tr").remove();
}
});
}
function updateTimer() {
$.ajax({
dataType: "json",
......@@ -69,21 +83,12 @@ $(function() {
// console.log(data.status);
$("#Updatecontent").html(updateText[data.status]);
if (data.status > 6) {
clearInterval(updateTimerID);
$("#spinner2").hide();
$("#updateFinished").removeClass("hidden");
$("#check_for_update").removeClass("hidden");
$("#perform_update").addClass("hidden");
cleanUp();
}
},
error: function error() {
// console.log('Done');
clearInterval(updateTimerID);
$("#spinner2").hide();
$("#Updatecontent").html(updateText[7]);
$("#updateFinished").removeClass("hidden");
$("#check_for_update").removeClass("hidden");
$("#perform_update").addClass("hidden");
cleanUp();
},
timeout: 2000
});
......@@ -141,6 +146,8 @@ $(function() {
var $this = $(this);
var buttonText = $this.html();
$this.html("...");
$("#Updatecontent").html("");
$("#updateFinished").addClass("hidden");
$("#update_error").addClass("hidden");
if ($("#message").length) {
$("#message").alert("close");
......@@ -251,8 +258,8 @@ $(function() {
$("#btndeletetoken").click(function() {
//get data-id attribute of the clicked element
var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length-1].src;
var path = src.substring(0,src.lastIndexOf("/"));
var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length - 1].src;
var path = src.substring(0, src.lastIndexOf("/"));
// var domainId = $(this).value("domainId");
$.ajax({
method:"get",
......
......@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* exported TableActions */
/* exported TableActions, RestrictionActions*/
$(function() {
......@@ -94,46 +94,44 @@ $(function() {
$(e.currentTarget).find("#btndeletedomain").data("domainId", domainId);
});
$('#restrictModal').on('hidden.bs.modal', function () {
$("#restrictModal").on("hidden.bs.modal", function () {
// Destroy table and remove hooks for buttons
$("#restrict-elements-table").unbind();
$('#restrict-elements-table').bootstrapTable('destroy');
$("#restrict-elements-table").bootstrapTable("destroy");
$("[id^=submit_]").unbind();
$('#h1').addClass('hidden');
$('#h2').addClass('hidden');
$('#h3').addClass('hidden');
$('#h4').addClass('hidden');
});
function startTable(type){
var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length-1].src;
var path = src.substring(0,src.lastIndexOf("/"));
$("#h1").addClass("hidden");
$("#h2").addClass("hidden");
$("#h3").addClass("hidden");
$("#h4").addClass("hidden");
});
function startTable(type) {
var pathname = document.getElementsByTagName("script"), src = pathname[pathname.length - 1].src;
var path = src.substring(0, src.lastIndexOf("/"));
$("#restrict-elements-table").bootstrapTable({
formatNoMatches: function () {
return "";
},
url: path + "/../../ajax/listrestriction/" + type,
rowStyle: function(row, index) {
console.log('Reihe :' + row + ' Index :'+ index);
if (row.id.charAt(0) == 'a') {
return {classes: 'bg-primary'}
}
else {
return {classes: 'bg-dark-danger'}
// console.log('Reihe :' + row + " Index :" + index);
if (row.id.charAt(0) === "a") {
return {classes: "bg-primary"};
} else {
return {classes: "bg-dark-danger"};
}
},
onClickCell: function (field, value, row, $element) {
if(field == 3){
console.log("element")
if (field == 3) {
$.ajax ({
type: 'Post',
data: 'id=' + row.id + '&type=' + row.type + "&Element=" + row.Element,
type: "Post",
data: "id=" + row.id + "&type=" + row.type + "&Element=" + row.Element,
url: path + "/../../ajax/deleterestriction/" + type,
async: true,
timeout: 900,
success:function(data) {
$.ajax({
method:"get",
url: path + "/../../ajax/listrestriction/"+type,
url: path + "/../../ajax/listrestriction/" + type,
async: true,
timeout: 900,
success:function(data) {
......@@ -146,12 +144,11 @@ $(function() {
},
striped: false
});
$("#restrict-elements-table").removeClass('table-hover');
$("#restrict-elements-table").on('editable-save.bs.table', function (e, field, row, old, $el) {
console.log("Hallo");
$("#restrict-elements-table").removeClass("table-hover");
$("#restrict-elements-table").on("editable-save.bs.table", function (e, field, row, old, $el) {
$.ajax({
url: path + "/../../ajax/editrestriction/"+type,
type: 'Post',
url: path + "/../../ajax/editrestriction/" + type,
type: "Post",
data: row //$(this).closest("form").serialize() + "&" + $(this)[0].name + "=",
});
});
......@@ -159,15 +156,14 @@ $(function() {
// event.stopPropagation();
// event.preventDefault();
$(this)[0].blur();
console.log($(this)[0].name);
$.ajax({
url: path + "/../../ajax/addrestriction/"+type,
type: 'Post',
url: path + "/../../ajax/addrestriction/" + type,
type: "Post",
data: $(this).closest("form").serialize() + "&" + $(this)[0].name + "=",
success: function () {
$.ajax ({
method:"get",
url: path + "/../../ajax/listrestriction/"+type,
url: path + "/../../ajax/listrestriction/" + type,
async: true,
timeout: 900,
success:function(data) {
......@@ -179,28 +175,24 @@ $(function() {
return;
});
}
$('#get_column_values').on('click',function()
{
$("#get_column_values").on("click", function() {
startTable(1);
$('#h2').removeClass('hidden');
$("#h2").removeClass("hidden");
});
$('#get_tags').on('click',function()
{
$("#get_tags").on("click", function() {
startTable(0);
$('#h1').removeClass('hidden');
$("#h1").removeClass("hidden");
});
$('#get_user_column_values').on('click',function()
{
$("#get_user_column_values").on("click", function() {
startTable(3);
$('#h4').removeClass('hidden');
$("#h4").removeClass("hidden");
});
$('#get_user_tags').on('click',function()
{
$("#get_user_tags").on("click", function() {
startTable(2);
$(this)[0].blur();
$('#h3').removeClass('hidden');
$("#h3").removeClass("hidden");
});
});
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment