mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-23 04:54:18 +00:00
preferences: optimize XDG path detection code
This commit is contained in:
parent
fe6df6176d
commit
928936046e
@ -206,16 +206,8 @@ public:
|
|||||||
QSettings settings(user_dirs_file, QSettings::IniFormat);
|
QSettings settings(user_dirs_file, QSettings::IniFormat);
|
||||||
QString xdg_download_dir = settings.value("XDG_DOWNLOAD_DIR").toString();
|
QString xdg_download_dir = settings.value("XDG_DOWNLOAD_DIR").toString();
|
||||||
if (!xdg_download_dir.isEmpty()) {
|
if (!xdg_download_dir.isEmpty()) {
|
||||||
// Resolve environment variables
|
// Resolve $HOME environment variables
|
||||||
QRegExp envar("\\$([a-ZA-Z_]+)");
|
xdg_download_dir.replace("$HOME", QDir::homePath());
|
||||||
int pos = 0;
|
|
||||||
while ((pos = envar.indexIn(xdg_download_dir, pos)) != -1) {
|
|
||||||
QString variable = envar.cap(1);
|
|
||||||
QString replacement = QString::fromLocal8Bit(getenv(variable.toLocal8Bit()));
|
|
||||||
qDebug() << Q_FUNC_INFO << "Replacing " << envar.cap(0) << "by" << replacement;
|
|
||||||
if (!replacement.isEmpty())
|
|
||||||
xdg_download_dir.replace(envar.cap(0), replacement);
|
|
||||||
}
|
|
||||||
save_path = xdg_download_dir;
|
save_path = xdg_download_dir;
|
||||||
qDebug() << Q_FUNC_INFO << "SUCCESS: Using XDG path for downloads: " << save_path;
|
qDebug() << Q_FUNC_INFO << "SUCCESS: Using XDG path for downloads: " << save_path;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user