Skip to content

G
glances

蜕变的菜鸟 / glances
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
G
glances

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 ba1757a2 编写于 作者: N Nicolas Hennion
浏览文件
操作

Rename get_curse to get_stats_display

上级 edee3fb2
隐藏空白更改
内联 并排
Showing with 41 addition and 51 deletion
glances/outputs/glances_bottle.py
浏览文件 @ ba1757a2
......@@ -133,29 +133,29 @@ class glancesBottle:
html = template('header', refresh_time=refresh_time)
html += '<header>'
html += self.display_plugin('system', self.stats.get_plugin('system').get_curse(args=self.args))
html += self.display_plugin('uptime', self.stats.get_plugin('uptime').get_curse(args=self.args))
html += self.display_plugin('system', self.stats.get_plugin('system').get_stats_display(args=self.args))
html += self.display_plugin('uptime', self.stats.get_plugin('uptime').get_stats_display(args=self.args))
html += '</header>'
html += template('newline')
html += '<section>'
html += self.display_plugin('cpu', self.stats.get_plugin('cpu').get_curse(args=self.args))
html += self.display_plugin('load', self.stats.get_plugin('load').get_curse(args=self.args))
html += self.display_plugin('mem', self.stats.get_plugin('mem').get_curse(args=self.args))
html += self.display_plugin('memswap', self.stats.get_plugin('memswap').get_curse(args=self.args))
html += self.display_plugin('cpu', self.stats.get_plugin('cpu').get_stats_display(args=self.args))
html += self.display_plugin('load', self.stats.get_plugin('load').get_stats_display(args=self.args))
html += self.display_plugin('mem', self.stats.get_plugin('mem').get_stats_display(args=self.args))
html += self.display_plugin('memswap', self.stats.get_plugin('memswap').get_stats_display(args=self.args))
html += '</section>'
html += template('newline')
html += '<div>'
html += '<aside>'
html += self.display_plugin('network', self.stats.get_plugin('network').get_curse(args=self.args))
html += self.display_plugin('diskio', self.stats.get_plugin('diskio').get_curse(args=self.args))
html += self.display_plugin('fs', self.stats.get_plugin('fs').get_curse(args=self.args))
html += self.display_plugin('sensors', self.stats.get_plugin('sensors').get_curse(args=self.args))
html += self.display_plugin('network', self.stats.get_plugin('network').get_stats_display(args=self.args))
html += self.display_plugin('diskio', self.stats.get_plugin('diskio').get_stats_display(args=self.args))
html += self.display_plugin('fs', self.stats.get_plugin('fs').get_stats_display(args=self.args))
html += self.display_plugin('sensors', self.stats.get_plugin('sensors').get_stats_display(args=self.args))
html += '</aside>'
html += '<section>'
html += self.display_plugin('alert', self.stats.get_plugin('alert').get_curse(args=self.args))
html += self.display_plugin('processcount', self.stats.get_plugin('processcount').get_curse(args=self.args))
html += self.display_plugin('monitor', self.stats.get_plugin('monitor').get_curse(args=self.args))
html += self.display_plugin('processlist', self.stats.get_plugin('processlist').get_curse(args=self.args))
html += self.display_plugin('alert', self.stats.get_plugin('alert').get_stats_display(args=self.args))
html += self.display_plugin('processcount', self.stats.get_plugin('processcount').get_stats_display(args=self.args))
html += self.display_plugin('monitor', self.stats.get_plugin('monitor').get_stats_display(args=self.args))
html += self.display_plugin('processlist', self.stats.get_plugin('processlist').get_stats_display(args=self.args))
html += '</section>'
html += '</div>'
html += template('newline')
......
glances/outputs/glances_curses.py
浏览文件 @ ba1757a2
......@@ -270,7 +270,7 @@ class glancesCurses:
if (self.args.help_tag):
# Display the stats...
self.display_plugin(stats.get_plugin('help').get_curse(args=self.args))
self.display_plugin(stats.get_plugin('help').get_stats_display(args=self.args))
# ... and exit
return False
......@@ -278,24 +278,24 @@ class glancesCurses:
self.args.cs_status = cs_status
# Display first line (system+uptime)
stats_system = stats.get_plugin('system').get_curse(args=self.args)
stats_uptime = stats.get_plugin('uptime').get_curse()
l = self.get_curse_width(stats_system) + self.get_curse_width(stats_uptime) + self.space_between_column
stats_system = stats.get_plugin('system').get_stats_display(args=self.args)
stats_uptime = stats.get_plugin('uptime').get_stats_display()
l = self.get_stats_display_width(stats_system) + self.get_stats_display_width(stats_uptime) + self.space_between_column
self.display_plugin(stats_system, display_optional=(screen_x >= l))
self.display_plugin(stats_uptime)
# Display second line (CPU|PERCPU+LOAD+MEM+SWAP+<SUMMARY>)
# CPU|PERCPU
if (self.args.percpu):
stats_percpu = stats.get_plugin('percpu').get_curse()
l = self.get_curse_width(stats_percpu)
stats_percpu = stats.get_plugin('percpu').get_stats_display()
l = self.get_stats_display_width(stats_percpu)
else:
stats_cpu = stats.get_plugin('cpu').get_curse()
l = self.get_curse_width(stats_cpu)
stats_load = stats.get_plugin('load').get_curse()
stats_mem = stats.get_plugin('mem').get_curse()
stats_memswap = stats.get_plugin('memswap').get_curse()
l += self.get_curse_width(stats_load) + self.get_curse_width(stats_mem) + self.get_curse_width(stats_memswap)
stats_cpu = stats.get_plugin('cpu').get_stats_display()
l = self.get_stats_display_width(stats_cpu)
stats_load = stats.get_plugin('load').get_stats_display()
stats_mem = stats.get_plugin('mem').get_stats_display()
stats_memswap = stats.get_plugin('memswap').get_stats_display()
l += self.get_stats_display_width(stats_load) + self.get_stats_display_width(stats_mem) + self.get_stats_display_width(stats_memswap)
# Space between column
if (screen_x > (3 * self.space_between_column + l)):
self.space_between_column = int((screen_x - l) / 3)
......@@ -311,23 +311,23 @@ class glancesCurses:
self.space_between_column = 3
# Display left sidebar (NETWORK+DISKIO+FS+SENSORS)
self.display_plugin(stats.get_plugin('network').get_curse(args=self.args))
self.display_plugin(stats.get_plugin('diskio').get_curse(args=self.args))
self.display_plugin(stats.get_plugin('fs').get_curse(args=self.args))
self.display_plugin(stats.get_plugin('sensors').get_curse(args=self.args))
self.display_plugin(stats.get_plugin('network').get_stats_display(args=self.args))
self.display_plugin(stats.get_plugin('diskio').get_stats_display(args=self.args))
self.display_plugin(stats.get_plugin('fs').get_stats_display(args=self.args))
self.display_plugin(stats.get_plugin('sensors').get_stats_display(args=self.args))
# Display last line (currenttime)
self.display_plugin(stats.get_plugin('now').get_curse())
self.display_plugin(stats.get_plugin('now').get_stats_display())
# Display right sidebar (PROCESS_COUNT+MONITORED+PROCESS_LIST+ALERT)
if (screen_x > 52):
stats_processcount = stats.get_plugin('processcount').get_curse(args=self.args)
stats_processlist = stats.get_plugin('processlist').get_curse(args=self.args)
stats_alert = stats.get_plugin('alert').get_curse(args=self.args)
stats_monitor = stats.get_plugin('monitor').get_curse(args=self.args)
stats_processcount = stats.get_plugin('processcount').get_stats_display(args=self.args)
stats_processlist = stats.get_plugin('processlist').get_stats_display(args=self.args)
stats_alert = stats.get_plugin('alert').get_stats_display(args=self.args)
stats_monitor = stats.get_plugin('monitor').get_stats_display(args=self.args)
self.display_plugin(stats_processcount)
self.display_plugin(stats_monitor)
self.display_plugin(stats_processlist,
max_y=(screen_y - self.get_curse_height(stats_alert) - 3))
max_y=(screen_y - self.get_stats_display_height(stats_alert) - 3))
self.display_plugin(stats_alert)
return True
......@@ -359,14 +359,14 @@ class glancesCurses:
# Set the upper/left position of the message
if (plugin_stats['column'] < 0):
# Right align (last column)
display_x = screen_x - self.get_curse_width(plugin_stats)
display_x = screen_x - self.get_stats_display_width(plugin_stats)
else:
if (plugin_stats['column'] not in self.column_to_x):
self.column_to_x[plugin_stats['column']] = plugin_stats['column']
display_x = self.column_to_x[plugin_stats['column']]
if (plugin_stats['line'] < 0):
# Bottom (last line)
display_y = screen_y - self.get_curse_height(plugin_stats)
display_y = screen_y - self.get_stats_display_height(plugin_stats)
else:
if (plugin_stats['line'] not in self.line_to_y):
self.line_to_y[plugin_stats['line']] = plugin_stats['line']
......@@ -450,7 +450,7 @@ class glancesCurses:
# Wait 100ms...
curses.napms(100)
def get_curse_width(self, curse_msg, without_option=False):
def get_stats_display_width(self, curse_msg, without_option=False):
# Return the width of the formated curses message
# The height is defined by the maximum line
......@@ -468,7 +468,7 @@ class glancesCurses:
else:
return c
def get_curse_height(self, curse_msg):
def get_stats_display_height(self, curse_msg):
# Return the height of the formated curses message
# The height is defined by the number of '\n'
......
glances/plugins/glances_plugin.py
浏览文件 @ ba1757a2
......@@ -185,7 +185,7 @@ class GlancesPlugin(object):
"""
return [self.curse_add_line(str(self.stats))]
def get_curse(self, args=None):
def get_stats_display(self, args=None):
# Return a dict with all the information needed to display the stat
# key | description
#----------------------------
......@@ -210,16 +210,6 @@ class GlancesPlugin(object):
'column': column_curse,
'line': line_curse}
def get_bottle(self, args=None):
# Return the HTML representation of the plugin
if (hasattr(self, 'msg_bottle')):
msg_bottle = self.msg_bottle(args)
else:
msg_bottle = None
return msg_bottle
def curse_add_line(self, msg, decoration="DEFAULT", optional=False, splittable=False):
"""
Return a dict with: { 'msg': msg, 'decoration': decoration, 'optional': False }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或