devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Show the total size of the volume along with the free space.

Browse source 
This should help identifying the correct player by size, since the free space
is only useful to figure if there is enough space to install Rockbox. Change
units to GiB since that is more useful given the size of current devices.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30139 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2011-07-15 18:13:31 +00:00
parent cad91ed938
commit 21a38713a6
3 changed files with 41 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

36
rbutil/rbutilqt/base/utils.cpp
View file

@ -114,6 +114,18 @@ QString Utils::resolvePathCase(QString path)
//! @param path path on the filesystem to check //! @param path path on the filesystem to check
//! @return size in bytes //! @return size in bytes
qulonglong Utils::filesystemFree(QString path) qulonglong Utils::filesystemFree(QString path)
{
return filesystemSize(path, FilesystemFree);
}
qulonglong Utils::filesystemTotal(QString path)
{
return filesystemSize(path, FilesystemTotal);
}
qulonglong Utils::filesystemSize(QString path, enum Utils::Size type)
{ {
qlonglong size = 0; qlonglong size = 0;
#if defined(Q_OS_LINUX) || defined(Q_OS_MACX) #if defined(Q_OS_LINUX) || defined(Q_OS_MACX)
@ -123,16 +135,30 @@ qulonglong Utils::filesystemFree(QString path)
ret = statvfs(qPrintable(path), &fs); ret = statvfs(qPrintable(path), &fs);
if(ret == 0) if(ret == 0) {
size = (qulonglong)fs.f_frsize * (qulonglong)fs.f_bavail; if(type == FilesystemFree) {
size = (qulonglong)fs.f_frsize * (qulonglong)fs.f_bavail;
}
if(type == FilesystemTotal) {
size = (qulonglong)fs.f_frsize * (qulonglong)fs.f_blocks;
}
}
#endif #endif
#if defined(Q_OS_WIN32) #if defined(Q_OS_WIN32)
BOOL ret; BOOL ret;
ULARGE_INTEGER freeAvailBytes; ULARGE_INTEGER freeAvailBytes;
ULARGE_INTEGER totalNumberBytes;
ret = GetDiskFreeSpaceExW((LPCTSTR)path.utf16(), &freeAvailBytes, NULL, NULL); ret = GetDiskFreeSpaceExW((LPCTSTR)path.utf16(), &freeAvailBytes,
if(ret) &totalNumberBytes, NULL);
size = freeAvailBytes.QuadPart; if(ret) {
if(type == FilesystemFree) {
size = freeAvailBytes.QuadPart;
}
if(type == FilesystemTotal) {
size = totalNumberBytes.QuadPart;
}
}
#endif #endif
qDebug() << "[Utils] Filesystem free:" << path << size; qDebug() << "[Utils] Filesystem free:" << path << size;
return size; return size;

7
rbutil/rbutilqt/base/utils.h
View file

@ -31,9 +31,16 @@
class Utils : public QObject class Utils : public QObject
{ {
public: public:
enum Size {
FilesystemTotal,
FilesystemFree
};
static bool recursiveRmdir(const QString &dirName); static bool recursiveRmdir(const QString &dirName);
static QString resolvePathCase(QString path); static QString resolvePathCase(QString path);
static qulonglong filesystemFree(QString path); static qulonglong filesystemFree(QString path);
static qulonglong filesystemTotal(QString path);
static qulonglong filesystemSize(QString path, enum Size type);
static QString findExecutable(QString name); static QString findExecutable(QString name);
static QString checkEnvironment(bool permission); static QString checkEnvironment(bool permission);
static int compareVersionStrings(QString s1, QString s2); static int compareVersionStrings(QString s1, QString s2);

5
rbutil/rbutilqt/sysinfo.cpp
View file

@ -63,9 +63,10 @@ QString Sysinfo::getInfo()
info += "<b>" + tr("Filesystem") + "</b><br/>"; info += "<b>" + tr("Filesystem") + "</b><br/>";
QStringList drives = Autodetection::mountpoints(); QStringList drives = Autodetection::mountpoints();
for(int i = 0; i < drives.size(); i++) { for(int i = 0; i < drives.size(); i++) {
info += tr("%1, %2 MiB available") info += tr("%1, %2 GiB of %3 GiB available")
.arg(QDir::toNativeSeparators(drives.at(i))) .arg(QDir::toNativeSeparators(drives.at(i)))
.arg(Utils::filesystemFree(drives.at(i)) / (1024*1024)); .arg((double)Utils::filesystemFree(drives.at(i)) / (1<<30), 0, 'f', 2)
.arg((double)Utils::filesystemTotal(drives.at(i)) / (1<<30), 0, 'f', 2);
if(i + 1 < drives.size()) if(i + 1 < drives.size())
info += "<br/>"; info += "<br/>";
} }