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

v3.5.0: bei info Subfunction: Parameter um Folgenausgabe zu verhind(Namen ausgabe

Browse Source
This commit is contained in:
Markus 2019-10-31 13:15:54 +01:00
parent 6a526269db
commit f3f125b562
3 changed files with 89 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
parameterManager.cpp
View File

@ -875,12 +875,13 @@ int unterOption_info(Settings *settings, int argc, char **argv)
{"help", no_argument, nullptr, 'h'}, {"help", no_argument, nullptr, 'h'},
{"colorless", no_argument, nullptr, 'c'}, {"colorless", no_argument, nullptr, 'c'},
{"debug-mode", no_argument, nullptr, 'd'}, {"debug-mode", no_argument, nullptr, 'd'},
{"skip-episoden-names", no_argument, nullptr, 's'},


{nullptr, no_argument, nullptr, 0} {nullptr, no_argument, nullptr, 0}


}; };


while( ( c = getopt_long (argc, argv, "p:hcd", long_opts, nullptr) ) != -1 ) { while( ( c = getopt_long (argc, argv, "p:hcds", long_opts, nullptr) ) != -1 ) {
switch(c) { switch(c) {
case 'p': case 'p':
if(optarg && setS5ProxytoSettings(*settings, optarg) != 0) if(optarg && setS5ProxytoSettings(*settings, optarg) != 0)
@ -899,6 +900,11 @@ int unterOption_info(Settings *settings, int argc, char **argv)
if(settings->debugMode) if(settings->debugMode)
std::cout << "Debug Modus: true" << std::endl; std::cout << "Debug Modus: true" << std::endl;
break; break;
case 's':
settings->skipEpisodenNameOutput = true;
if(settings->debugMode)
std::cout << "skipEpisodenNameOutput: true" << std::endl;
break;
default: default:
std::cout << "Aufruf: " << settings->programName << " info [OPTION]... [NAME]..." << std::endl; std::cout << "Aufruf: " << settings->programName << " info [OPTION]... [NAME]..." << std::endl;
std::cout << "\"" << settings->programName << " info --help\" liefert weitere Informationen." << std::endl; std::cout << "\"" << settings->programName << " info --help\" liefert weitere Informationen." << std::endl;
@ -939,6 +945,9 @@ void unterOption_info_help(std::string programName)
<< " -d, --debug-mode" << std::endl << " -d, --debug-mode" << std::endl
<< " Mit dieser Option kann man den Debug-Modus einschalten." << std::endl << " Mit dieser Option kann man den Debug-Modus einschalten." << std::endl
<< " Dabei werden vielmehr Infos ausgegeben." << std::endl << std::endl << " Dabei werden vielmehr Infos ausgegeben." << std::endl << std::endl
<< " -s, --skip-episoden-names" << std::endl
<< " Mit dieser Option kann man die Ausgabe der Namen der" << std::endl
<< " einzelnen Folgen ausschalten." << std::endl << std::endl
<< " -h, --help" << std::endl << " -h, --help" << std::endl
<< " Mit dieser Option wird dieses Helpmenue ausgegeben." << std::endl; << " Mit dieser Option wird dieses Helpmenue ausgegeben." << std::endl;
} }

5
parameterManager.h
View File

@ -63,7 +63,7 @@ struct Settings {
proxy_ip = "127.0.0.1", proxy_ip = "127.0.0.1",
languages = "GerDub,GerSub,Eng,", languages = "GerDub,GerSub,Eng,",
genaueHoster = "", genaueHoster = "",
version = "3.4.6", version = "3.5.0",
defaultFileVersion="1.6", defaultFileVersion="1.6",
outputFilePath = "", outputFilePath = "",
default_checkPath = "", default_checkPath = "",
@ -74,7 +74,8 @@ struct Settings {
debugMode = false, debugMode = false,
search_IgnoreUpperLower = true, search_IgnoreUpperLower = true,
search_wantUpdate = false, search_wantUpdate = false,
askForEveryDir = true; askForEveryDir = true,
skipEpisodenNameOutput = false;
int startEpisode = 1, int startEpisode = 1,
stopEpisode = 0, stopEpisode = 0,
startSeason = 1, startSeason = 1,

9
programManager.cpp
View File

@ -738,13 +738,18 @@ int ProgramManager::infoModus(Settings *settings)
return 32; return 32;
} }


int gesammtFolge = 0;
std::string green = ((settings->colorless) ? "" : "\033[92m"), std::string green = ((settings->colorless) ? "" : "\033[92m"),
lila = ((settings->colorless) ? "" : "\033[95m"), lila = ((settings->colorless) ? "" : "\033[95m"),
Lightyellow = ((settings->colorless) ? "" : "\033[93m"), Lightyellow = ((settings->colorless) ? "" : "\033[93m"),
Darkyellow = ((settings->colorless) ? "" : "\033[33m"), Darkyellow = ((settings->colorless) ? "" : "\033[33m"),
blue = ((settings->colorless) ? "" : "\033[96m"), blue = ((settings->colorless) ? "" : "\033[96m"),
white = "\033[0m"; white = "\033[0m";


if( ! settings->skipEpisodenNameOutput) {

//Für FolgenNummer ingesmammt
int gesammtFolge = 0;
//speicher (zahl -1), ab da wo /staffel-x nicht mehr vorkommt //speicher (zahl -1), ab da wo /staffel-x nicht mehr vorkommt
int maxStaffel = pageManager.counterContains(tmp_reply.html, "/staffel-%i"); int maxStaffel = pageManager.counterContains(tmp_reply.html, "/staffel-%i");


@ -826,6 +831,8 @@ int ProgramManager::infoModus(Settings *settings)


} }


}

//Datum & FSK //Datum & FSK
std::string line = pageManager.grep(tmp_reply.html, "<small> (<span itemprop=\"startDate\"><a"); std::string line = pageManager.grep(tmp_reply.html, "<small> (<span itemprop=\"startDate\"><a");
if(line == "") { if(line == "") {