diff --git a/src/service/modules/api/themes.cpp b/src/service/modules/api/themes.cpp index df8ffd9..cba3cfa 100644 --- a/src/service/modules/api/themes.cpp +++ b/src/service/modules/api/themes.cpp @@ -138,8 +138,6 @@ QVector ThemesApi::doListTheme(QVector local, QVector QVector lists = scanThemeDirs(local, type); QVector syslists = scanThemeDirs(sys, type); - qInfo() << "doListTheme" << lists.size() << syslists.size() << __FUNCTION__ << __LINE__; - return mergeThemeList(lists, syslists); } @@ -172,7 +170,6 @@ QVector ThemesApi::scanThemeDirs(QVector dirs, QString type) QVector ThemesApi::mergeThemeList(QVector src, QVector target) { - qInfo() << "mergeThemeList"; if (target.size() == 0) { return src; } diff --git a/src/service/modules/background/backgrounds.cpp b/src/service/modules/background/backgrounds.cpp index 9f80cf3..09b7b7f 100644 --- a/src/service/modules/background/backgrounds.cpp +++ b/src/service/modules/background/backgrounds.cpp @@ -68,7 +68,6 @@ void Backgrounds::refreshBackground() { QStringList files = getCustomBgFiles(); for (auto file : files) { - qInfo() << "custom = " << file << __FUNCTION__ << __LINE__; Background bg; bg.setId(utils::enCodeURI(file, SCHEME_FILE)); bg.setDeletable(true); @@ -77,7 +76,6 @@ void Backgrounds::refreshBackground() files = getSysBgFIles(); for (auto file : files) { - qInfo() << "system = " << file << __FUNCTION__ << __LINE__; Background bg; bg.setId(utils::enCodeURI(file, SCHEME_FILE)); bg.setDeletable(false); diff --git a/src/service/modules/subthemes/scanner.cpp b/src/service/modules/subthemes/scanner.cpp index 5df0073..53463b4 100644 --- a/src/service/modules/subthemes/scanner.cpp +++ b/src/service/modules/subthemes/scanner.cpp @@ -3,6 +3,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "scanner.h" + #include "../api/utils.h" #include "../common/commondefine.h" @@ -41,8 +42,7 @@ QString Scanner::query(QString uri) { QString path = utils::deCodeURI(uri); QString mime = queryThemeMime(path); - if(!mime.isEmpty()) - { + if (!mime.isEmpty()) { return mime; } @@ -75,13 +75,11 @@ QString Scanner::doQueryFile(QString file) GFileInfo *fileinfo = g_file_query_info(g_file, attributes.toLatin1().data(), GFileQueryInfoFlags(G_FILE_QUERY_INFO_NONE), nullptr ,err); if(err != nullptr){ - qInfo() << "g_file_query_info failed" << __FUNCTION__ << __LINE__; return ""; } const char *attribute = g_file_info_get_attribute_string(fileinfo, attributes.toLatin1().data()); QString attributeString(attribute); - qInfo() << "attributeString" << attributeString << __FUNCTION__ << __LINE__; return attributeString; } @@ -94,8 +92,7 @@ bool Scanner::globalTheme(QString file) return false; } - - if(keyfile.getStr("Deepin Theme","DefaultTheme").isEmpty()) { + if(keyfile.getStr("Deepin Theme", "DefaultTheme").isEmpty()) { return false; } @@ -115,7 +112,6 @@ bool Scanner::iconTheme(QString file) return false; } - if(keyfile.getStr("Icon Theme","Directories").isEmpty()) { return false; } @@ -188,16 +184,9 @@ QVector Scanner::listSubDir(QString path) QFileInfoList filenames = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files); for(auto filename : filenames) { - qInfo() << "filename = " << filename.filePath() << __FUNCTION__ << __LINE__; subDirs.push_back(filename.fileName()); } - for(auto sub : subDirs) { - qInfo() << "sub = " << sub << __FUNCTION__ << __LINE__; - } - - qInfo() << "sub.size = " << subDirs.size() << __FUNCTION__ << __LINE__; - return subDirs; } @@ -205,10 +194,9 @@ QVector Scanner::doListTheme(QString uri, QString ty, Fn fn) { QString path = utils::deCodeURI(uri); - qInfo() << "path = " << path << __FUNCTION__ << __LINE__; QVector subDirs = listSubDir(path); if(!subDirs.size()) { - qInfo() << "subDirs is empty"; + qInfo() << "Path:" << path << "subDirs is empty"; } QVector themes; @@ -219,18 +207,16 @@ QVector Scanner::doListTheme(QString uri, QString ty, Fn fn) } else { tmp = path + "/" + subDir + "/index.theme"; } - qInfo() << "subDir = " << subDir << __FUNCTION__ << __LINE__; if(!fn(tmp) || isHidden(tmp, ty)) continue; - qInfo() << "subDir = " << subDir << __FUNCTION__ << __LINE__; + themes.push_back(tmp); } return themes; } - QVector Scanner::listGlobalTheme(QString uri) { Fn fn = std::bind(&Scanner::isGlobalTheme, this,std::placeholders::_1);