p96705831
/
quarkai
forked from openkylin/quarkai
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Solved the problem of Chinese messy code about file system info

This commit is contained in:
balloonflower 2018-03-19 19:59:08 +08:00
parent 4e95744fd9
commit 6d2ad96466
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -25,5 +25,6 @@ kylin-assistant (1.0.0-0ubuntu1) bionic; urgency=low
* Scaning system with Thread. * Scaning system with Thread.
* Renice process priority. * Renice process priority.
* Make Minimize window work. * Make Minimize window work.
* Solved the problem of Chinese messy code about file system info.
-- lixiang <lixiang@kylinos.cn> Mon, 29 Jan 2018 17:54:44 +0800 -- lixiang <lixiang@kylinos.cn> Mon, 29 Jan 2018 17:54:44 +0800

26
plugins/systemmonitor/filesystemworker.cpp
View File

@ -18,6 +18,7 @@
*/ */
#include "filesystemworker.h" #include "filesystemworker.h"
#include "util.h"
#include <stddef.h> #include <stddef.h>
#include <glibtop/mountlist.h> #include <glibtop/mountlist.h>
@ -143,19 +144,38 @@ void FileSystemWorker::onFileSystemListChanged()
for (i = 0; i < mountlist.number; i++) { for (i = 0; i < mountlist.number; i++) {
DISK_INFO disk = add_disk(&entries[i], show_all_fs); DISK_INFO disk = add_disk(&entries[i], show_all_fs);
if (disk.valid == 1) { if (disk.valid == 1) {
QString dev_name = QString(QLatin1String(disk.devname)); std::string formatted_dev = make_string(g_strdup(disk.devname));
QString dev_name = QString::fromStdString(formatted_dev);
//QString dev_name = QString(QLatin1String(disk.devname));
newDiskList.append(dev_name); newDiskList.append(dev_name);
if (!this->isDeviceContains(dev_name)) { if (!this->isDeviceContains(dev_name)) {
FileSystemData *info = new FileSystemData(this); FileSystemData *info = new FileSystemData(this);
info->setDevName(dev_name); info->setDevName(dev_name);
info->updateDiskInfo(QString(QLatin1String(disk.mountdir)), QString(QLatin1String(disk.type)), QString(QLatin1String(g_format_size_full(disk.btotal, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bfree, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bavail, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bused, G_FORMAT_SIZE_DEFAULT))), disk.percentage/*QString::number(disk.percentage).append("%")*/);
std::string formatted_mountdir(make_string(g_strdup(disk.mountdir)));
std::string formatted_type(make_string(g_strdup(disk.type)));
std::string formatted_btotal(make_string(g_strdup(g_format_size_full(disk.btotal, G_FORMAT_SIZE_DEFAULT))));
std::string formatted_bfree(make_string(g_strdup(g_format_size_full(disk.bfree, G_FORMAT_SIZE_DEFAULT))));
std::string formatted_bavail(make_string(g_strdup(g_format_size_full(disk.bavail, G_FORMAT_SIZE_DEFAULT))));
std::string formatted_bused(make_string(g_strdup(g_format_size_full(disk.bused, G_FORMAT_SIZE_DEFAULT))));
info->updateDiskInfo(QString::fromStdString(formatted_mountdir), QString::fromStdString(formatted_type), QString::fromStdString(formatted_btotal), QString::fromStdString(formatted_bfree), QString::fromStdString(formatted_bavail), QString::fromStdString(formatted_bused), disk.percentage/*QString::number(disk.percentage).append("%")*/);
// info->updateDiskInfo(QString(QLatin1String(disk.mountdir)), QString(QLatin1String(disk.type)), QString(QLatin1String(g_format_size_full(disk.btotal, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bfree, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bavail, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bused, G_FORMAT_SIZE_DEFAULT))), disk.percentage/*QString::number(disk.percentage).append("%")*/);
this->addDiskInfo(dev_name, info); this->addDiskInfo(dev_name, info);
} }
else {//update info which had exists else {//update info which had exists
FileSystemData *info = this->getDiskInfo(dev_name); FileSystemData *info = this->getDiskInfo(dev_name);
if (info) { if (info) {
info->updateDiskInfo(QString(QLatin1String(disk.mountdir)), QString(QLatin1String(disk.type)), QString(QLatin1String(g_format_size_full(disk.btotal, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bfree, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bavail, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bused, G_FORMAT_SIZE_DEFAULT))), disk.percentage/*QString::number(disk.percentage).append("%")*/); std::string formatted_mountdir(make_string(g_strdup(disk.mountdir)));
std::string formatted_type(make_string(g_strdup(disk.type)));
std::string formatted_btotal(make_string(g_strdup(g_format_size_full(disk.btotal, G_FORMAT_SIZE_DEFAULT))));
std::string formatted_bfree(make_string(g_strdup(g_format_size_full(disk.bfree, G_FORMAT_SIZE_DEFAULT))));
std::string formatted_bavail(make_string(g_strdup(g_format_size_full(disk.bavail, G_FORMAT_SIZE_DEFAULT))));
std::string formatted_bused(make_string(g_strdup(g_format_size_full(disk.bused, G_FORMAT_SIZE_DEFAULT))));
info->updateDiskInfo(QString::fromStdString(formatted_mountdir), QString::fromStdString(formatted_type), QString::fromStdString(formatted_btotal), QString::fromStdString(formatted_bfree), QString::fromStdString(formatted_bavail), QString::fromStdString(formatted_bused), disk.percentage/*QString::number(disk.percentage).append("%")*/);
// info->updateDiskInfo(QString(QLatin1String(disk.mountdir)), QString(QLatin1String(disk.type)), QString(QLatin1String(g_format_size_full(disk.btotal, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bfree, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bavail, G_FORMAT_SIZE_DEFAULT))), QString(QLatin1String(g_format_size_full(disk.bused, G_FORMAT_SIZE_DEFAULT))), disk.percentage/*QString::number(disk.percentage).append("%")*/);
} }
} }
} }