Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: consistent debug messages

Browse source 
some logging to the generic debug area, some to the services debug area and
some to the kbuildsycoca debug area..

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-04 21:43:41 +03:00
parent 1ff6f4d2ee
commit 5bb3125631
3 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kdecore/services/kmimetype.cpp
View file

@ -227,7 +227,7 @@ KMimeType::Ptr KMimeType::findByUrl(const KUrl &url, mode_t mode,
KMimeType::Ptr mime = KMimeTypeRepository::self()->findFromContent(&file, &magicAccuracy); KMimeType::Ptr mime = KMimeTypeRepository::self()->findFromContent(&file, &magicAccuracy);
// mime can't be 0, except in case of install problems. // mime can't be 0, except in case of install problems.
// However we get magicAccuracy==0 for octet-stream, i.e. no magic match found. // However we get magicAccuracy==0 for octet-stream, i.e. no magic match found.
//kDebug(servicesDebugArea()) << "findFromContent said" << (mime?mime->name():QString()) << "with accuracy" << magicAccuracy; // kDebug() << "findFromContent said" << (mime?mime->name():QString()) << "with accuracy" << magicAccuracy;
if (mime && magicAccuracy > 0) { if (mime && magicAccuracy > 0) {
// Disambiguate conflicting extensions (if magic found something and the magicrule was <80) // Disambiguate conflicting extensions (if magic found something and the magicrule was <80)
if (magicAccuracy < 80 && !mimeList.isEmpty()) { if (magicAccuracy < 80 && !mimeList.isEmpty()) {
@ -236,7 +236,7 @@ KMimeType::Ptr KMimeType::findByUrl(const KUrl &url, mode_t mode,
const QString sniffedMime = mime->name(); const QString sniffedMime = mime->name();
foreach(const QString &m, mimeList) { foreach(const QString &m, mimeList) {
KMimeType::Ptr mimeFromPattern = KMimeType::mimeType(m); KMimeType::Ptr mimeFromPattern = KMimeType::mimeType(m);
//kDebug(servicesDebugArea()) << "sniffedMime=" << sniffedMime << "mimeFromPattern=" << mimeFromPattern->name(); // kDebug() << "sniffedMime=" << sniffedMime << "mimeFromPattern=" << mimeFromPattern->name();
if (mimeFromPattern && mimeFromPattern->is(sniffedMime)) { if (mimeFromPattern && mimeFromPattern->is(sniffedMime)) {
// We have magic + pattern pointing to this, so it's a pretty good match // We have magic + pattern pointing to this, so it's a pretty good match
if (accuracy) { if (accuracy) {

35
kdecore/services/kmimetyperepository.cpp
View file

@ -95,10 +95,6 @@ KMimeTypeRepository::KMimeTypeRepository()
connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this, SLOT(parseMimeData(QStringList))); connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this, SLOT(parseMimeData(QStringList)));
} }
KMimeTypeRepository::~KMimeTypeRepository()
{
}
void KMimeTypeRepository::parseMimeData(const QStringList &resources) void KMimeTypeRepository::parseMimeData(const QStringList &resources)
{ {
if (resources.contains(QLatin1String("xdgdata-mime"))) { if (resources.contains(QLatin1String("xdgdata-mime"))) {
@ -117,7 +113,7 @@ void KMimeTypeRepository::parseMimeData()
const QStringList aliasFiles = KGlobal::dirs()->findAllResources("xdgdata-mime", QLatin1String("aliases")); const QStringList aliasFiles = KGlobal::dirs()->findAllResources("xdgdata-mime", QLatin1String("aliases"));
Q_FOREACH(const QString& fileName, aliasFiles) { Q_FOREACH(const QString& fileName, aliasFiles) {
QFile qfile(fileName); QFile qfile(fileName);
//kDebug(7021) << "Now parsing" << fileName; // kDebug() << "Now parsing" << fileName;
if (qfile.open(QIODevice::ReadOnly)) { if (qfile.open(QIODevice::ReadOnly)) {
while (!qfile.atEnd()) { while (!qfile.atEnd()) {
const QByteArray line = qfile.readLine().trimmed(); const QByteArray line = qfile.readLine().trimmed();
@ -138,7 +134,7 @@ void KMimeTypeRepository::parseMimeData()
const KMimeType::Ptr realMimeType = findMimeTypeByName(aliasTypeNameStr, KMimeType::DontResolveAlias); const KMimeType::Ptr realMimeType = findMimeTypeByName(aliasTypeNameStr, KMimeType::DontResolveAlias);
if (realMimeType) { if (realMimeType) {
// kDebug(servicesDebugArea()) << "Ignoring alias" << aliasTypeNameStr << "because also defined as a real mimetype"; // kDebug() << "Ignoring alias" << aliasTypeNameStr << "because also defined as a real mimetype";
} else { } else {
m_aliases.insert(aliasTypeNameStr, parentTypeNameStr); m_aliases.insert(aliasTypeNameStr, parentTypeNameStr);
} }
@ -151,7 +147,7 @@ void KMimeTypeRepository::parseMimeData()
// kDebug() << subclassFiles; // kDebug() << subclassFiles;
Q_FOREACH(const QString &fileName, subclassFiles) { Q_FOREACH(const QString &fileName, subclassFiles) {
QFile qfile(fileName); QFile qfile(fileName);
// kDebug(7021) << "Now parsing" << fileName; // kDebug() << "Now parsing" << fileName;
if (qfile.open(QIODevice::ReadOnly)) { if (qfile.open(QIODevice::ReadOnly)) {
while (!qfile.atEnd()) { while (!qfile.atEnd()) {
const QByteArray line = qfile.readLine().trimmed(); const QByteArray line = qfile.readLine().trimmed();
@ -167,9 +163,9 @@ void KMimeTypeRepository::parseMimeData()
const QString derivedTypeNameStr = QString::fromLatin1(derivedTypeName.constData(), derivedTypeName.size()); const QString derivedTypeNameStr = QString::fromLatin1(derivedTypeName.constData(), derivedTypeName.size());
KMimeType::Ptr derivedType = findMimeTypeByName(derivedTypeNameStr, KMimeType::ResolveAliases); KMimeType::Ptr derivedType = findMimeTypeByName(derivedTypeNameStr, KMimeType::ResolveAliases);
if (!derivedType) { if (!derivedType) {
kWarning(7021) << fileName << " refers to unknown mimetype " << derivedTypeNameStr; kWarning() << fileName << " refers to unknown mimetype " << derivedTypeNameStr;
} else { } else {
const QByteArray parentTypeName = line.mid(pos+1); const QByteArray parentTypeName = line.mid(pos + 1);
const QString parentTypeNameStr = QString::fromLatin1(parentTypeName.constData(), parentTypeName.size()); const QString parentTypeNameStr = QString::fromLatin1(parentTypeName.constData(), parentTypeName.size());
Q_ASSERT(!parentTypeName.isEmpty()); Q_ASSERT(!parentTypeName.isEmpty());
//derivedType->setParentMimeType(parentTypeNameStr); //derivedType->setParentMimeType(parentTypeNameStr);
@ -188,7 +184,7 @@ void KMimeTypeRepository::parseMimeData()
while (magicIter.hasPrevious()) { while (magicIter.hasPrevious()) {
const QString fileName = magicIter.previous(); const QString fileName = magicIter.previous();
QFile magicFile(fileName); QFile magicFile(fileName);
// kDebug(servicesDebugArea()) << "Now parsing " << fileName; // kDebug() << "Now parsing " << fileName;
if (magicFile.open(QIODevice::ReadOnly)) { if (magicFile.open(QIODevice::ReadOnly)) {
m_magicRules += parseMagicFile(&magicFile, fileName); m_magicRules += parseMagicFile(&magicFile, fileName);
} }
@ -306,8 +302,7 @@ QStringList KMimeTypeRepository::findFromFileName(const QString &fileName, QStri
} }
if (lastMatchedWeight > 0 && glob.weight > lastMatchedWeight) { if (lastMatchedWeight > 0 && glob.weight > lastMatchedWeight) {
// can't happen // can't happen
kWarning(servicesDebugArea()) << "Assumption failed; globs2 weights not sorted correctly" kWarning() << "Assumption failed; globs2 weights not sorted correctly" << glob.weight << ">" << lastMatchedWeight;
<< glob.weight << ">" << lastMatchedWeight;
} }
// Is this a shorter or a longer match than an existing one, or same length? // Is this a shorter or a longer match than an existing one, or same length?
if (glob.pattern.length() < matchingPatternLength) { if (glob.pattern.length() < matchingPatternLength) {
@ -414,7 +409,7 @@ QList<KMimeMagicRule> KMimeTypeRepository::parseMagicFile(QIODevice *file, const
QList<KMimeMagicRule> rules; QList<KMimeMagicRule> rules;
QByteArray header = file->read(12); QByteArray header = file->read(12);
if (header.size() != 12 || ::memcmp(header.constData(), "MIME-Magic\0\n", 12) != 0) { if (header.size() != 12 || ::memcmp(header.constData(), "MIME-Magic\0\n", 12) != 0) {
kWarning(servicesDebugArea()) << "Invalid magic file " << fileName << " starts with " << header; kWarning() << "Invalid magic file " << fileName << " starts with " << header;
return rules; return rules;
} }
QList<KMimeMagicMatch> matches; // toplevel matches (indent==0) QList<KMimeMagicMatch> matches; // toplevel matches (indent==0)
@ -434,7 +429,7 @@ QList<KMimeMagicRule> KMimeTypeRepository::parseMagicFile(QIODevice *file, const
// workaround for: // workaround for:
// https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/144 // https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/144
if (sharedmimeinfover <= sharedmimeinfo200 && mimeTypeName == "audio/x-mod") { if (sharedmimeinfover <= sharedmimeinfo200 && mimeTypeName == "audio/x-mod") {
kDebug(servicesDebugArea()) << "Ignoring audio/x-mod magic rules"; kDebug() << "Ignoring audio/x-mod magic rules";
} else { } else {
const QString mimeTypeNameStr = QString::fromLatin1(mimeTypeName.constData(), mimeTypeName.size()); const QString mimeTypeNameStr = QString::fromLatin1(mimeTypeName.constData(), mimeTypeName.size());
rules.append(KMimeMagicRule(mimeTypeNameStr, priority, matches)); rules.append(KMimeMagicRule(mimeTypeNameStr, priority, matches));
@ -450,15 +445,13 @@ QList<KMimeMagicRule> KMimeTypeRepository::parseMagicFile(QIODevice *file, const
const int pos = line.indexOf(':'); const int pos = line.indexOf(':');
if (pos == -1) { if (pos == -1) {
// syntax error // syntax error
kWarning(servicesDebugArea()) << "Syntax error in " << mimeTypeName kWarning() << "Syntax error in " << mimeTypeName << " ':' not present in section name";
<< " ':' not present in section name";
break; break;
} }
priority = line.left(pos).toInt(); priority = line.left(pos).toInt();
mimeTypeName = line.mid(pos+1); mimeTypeName = line.mid(pos+1);
mimeTypeName = mimeTypeName.left(mimeTypeName.length()-2); // remove ']\n' mimeTypeName = mimeTypeName.left(mimeTypeName.length()-2); // remove ']\n'
// kDebug(servicesDebugArea()) << "New rule for " << mimeTypeName // kDebug() << "New rule for " << mimeTypeName << " with priority " << priority;
// << " with priority " << priority;
} else { } else {
// Parse line in the section // Parse line in the section
// [ indent ] ">" start-offset "=" value // [ indent ] ">" start-offset "=" value
@ -468,7 +461,7 @@ QList<KMimeMagicRule> KMimeTypeRepository::parseMagicFile(QIODevice *file, const
indent = ch - '0'; indent = ch - '0';
ch = readNumber(indent, file); ch = readNumber(indent, file);
if (ch != '>') { if (ch != '>') {
kWarning(servicesDebugArea()) << "Invalid magic file " << fileName << " '>' not found, got " << ch << " at pos " << file->pos(); kWarning() << "Invalid magic file " << fileName << " '>' not found, got " << ch << " at pos " << file->pos();
break; break;
} }
} }
@ -477,7 +470,7 @@ QList<KMimeMagicRule> KMimeTypeRepository::parseMagicFile(QIODevice *file, const
match.m_rangeStart = 0; match.m_rangeStart = 0;
ch = readNumber(match.m_rangeStart, file); ch = readNumber(match.m_rangeStart, file);
if (ch != '=') { if (ch != '=') {
kWarning(servicesDebugArea()) << "Invalid magic file " << fileName << " '=' not found"; kWarning() << "Invalid magic file " << fileName << " '=' not found";
break; break;
} }
@ -540,7 +533,7 @@ QList<KMimeMagicRule> KMimeTypeRepository::parseMagicFile(QIODevice *file, const
file->getChar(&ch); file->getChar(&ch);
} }
invalidLine = true; invalidLine = true;
kDebug(servicesDebugArea()) << "invalid line - garbage found - ch=" << ch; kDebug() << "invalid line - garbage found - ch=" << ch;
break; break;
} }
} }

1
kdecore/services/kmimetyperepository_p.h
View file

@ -116,7 +116,6 @@ private Q_SLOTS:
private: private:
KMimeTypeRepository(); KMimeTypeRepository();
~KMimeTypeRepository();
/** /**
* @internal (re-)parses the glob, aliases, parents and magic file(s) * @internal (re-)parses the glob, aliases, parents and magic file(s)