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

v2.2.2 faster colormaking

Browse Source
This commit is contained in:
Markus 2019-08-17 13:54:24 +02:00
parent efcfc36ec7
commit 5fcd1fcce1
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pageManager.cpp
View File

@ -143,7 +143,7 @@ std::string PageManager::checkName(std::string Name)
return "-1"; return "-1";
} }
else { else {
std::cout << "boku-dake-ga-inai-machi > Name: " << name << std::endl; std::cout << "\33[2K\r > Name: " << name << std::endl;
return name; return name;
} }
} }

2
parameterManager.h
View File

@ -36,7 +36,7 @@ struct Settings {
proxy_ip = "127.0.0.1", proxy_ip = "127.0.0.1",
languages = "GerDub,GerSub,Eng", languages = "GerDub,GerSub,Eng",
genaueHoster = "Vivo,GoUnlimited", genaueHoster = "Vivo,GoUnlimited",
version = "2.2.1", version = "2.2.2",
outputFilePath = "", outputFilePath = "",
default_checkDirPath = "", default_checkDirPath = "",
default_Searchmuster = "S%Staffel%E%Folge%"; default_Searchmuster = "S%Staffel%E%Folge%";

14
programManager.cpp
View File

@ -370,14 +370,24 @@ int ProgramManager::searchModus(Settings *settings)
std::string finds = pageManager.grep(serienListe, settings->name, settings->search_IgnoreUpperLower); std::string finds = pageManager.grep(serienListe, settings->name, settings->search_IgnoreUpperLower);
serienListe.clear(); // Speicher freigeben serienListe.clear(); // Speicher freigeben


//Text mit Farben versehen /*//Text mit Farben versehen
if(!settings->colorless) { if(!settings->colorless) {
for (size_t pos = pageManager.upper_string( finds ).find( pageManager.upper_string( settings->name ), 0); for (size_t pos = pageManager.upper_string( finds ).find( pageManager.upper_string( settings->name ), 0);
pos != std::string::npos; pos != std::string::npos;
pos = pageManager.upper_string( finds ).find( pageManager.upper_string( settings->name ), pos + settings->name.length() + strlen("\033[37m\033[0m"))) pos = pageManager.upper_string( finds ).find( pageManager.upper_string( settings->name ), pos + settings->name.length() + strlen("\033[37m\033[0m")))
finds.insert(pos, ( (finds.find(settings->name, pos) == pos) ? "\033[32m" : "\033[36m" ) ).insert(pos + settings->name.length() + strlen("\033[37m"), "\033[0m"); finds.insert(pos, ( (finds.find(settings->name, pos) == pos) ? "\033[32m" : "\033[36m" ) ).insert(pos + settings->name.length() + strlen("\033[37m"), "\033[0m");
} }*/


//Text mit Farben versehen
if(!settings->colorless) {
std::string UpperFinds = pageManager.upper_string( finds );
std::string UpperName = pageManager.upper_string( settings->name );
for (size_t pos = UpperFinds.find( UpperName, 0); pos != std::string::npos; pos = UpperFinds.find( UpperName, pos + settings->name.length() + strlen("\033[37m\033[0m"))) {
bool exaktGeschrieben = (finds.find(settings->name, pos) == pos);
finds.insert(pos, ( (exaktGeschrieben) ? "\033[32m" : "\033[36m" ) ).insert(pos + settings->name.length() + strlen("\033[37m"), "\033[0m");
UpperFinds.insert(pos, ( (exaktGeschrieben ) ? "\033[32m" : "\033[36m" ) ).insert(pos + settings->name.length() + strlen("\033[37m"), "\033[0m");
}
}
//Ausgabe //Ausgabe
if(finds == "") { if(finds == "") {
std::cout << " => Für '" << settings->name << "' wurde(n) keine Serie(n) gefunden." << std::endl; std::cout << " => Für '" << settings->name << "' wurde(n) keine Serie(n) gefunden." << std::endl;