dockeruser
/
CouchPotatoServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Log cleanup

pull/5287/head
Ruud 10 years ago
parent
ee23067ebb
commit
5314fc7112
5 changed files with 130 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      couchpotato/core/plugins/log/main.py
  2. 116
      couchpotato/core/plugins/log/static/log.js
  3. 12
      couchpotato/core/plugins/log/static/log.scss
  4. 105
      couchpotato/static/scripts/combined.plugins.min.js
  5. 2
      couchpotato/static/style/combined.min.css

5
couchpotato/core/plugins/log/main.py
View File

@ -131,11 +131,12 @@ class Logging(Plugin):
def toList(self, log_content = ''):
logs_raw = toUnicode(log_content).split('[0m\n')
logs_raw = re.split(r'\[0m\n', toUnicode(log_content))
logs = []
re_split = r'\x1b'
for log_line in logs_raw:
split = splitString(log_line, '\x1b')
split = re.split(re_split, log_line)
if split:
try:
date, time, log_type = splitString(split[0], ' ')

116
couchpotato/core/plugins/log/static/log.js
View File

@ -7,6 +7,7 @@ Page.Log = new Class({
title: 'Show recent logs.',
has_tab: false,
navigation: null,
log_items: [],
report_text: '### Steps to reproduce:\n'+
'1. ..\n'+
@ -43,7 +44,15 @@ Page.Log = new Class({
}
}).inject(self.content);
Api.request('logging.get', {
if(self.navigation){
var nav = self.navigation.getElement('.nav');
nav.getElements('.active').removeClass('active');
self.navigation.getElements('li')[nr+1].addClass('active');
}
if(self.request && self.request.running) self.request.cancel();
self.request = Api.request('logging.get', {
'data': {
'nr': nr
},
@ -52,67 +61,68 @@ Page.Log = new Class({
self.log_items = self.createLogElements(json.log);
self.log.adopt(self.log_items);
self.log.removeClass('loading');
self.scrollToBottom();
var navigation = new Element('div.navigation').adopt(
new Element('h2[text=Logs]'),
new Element('div.hint', {
'text': 'Select multiple lines & report an issue'
})
);
if(!self.navigation){
self.navigation = new Element('div.navigation').adopt(
new Element('h2[text=Logs]'),
new Element('div.hint', {
'text': 'Select multiple lines & report an issue'
})
);
var nav = new Element('ul.nav', {
'events': {
'click:relay(li.select)': function (e, el) {
self.getLogs(parseInt(el.get('text')) - 1);
var nav = new Element('ul.nav', {
'events': {
'click:relay(li.select)': function (e, el) {
self.getLogs(parseInt(el.get('text')) - 1);
}
}
}).inject(self.navigation);
// Type selection
new Element('li.filter').grab(
new Element('select', {
'events': {
'change': function () {
var type_filter = this.getSelected()[0].get('value');
self.content.set('data-filter', type_filter);
self.scrollToBottom();
}
}
}).adopt(
new Element('option', {'value': 'ALL', 'text': 'Show all logs'}),
new Element('option', {'value': 'INFO', 'text': 'Show only INFO'}),
new Element('option', {'value': 'DEBUG', 'text': 'Show only DEBUG'}),
new Element('option', {'value': 'ERROR', 'text': 'Show only ERROR'})
)
).inject(nav);
// Selections
for (var i = 0; i <= json.total; i++) {
new Element('li', {
'text': i + 1,
'class': 'select ' + (nr == i ? 'active' : '')
}).inject(nav);
}
}).inject(navigation);
// Type selection
new Element('li.filter').grab(
new Element('select', {
// Clear button
new Element('li.clear', {
'text': 'clear',
'events': {
'change': function () {
var type_filter = this.getSelected()[0].get('value');
self.content.set('data-filter', type_filter);
self.scrollToBottom();
'click': function () {
Api.request('logging.clear', {
'onComplete': function () {
self.getLogs(0);
}
});
}
}
}).adopt(
new Element('option', {'value': 'ALL', 'text': 'Show all logs'}),
new Element('option', {'value': 'INFO', 'text': 'Show only INFO'}),
new Element('option', {'value': 'DEBUG', 'text': 'Show only DEBUG'}),
new Element('option', {'value': 'ERROR', 'text': 'Show only ERROR'})
)
).inject(nav);
// Selections
for (var i = 0; i <= json.total; i++) {
new Element('li', {
'text': i + 1,
'class': 'select ' + (nr == i ? 'active' : '')
}).inject(nav);
}
// Clear button
new Element('li.clear', {
'text': 'clear',
'events': {
'click': function () {
Api.request('logging.clear', {
'onComplete': function () {
self.getLogs(0);
}
});
}
}
}).inject(nav);
// Add to page
navigation.inject(self.content, 'top');
self.scrollToBottom();
// Add to page
self.navigation.inject(self.content, 'top');
}
}
});
@ -142,7 +152,7 @@ Page.Log = new Class({
},
scrollToBottom: function () {
new Fx.Scroll(this.el, {'duration': 0}).toBottom();
new Fx.Scroll(this.content, {'duration': 0}).toBottom();
},
showSelectionButton: function(e){

12
couchpotato/core/plugins/log/static/log.scss
View File

@ -34,17 +34,17 @@
margin-top: 3px;
}
.loading {
text-align: center;
font-size: 20px;
padding: 50px;
}
.container {
padding: $padding;
overflow: hidden;
line-height: 150%;
&.loading {
text-align: center;
font-size: 20px;
padding: 100px 50px;
}
select {
vertical-align: top;
}

105
couchpotato/static/scripts/combined.plugins.min.js
View File

@ -2952,6 +2952,7 @@ Page.Log = new Class({
name: "log",
title: "Show recent logs.",
has_tab: false,
navigation: null,
log_items: [],
report_text: "### Steps to reproduce:\n" + "1. ..\n" + "2. ..\n" + "\n" + "### Information:\n" + "Movie(s) I have this with: ...\n" + "Quality of the movie being searched: ...\n" + "Providers I use: ...\n" + "Version of CouchPotato: {version}\n" + "Running on: ...\n" + "\n" + "### Logs:\n" + "```\n{issue}```",
indexAction: function() {
@ -2969,7 +2970,13 @@ Page.Log = new Class({
}
}
}).inject(self.content);
Api.request("logging.get", {
if (self.navigation) {
var nav = self.navigation.getElement(".nav");
nav.getElements(".active").removeClass("active");
self.navigation.getElements("li")[nr + 1].addClass("active");
}
if (self.request && self.request.running) self.request.cancel();
self.request = Api.request("logging.get", {
data: {
nr: nr
},
@ -2978,57 +2985,59 @@ Page.Log = new Class({
self.log_items = self.createLogElements(json.log);
self.log.adopt(self.log_items);
self.log.removeClass("loading");
var navigation = new Element("div.navigation").adopt(new Element("h2[text=Logs]"), new Element("div.hint", {
text: "Select multiple lines & report an issue"
}));
var nav = new Element("ul.nav", {
events: {
"click:relay(li.select)": function(e, el) {
self.getLogs(parseInt(el.get("text")) - 1);
self.scrollToBottom();
if (!self.navigation) {
self.navigation = new Element("div.navigation").adopt(new Element("h2[text=Logs]"), new Element("div.hint", {
text: "Select multiple lines & report an issue"
}));
var nav = new Element("ul.nav", {
events: {
"click:relay(li.select)": function(e, el) {
self.getLogs(parseInt(el.get("text")) - 1);
}
}
}
}).inject(navigation);
new Element("li.filter").grab(new Element("select", {
events: {
change: function() {
var type_filter = this.getSelected()[0].get("value");
self.content.set("data-filter", type_filter);
self.scrollToBottom();
}).inject(self.navigation);
new Element("li.filter").grab(new Element("select", {
events: {
change: function() {
var type_filter = this.getSelected()[0].get("value");
self.content.set("data-filter", type_filter);
self.scrollToBottom();
}
}
}).adopt(new Element("option", {
value: "ALL",
text: "Show all logs"
}), new Element("option", {
value: "INFO",
text: "Show only INFO"
}), new Element("option", {
value: "DEBUG",
text: "Show only DEBUG"
}), new Element("option", {
value: "ERROR",
text: "Show only ERROR"
}))).inject(nav);
for (var i = 0; i <= json.total; i++) {
new Element("li", {
text: i + 1,
class: "select " + (nr == i ? "active" : "")
}).inject(nav);
}
}).adopt(new Element("option", {
value: "ALL",
text: "Show all logs"
}), new Element("option", {
value: "INFO",
text: "Show only INFO"
}), new Element("option", {
value: "DEBUG",
text: "Show only DEBUG"
}), new Element("option", {
value: "ERROR",
text: "Show only ERROR"
}))).inject(nav);
for (var i = 0; i <= json.total; i++) {
new Element("li", {
text: i + 1,
class: "select " + (nr == i ? "active" : "")
new Element("li.clear", {
text: "clear",
events: {
click: function() {
Api.request("logging.clear", {
onComplete: function() {
self.getLogs(0);
}
});
}
}
}).inject(nav);
self.navigation.inject(self.content, "top");
}
new Element("li.clear", {
text: "clear",
events: {
click: function() {
Api.request("logging.clear", {
onComplete: function() {
self.getLogs(0);
}
});
}
}
}).inject(nav);
navigation.inject(self.content, "top");
self.scrollToBottom();
}
});
},
@ -3048,7 +3057,7 @@ Page.Log = new Class({
return elements;
},
scrollToBottom: function() {
new Fx.Scroll(this.el, {
new Fx.Scroll(this.content, {
duration: 0
}).toBottom();
},

2
couchpotato/static/style/combined.min.css
View File

@ -402,8 +402,8 @@
.page.log .nav li.clear,.page.log .nav li.select{cursor:pointer}
.page.log .nav li.active{font-weight:700;cursor:default}
.page.log .hint{font-style:italic;opacity:.5;margin-top:3px}
.page.log .loading{text-align:center;font-size:20px;padding:50px}
.page.log .container{padding:20px;overflow:hidden;line-height:150%}
.page.log .container.loading{text-align:center;font-size:20px;padding:100px 50px}
.page.log .container select{vertical-align:top}
.page.log .container .time{clear:both;font-size:11px;border-top:1px solid rgba(255,255,255,.1);position:relative;overflow:hidden;padding:0 3px;font-family:Lucida Console,Monaco,Nimbus Mono L,monospace,serif}
.page.log .container .time.highlight{background:#eaeaea}

Write Preview
Loading…
Cancel
Save