Retrieve free disk space macOS, Linux, and Windows.#119
Merged
lfreist merged 4 commits intolfreist:mainfrom Apr 23, 2025
Merged
Retrieve free disk space macOS, Linux, and Windows.#119lfreist merged 4 commits intolfreist:mainfrom
lfreist merged 4 commits intolfreist:mainfrom
Conversation
This commit (and PR) introduces a **new function** to retrieve free disk space in a unified manner across macOS, Linux, and Windows.
It refactors existing logic to ensure consistency, readability, and maintainability.
- **Common**
- Introduced a new function/method to retrieve free disk size in a consistent manner across platforms.
- **macOS**
- Implemented a mount-based approach using `statfs()` to fetch free space.
- Physical or container disks (like `disk0` or APFS containers) may return **-1** if they have **no** mounted filesystem.
For example, APFS containers are not directly mounted but contain APFS volumes; only the volumes have valid mount points.
- **Linux**
- Leveraged existing logic with `statvfs()` for retrieving free space.
- Minor refactoring.
- **Windows**
- Maintained the `GetLogicalDriveStrings()` + `GetDiskFreeSpaceEx()` approach for free size.
- Returning **-1** indicates an **unreachable** or **unmounted** filesystem. This behavior is most commonly seen on **macOS** with APFS containers or physical devices that are **not** directly mounted.
- In all scenarios, if the disk cannot be located or if the OS functions fail, **-1** is returned to signify no valid free-space calculation.
BohdanBuinich
force-pushed
the
feat/disk_free_size
branch
from
d0722d9 to
86bd670
Compare
BohdanBuinich
changed the title
|
Thanks for this, I just started using this lib and wished it had the disk free space too. Not to be greedy but it would be nice to have the mountpoint/drive letter available too. |
Contributor
|
I added a PR to this PR that supports getting the list of volumes for each disk as well: @BohdanBuinich Could you review? |
* fix: use the latest supported standard instead of forcing C++-11 * feat: support getting volume paths * docs: update readme to add the volumes support
lfreist
requested changes
Apr 23, 2025
CMakeLists.txt
Outdated
|
|
||
| set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${HWINFO_CMAKE_BINARY_DIR}) | ||
| set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${HWINFO_CMAKE_BINARY_DIR}) | ||
| set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
Owner
There was a problem hiding this comment.
The extra variable ${HWINFO_CMAKE_BINARY_DIR} was added for the following reason:
If hwinfo is used as subproject, the main project developer can easily define, where hwinfo targets are built to. If we directly use ${CMAKE_BINARY_DIR}, the hwinfo targets are built into the main projects binary directory.
Thus, I would like to keep it as is.
| // guess the vendor from the model | ||
| if (model.find("APPLE") != std::string::npos || model.find("Apple") != std::string::npos) { | ||
| // Guess vendor based on model | ||
| if (disk._model.find("APPLE") != std::string::npos || disk._model.find("Apple") != std::string::npos) { |
Owner
There was a problem hiding this comment.
Maybe it is worth converting disk._model to lower case and just search for "apple". However, I don't know, what case style may be contained. If only "Apple" and "APPLE" are used, it is fine...
reverted changes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit (and PR) introduces a new function to retrieve free disk space across macOS, Linux, and Windows.
It refactors existing logic to ensure consistency, readability, and maintainability.
Common
macOS
statfs()to fetch free space.disk0or APFS containers) may return -1 if they have no mounted filesystem. For example, APFS containers are not directly mounted but contain APFS volumes; only the volumes have valid mount points.statvfs()for retrieving free space.GetLogicalDriveStrings()+GetDiskFreeSpaceEx()approach for free size.