Skip to content

Add XDG_SESSION_TYPE to diagnostics #1303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kristelmerilain merged 1 commit into from
Nov 19, 2024
Merged

Add XDG_SESSION_TYPE to diagnostics #1303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions client/Diagnostics_unix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ void Diagnostics::run()
info.clear();

#ifndef Q_OS_DARWIN
QStringList package = packages({"open-eid"}, false);
if( !package.isEmpty() )
if(QStringList package = packages({"open-eid"}, false); !package.isEmpty())
s << "<b>" << tr("Base version:") << "</b> " << package.first() << "<br />";
#endif
s << "<b>" << tr("Application version:") << "</b> " << QCoreApplication::applicationVersion() << " (" << QSysInfo::WordSize << " bit)<br />";
Expand All @@ -101,13 +100,10 @@ void Diagnostics::run()
s << "<b>" << tr("OS:") << "</b> " << Common::applicationOs() << "<br />";
#ifndef Q_OS_DARWIN
s << "<b>" << tr("CPU:") << "</b> ";
QFile f( "/proc/cpuinfo" );
if( f.open( QFile::ReadOnly ) )
if(QFile f("/proc/cpuinfo"); f.open(QFile::ReadOnly))
{
QRegularExpression rx(QStringLiteral("model name.*\\: (.*)\n"));
rx.setPatternOptions(QRegularExpression::InvertedGreedinessOption);
QRegularExpressionMatch match = rx.match(QString::fromLocal8Bit(f.readAll()));
if(match.hasMatch())
static const QRegularExpression rx(QStringLiteral("model name.*\\: (.*)\n"), QRegularExpression::InvertedGreedinessOption);
if(QRegularExpressionMatch match = rx.match(QString::fromLocal8Bit(f.readAll())); match.hasMatch())
s << match.captured(1);
}
s << "<br />";
Expand Down Expand Up @@ -140,17 +136,17 @@ void Diagnostics::run()
info.clear();

#ifndef Q_OS_DARWIN
QStringList browsers = packages({"chromium-browser", "firefox", "MozillaFirefox", "google-chrome-stable"});
if( !browsers.isEmpty() )
s << "<br /><br /><b>XDG_SESSION_TYPE:</b> " << qEnvironmentVariable("XDG_SESSION_TYPE");

if(QStringList browsers = packages({"chromium-browser", "firefox", "MozillaFirefox", "google-chrome-stable"}); !browsers.isEmpty())
s << "<br /><br /><b>" << tr("Browsers:") << "</b><br />" << browsers.join(QStringLiteral("<br />")) << "<br /><br />";
emit update( info );
info.clear();

QProcess p;
p.start(QStringLiteral("lsusb"), QStringList());
p.waitForFinished();
QString cmd = QString::fromLocal8Bit( p.readAll() );
if( !cmd.isEmpty() )
if(QString cmd = QString::fromLocal8Bit(p.readAll()); !cmd.isEmpty())
s << "<b>" << tr("USB info:") << "</b><br/> " << cmd.replace( "\n", "<br />" ) << "<br />";
emit update( info );
info.clear();
Expand Down
Loading