Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
db4b9ae1
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 搜索 >>
提交
db4b9ae1
编写于
3月 13, 2014
作者:
A
Alessio Sergi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Migrate from pysensors to py3sensors
上级
aa99ebed
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
5 deletion
+12
-5
README.rst
README.rst
+1
-1
glances/core/glances_config.py
glances/core/glances_config.py
+1
-1
glances/core/glances_globals.py
glances/core/glances_globals.py
+3
-0
glances/plugins/glances_sensors.py
glances/plugins/glances_sensors.py
+6
-2
setup.py
setup.py
+1
-1
未找到文件。
README.rst
浏览文件 @
db4b9ae1
...
...
@@ -34,7 +34,7 @@ Requirements
Optional dependencies:
- ``jinja2`` (for HTML output)
- ``pysensors`` (for HW monitoring support) [Linux-only]
- ``py
3
sensors`` (for HW monitoring support) [Linux-only]
- ``hddtemp`` (for HDD temperature monitoring support)
- ``batinfo`` (for battery monitoring support) [Linux-only]
...
...
glances/core/glances_config.py
浏览文件 @
db4b9ae1
...
...
@@ -57,7 +57,7 @@ class Config:
for
path
in
self
.
get_paths_list
():
if
(
os
.
path
.
isfile
(
path
)
and
os
.
path
.
getsize
(
path
)
>
0
):
try
:
if
(
sys
.
version_info
>=
(
3
,
2
))
:
if
is_python3
:
self
.
parser
.
read
(
path
,
encoding
=
'utf-8'
)
else
:
self
.
parser
.
read
(
path
)
...
...
glances/core/glances_globals.py
浏览文件 @
db4b9ae1
...
...
@@ -52,6 +52,9 @@ work_path = os.path.realpath(os.path.dirname(__file__))
appname_path
=
os
.
path
.
split
(
sys
.
argv
[
0
])[
0
]
sys_prefix
=
os
.
path
.
realpath
(
os
.
path
.
dirname
(
appname_path
))
# Is this Python 3?
is_python3
=
sys
.
version_info
>=
(
3
,
2
)
# Operating system flag
# Note: Somes libs depends of OS
is_BSD
=
sys
.
platform
.
find
(
'bsd'
)
!=
-
1
...
...
glances/plugins/glances_sensors.py
浏览文件 @
db4b9ae1
...
...
@@ -26,6 +26,7 @@ except:
pass
# Import Glances lib
from
glances.core.glances_globals
import
is_python3
from
glances_hddtemp
import
Plugin
as
HddTempPlugin
from
glances_plugin
import
GlancesPlugin
# from glances.core.glances_timer import getTimeSinceLastUpdate
...
...
@@ -61,7 +62,7 @@ class glancesGrabSensors:
for
chip
in
sensors
.
iter_detected_chips
():
for
feature
in
chip
:
sensors_current
=
{}
if
feature
.
name
.
startswith
(
'temp'
):
if
feature
.
name
.
startswith
(
b
'temp'
):
sensors_current
[
'label'
]
=
feature
.
label
[:
20
]
sensors_current
[
'value'
]
=
int
(
feature
.
get_value
())
self
.
sensors_list
.
append
(
sensors_current
)
...
...
@@ -117,7 +118,10 @@ class Plugin(GlancesPlugin):
# Header
msg
=
"{0:8}"
.
format
(
_
(
"SENSORS"
))
ret
.
append
(
self
.
curse_add_line
(
msg
,
"TITLE"
))
msg
=
"{0:>16}"
.
format
(
_
(
"°C"
))
if
is_python3
:
msg
=
"{0:>15}"
.
format
(
_
(
"°C"
))
else
:
msg
=
"{0:>16}"
.
format
(
_
(
"°C"
))
ret
.
append
(
self
.
curse_add_line
(
msg
))
# Sensors list (sorted by name): Sensors
sensor_list
=
sorted
(
self
.
stats
,
key
=
lambda
sensors
:
sensors
[
'label'
])
...
...
setup.py
浏览文件 @
db4b9ae1
...
...
@@ -45,7 +45,7 @@ setup(
install_requires
=
requires
,
extras_require
=
{
'HTML'
:
[
'jinja2'
],
'SENSORS'
:
[
'pysensors'
],
'SENSORS'
:
[
'py
3
sensors'
],
'BATINFO'
:
[
'batinfo'
]
},
packages
=
[
'glances'
],
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录