6543
/
S_New4
forked from markus/S_New4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ersetzte code mit isNumber Function

This commit is contained in:
Markus 2019-08-31 20:15:23 +02:00
parent c7bb9702db
commit 569a3206f6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
parameterManager.cpp
View File

@ -174,7 +174,7 @@ int loadDefaulOptions(Settings &settings)


} else if (what == "default-CheckMaxDirs") { } else if (what == "default-CheckMaxDirs") {
settings.default_maxDirs = atoi(data.c_str()); settings.default_maxDirs = atoi(data.c_str());
if(std::to_string(settings.default_maxDirs) != data ) { if(!isNumber(data) ) {
std::cout << " => Error_Defaults: default-CheckMaxDirs: Ungültige Zahl: " << data << std::endl; std::cout << " => Error_Defaults: default-CheckMaxDirs: Ungültige Zahl: " << data << std::endl;
return 18; return 18;
} }
@ -184,7 +184,7 @@ int loadDefaulOptions(Settings &settings)


} else if (what == "default-maxThreads") { } else if (what == "default-maxThreads") {
settings.maxThreads = static_cast<unsigned>(atoi(data.c_str())); settings.maxThreads = static_cast<unsigned>(atoi(data.c_str()));
if(std::to_string(settings.maxThreads) != data ) { if(isNumber(data) ) {
std::cout << " => Error_Defaults: Thread-Max Ungültige Zahl: " << data << std::endl; std::cout << " => Error_Defaults: Thread-Max Ungültige Zahl: " << data << std::endl;
return 18; return 18;
} else if (settings.maxThreads > 10) { } else if (settings.maxThreads > 10) {
@ -322,7 +322,7 @@ int unterOption_default(Settings *settings, int argc, char ** argv)
if(!optarg) if(!optarg)
break; break;
settings->startEpisode = atoi(optarg); settings->startEpisode = atoi(optarg);
if (std::to_string(settings->startEpisode) != optarg) { if (!isNumber(optarg)) {
std::cout << " => Error: -e [Folge]: '" << optarg << "' ist keine Zahl." << std::endl; std::cout << " => Error: -e [Folge]: '" << optarg << "' ist keine Zahl." << std::endl;
return 11; return 11;
} else if (settings->startEpisode <= 0) { } else if (settings->startEpisode <= 0) {
@ -336,7 +336,7 @@ int unterOption_default(Settings *settings, int argc, char ** argv)
if(!optarg) if(!optarg)
break; break;
settings->stopEpisode = atoi(optarg); settings->stopEpisode = atoi(optarg);
if (std::to_string(settings->stopEpisode) != optarg) { if (!isNumber(optarg)) {
std::cout << " => Error: -E [Folge]: '" << optarg << "' ist keine Zahl." << std::endl; std::cout << " => Error: -E [Folge]: '" << optarg << "' ist keine Zahl." << std::endl;
return 14; return 14;
} else if (settings->debugMode) } else if (settings->debugMode)
@ -346,7 +346,7 @@ int unterOption_default(Settings *settings, int argc, char ** argv)
if(!optarg) if(!optarg)
break; break;
settings->startSeason = atoi(optarg); settings->startSeason = atoi(optarg);
if (std::to_string(settings->startSeason) != optarg) { if (!isNumber(optarg)) {
std::cout << " => Error: -s [Staffel]: '" << optarg << "' ist keine Zahl." << std::endl; std::cout << " => Error: -s [Staffel]: '" << optarg << "' ist keine Zahl." << std::endl;
return 15; return 15;
} else if (settings->startSeason < 0) { } else if (settings->startSeason < 0) {
@ -359,7 +359,7 @@ int unterOption_default(Settings *settings, int argc, char ** argv)
if(!optarg) if(!optarg)
break; break;
settings->stopSeason = atoi(optarg); settings->stopSeason = atoi(optarg);
if (std::to_string(settings->stopSeason) != optarg) { if (!isNumber(optarg)) {
std::cout << " => Error: -S [Staffel]: '" << optarg << "' ist keine Zahl." << std::endl; std::cout << " => Error: -S [Staffel]: '" << optarg << "' ist keine Zahl." << std::endl;
return 18; return 18;
} else if(settings->debugMode) } else if(settings->debugMode)
@ -375,8 +375,8 @@ int unterOption_default(Settings *settings, int argc, char ** argv)
if(!optarg) if(!optarg)
break; break;
settings->default_maxDirs = atoi(optarg); settings->default_maxDirs = atoi(optarg);
if(std::to_string(settings->default_maxDirs) != std::string(optarg) ) { if(!isNumber(optarg)) {
std::cout << " => Error: [-D]: Invalid Count: " << optarg << std::endl; std::cout << " => Error: [-D]: Ungültige Zahl: " << optarg << std::endl;
return 18; return 18;
} }
if(settings->debugMode) if(settings->debugMode)
@ -387,7 +387,7 @@ int unterOption_default(Settings *settings, int argc, char ** argv)
if(!optarg) if(!optarg)
break; break;
settings->maxThreads = static_cast<unsigned>(atoi(optarg)); settings->maxThreads = static_cast<unsigned>(atoi(optarg));
if(std::to_string(settings->maxThreads) != std::string(optarg) ) { if(!isNumber(optarg)) {
std::cout << " => Error: [-t]: Thread-Max: Ungültige Zahl: " << optarg << std::endl; std::cout << " => Error: [-t]: Thread-Max: Ungültige Zahl: " << optarg << std::endl;
return 18; return 18;
} else if (settings->maxThreads > 10 && !settings->debugMode) { } else if (settings->maxThreads > 10 && !settings->debugMode) {