Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
ea838f0e
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ea838f0e
编写于
7月 20, 2020
作者:
N
nicolargo
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'issue1685' into develop
上级
fc7ed917
b2f499fe
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
3 deletion
+7
-3
glances/plugins/glances_quicklook.py
glances/plugins/glances_quicklook.py
+7
-3
未找到文件。
glances/plugins/glances_quicklook.py
浏览文件 @
ea838f0e
...
...
@@ -2,7 +2,7 @@
#
# This file is part of Glances.
#
# Copyright (C) 20
19
Nicolargo <nicolas@nicolargo.com>
# Copyright (C) 20
20
Nicolargo <nicolas@nicolargo.com>
#
# Glances is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
...
...
@@ -14,8 +14,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU Lesser General Public License
"""Quicklook plugin."""
...
...
@@ -92,7 +92,11 @@ class Plugin(GlancesPlugin):
cpu_info
=
cpuinfo
.
get_cpu_info
()
# Check cpu_info (issue #881)
if
cpu_info
is
not
None
:
stats
[
'cpu_name'
]
=
cpu_info
.
get
(
'brand'
,
'CPU'
)
# Use brand_raw if the key exist (issue #1685)
if
cpu_info
.
get
(
'brand_raw'
)
is
not
None
:
stats
[
'cpu_name'
]
=
cpu_info
.
get
(
'brand_raw'
,
'CPU'
)
else
:
stats
[
'cpu_name'
]
=
cpu_info
.
get
(
'brand'
,
'CPU'
)
if
'hz_actual_raw'
in
cpu_info
:
stats
[
'cpu_hz_current'
]
=
cpu_info
[
'hz_actual_raw'
][
0
]
if
'hz_advertised_raw'
in
cpu_info
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录