localhorst/reHDD
1
0
Fork 0
Code Issues 7 Pull Requests Releases 9 Wiki Activity

ignore system drive

Browse Source
This commit is contained in:
Hendrik Schutter 2024-06-02 09:51:22 +02:00
parent a665f8638e
commit 77b322d47d
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/reHDD.cpp
View File

@ -344,15 +344,29 @@ void reHDD::searchDrives(list<Drive> *plistDrives)
*/ */
void reHDD::filterIgnoredDrives(list<Drive> *plistDrives) void reHDD::filterIgnoredDrives(list<Drive> *plistDrives)
{ {
list<tuple<string>> vtlIgnoredDevices; // store drives from ignore file
ifstream input("ignoreDrives.conf"); // read ignore file
string systemDrivePath; string systemDrivePath;
if (getSystemDrive(systemDrivePath)) if (getSystemDrive(systemDrivePath))
{ {
Logger::logThis()->info("Found system drive: " + systemDrivePath); Logger::logThis()->info("Found system drive: " + systemDrivePath);
list<Drive>::iterator it;
for (it = plistDrives->begin(); it != plistDrives->end(); ++it)
{
if (it->getPath().find(systemDrivePath) != std::string::npos) // compare found system drive and current drive
{
// system drive found --> ignore this drive
#ifdef LOG_LEVEL_HIGH
Logger::logThis()->info("system drive found --> ignore this drive: " + it->getPath());
#endif
it = plistDrives->erase(it);
it--;
}
}
} }
list<tuple<string>> vtlIgnoredDevices; // store drives from ignore file
ifstream input("ignoreDrives.conf"); // read ignore file
for (string sLine; getline(input, sLine);) for (string sLine; getline(input, sLine);)
{ {
// Logger::logThis()->info("read uuid: " + sLine); // Logger::logThis()->info("read uuid: " + sLine);
@ -614,7 +628,6 @@ void reHDD::handleAbort()
bool reHDD::getSystemDrive(string &systemDrive) bool reHDD::getSystemDrive(string &systemDrive)
{ {
Logger::logThis()->info("--> search system drive <--");
char *cLine = NULL; char *cLine = NULL;
size_t len = 0; size_t len = 0;
bool systemDriveFound = false; bool systemDriveFound = false;
@ -641,6 +654,8 @@ bool reHDD::getSystemDrive(string &systemDrive)
if ((cLine[0U] != '|') && (cLine[0U] != '`')) if ((cLine[0U] != '|') && (cLine[0U] != '`'))
{ {
systemDrive = currentLine; systemDrive = currentLine;
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), '\n'), systemDrive.end()); // remove newline
systemDrive.erase(std::remove(systemDrive.begin(), systemDrive.end(), ' '), systemDrive.end()); // remove spaces
// Logger::logThis()->info("Drive found: " + systemDrive); // Logger::logThis()->info("Drive found: " + systemDrive);
} }