Skip to content

Commit

Permalink
chore: removeuselesslog, avoid logging too much
Browse files Browse the repository at this point in the history
  • Loading branch information
@Decodetalkers
Decodetalkers committed Aug 1, 2023
1 parent f217509 commit f396ee2
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 56 deletions.
3 changes: 0 additions & 3 deletions src/service/modules/api/themes.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ QVector<QString> ThemesApi::doListTheme(QVector<QString> local, QVector<QString>
QVector<QString> lists = scanThemeDirs(local, type);
QVector<QString> syslists = scanThemeDirs(sys, type);

qInfo() << "doListTheme" << lists.size() << syslists.size() << __FUNCTION__ << __LINE__;

return mergeThemeList(lists, syslists);
}

Expand Down Expand Up @@ -172,7 +170,6 @@ QVector<QString> ThemesApi::scanThemeDirs(QVector<QString> dirs, QString type)

QVector<QString> ThemesApi::mergeThemeList(QVector<QString> src, QVector<QString> target)
{
qInfo() << "mergeThemeList";
if (target.size() == 0) {
return src;
}
Expand Down
2 changes: 0 additions & 2 deletions src/service/modules/background/backgrounds.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
84 changes: 33 additions & 51 deletions src/service/modules/subthemes/scanner.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,18 @@
// SPDX-License-Identifier: GPL-3.0-or-later

#include "scanner.h"

#include "../api/utils.h"
#include "../common/commondefine.h"

#include <QDebug>

Scanner::Scanner(QObject *parent)
:QObject (parent)
: QObject(parent)
{

}

Scanner::~Scanner()
{

}
Scanner::~Scanner() { }

bool Scanner::isHidden(QString file, QString ty)
{
Expand All @@ -26,12 +23,12 @@ bool Scanner::isHidden(QString file, QString ty)

bool hidden = false;

if(ty == TYPEGTK) {
hidden = keyFile.getBool("Desktop Entry","Hidden");
if (ty == TYPEGTK) {
hidden = keyFile.getBool("Desktop Entry", "Hidden");
} else if (ty == TYPEICON || ty == TYPECURSOR) {
hidden = keyFile.getBool("Icon Theme","Hidden");
hidden = keyFile.getBool("Icon Theme", "Hidden");
} else if (ty == TYPEGLOBALTHEME) {
hidden = keyFile.getBool("Deepin Theme","Hidden");
hidden = keyFile.getBool("Deepin Theme", "Hidden");
}

return hidden;
Expand All @@ -41,8 +38,7 @@ QString Scanner::query(QString uri)
{
QString path = utils::deCodeURI(uri);
QString mime = queryThemeMime(path);
if(!mime.isEmpty())
{
if (!mime.isEmpty()) {
return mime;
}

Expand Down Expand Up @@ -73,15 +69,13 @@ QString Scanner::doQueryFile(QString file)
GFile *g_file = g_file_new_for_path(file.toLatin1().data());
const QString attributes = "standard::content-type";

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__;
GFileInfo *fileinfo = g_file_query_info(g_file, attributes.toLatin1().data(), GFileQueryInfoFlags(G_FILE_QUERY_INFO_NONE), nullptr, err);
if (err != nullptr) {
return "";
}

const char *attribute = g_file_info_get_attribute_string(fileinfo, attributes.toLatin1().data());
QString attributeString(attribute);
qInfo() << "attributeString" << attributeString << __FUNCTION__ << __LINE__;

return attributeString;
}
Expand All @@ -90,12 +84,11 @@ bool Scanner::globalTheme(QString file)
{
KeyFile keyfile;
keyfile.loadFile(file);
if(!keyfile.loadFile(file)) {
if (!keyfile.loadFile(file)) {
return false;
}


if(keyfile.getStr("Deepin Theme","DefaultTheme").isEmpty()) {
if (keyfile.getStr("Deepin Theme", "DefaultTheme").isEmpty()) {
return false;
}

Expand All @@ -104,19 +97,18 @@ bool Scanner::globalTheme(QString file)

bool Scanner::gtkTheme(QString file)
{
return utils::isFilesInDir({"gtk-2.0","gtk-3.0","metacity-1"}, file.left(file.lastIndexOf("/")));
return utils::isFilesInDir({ "gtk-2.0", "gtk-3.0", "metacity-1" }, file.left(file.lastIndexOf("/")));
}

bool Scanner::iconTheme(QString file)
{
KeyFile keyfile;
keyfile.loadFile(file);
if(!keyfile.loadFile(file)) {
if (!keyfile.loadFile(file)) {
return false;
}


if(keyfile.getStr("Icon Theme","Directories").isEmpty()) {
if (keyfile.getStr("Icon Theme", "Directories").isEmpty()) {
return false;
}

Expand All @@ -129,7 +121,7 @@ bool Scanner::cursorTheme(QString file)
QString tmp = dir + "/cursors" + "/left_ptr";
QString mime = doQueryFile(tmp);

if(mime.isEmpty() || mime != MIMETYPEXCURSOR) {
if (mime.isEmpty() || mime != MIMETYPEXCURSOR) {
return false;
}

Expand All @@ -138,7 +130,7 @@ bool Scanner::cursorTheme(QString file)

bool Scanner::isGlobalTheme(QString uri)
{
if(uri.size() == 0)
if (uri.size() == 0)
return false;

QString ty = query(uri);
Expand All @@ -148,7 +140,7 @@ bool Scanner::isGlobalTheme(QString uri)

bool Scanner::isGtkTheme(QString uri)
{
if(uri.size() == 0)
if (uri.size() == 0)
return false;

QString ty = query(uri);
Expand All @@ -158,7 +150,7 @@ bool Scanner::isGtkTheme(QString uri)

bool Scanner::isIconTheme(QString uri)
{
if(uri.size() == 0)
if (uri.size() == 0)
return false;

QString ty = query(uri);
Expand All @@ -168,7 +160,7 @@ bool Scanner::isIconTheme(QString uri)

bool Scanner::isCursorTheme(QString uri)
{
if(uri.size() == 0)
if (uri.size() == 0)
return false;

QString ty = query(uri);
Expand All @@ -180,77 +172,67 @@ QVector<QString> Scanner::listSubDir(QString path)
{
QVector<QString> subDirs;

if(!utils::isDir(path)) {
if (!utils::isDir(path)) {
return subDirs;
}

QDir dir(path);
QFileInfoList filenames = dir.entryInfoList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files);

for(auto filename : filenames) {
qInfo() << "filename = " << filename.filePath() << __FUNCTION__ << __LINE__;
for (auto filename : filenames) {
subDirs.push_back(filename.fileName());
}

for(auto sub : subDirs) {
qInfo() << "sub = " << sub << __FUNCTION__ << __LINE__;
}

qInfo() << "sub.size = " << subDirs.size() << __FUNCTION__ << __LINE__;

return subDirs;
}

QVector<QString> Scanner::doListTheme(QString uri, QString ty, Fn fn)
{
QString path = utils::deCodeURI(uri);

qInfo() << "path = " << path << __FUNCTION__ << __LINE__;
QVector<QString> subDirs = listSubDir(path);
if(!subDirs.size()) {
qInfo() << "subDirs is empty";
if (!subDirs.size()) {
qInfo() << "Path:" << path << "subDirs is empty";
}

QVector<QString> themes;
for(auto subDir : subDirs) {
for (auto subDir : subDirs) {
QString tmp;
if(ty == TYPECURSOR) {
tmp = path + "/" +subDir + "/cursor.theme";
if (ty == TYPECURSOR) {
tmp = path + "/" + subDir + "/cursor.theme";
} else {
tmp = path + "/" + subDir + "/index.theme";
}
qInfo() << "subDir = " << subDir << __FUNCTION__ << __LINE__;

if(!fn(tmp) || isHidden(tmp, ty))
if (!fn(tmp) || isHidden(tmp, ty))
continue;
qInfo() << "subDir = " << subDir << __FUNCTION__ << __LINE__;

themes.push_back(tmp);
}

return themes;
}


QVector<QString> Scanner::listGlobalTheme(QString uri)
{
Fn fn = std::bind(&Scanner::isGlobalTheme, this,std::placeholders::_1);
Fn fn = std::bind(&Scanner::isGlobalTheme, this, std::placeholders::_1);
return doListTheme(uri, TYPEGLOBALTHEME, fn);
}

QVector<QString> Scanner::listGtkTheme(QString uri)
{
Fn fn = std::bind(&Scanner::isGtkTheme, this,std::placeholders::_1);
Fn fn = std::bind(&Scanner::isGtkTheme, this, std::placeholders::_1);
return doListTheme(uri, TYPEGTK, fn);
}

QVector<QString> Scanner::listIconTheme(QString uri)
{
Fn fn = std::bind(&Scanner::isIconTheme, this,std::placeholders::_1);
Fn fn = std::bind(&Scanner::isIconTheme, this, std::placeholders::_1);
return doListTheme(uri, TYPEICON, fn);
}

QVector<QString> Scanner::listCursorTheme(QString uri)
{
Fn fn = std::bind(&Scanner::isCursorTheme, this,std::placeholders::_1);
Fn fn = std::bind(&Scanner::isCursorTheme, this, std::placeholders::_1);
return doListTheme(uri, TYPECURSOR, fn);
}

0 comments on commit f396ee2

Please sign in to comment.