Skip to content

fix(storage): initialize default save path to Downloads instead of home #728

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

Open
re2zero wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(storage): initialize default save path to Downloads instead of home #728

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions src/compat/plugins/daemon/core/utils/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -164,10 +164,11 @@ class DaemonConfig
const fastring getStorageDir()
{
fastring home = os::homedir();
fastring download = path::join(home, "Downloads");
if (_targetName.empty()) {
_storageDir = home;
_storageDir = download;
} else {
_storageDir = path::join(home, _targetName);
_storageDir = path::join(download, _targetName);
}
return _storageDir;
}
Expand Down
4 changes: 3 additions & 1 deletion src/lib/cooperation/core/net/networkutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 - 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -22,10 +22,11 @@
#include "compatwrapper.h"
#endif

#include <QJsonDocument>

Check warning on line 25 in src/lib/cooperation/core/net/networkutil.cpp

View workflow job for this annotation

GitHub Actions / static-check / static-check 

Include file: <QJsonDocument> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QDebug>

Check warning on line 26 in src/lib/cooperation/core/net/networkutil.cpp

View workflow job for this annotation

GitHub Actions / static-check / static-check 

Include file: <QDebug> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QDir>

Check warning on line 27 in src/lib/cooperation/core/net/networkutil.cpp

View workflow job for this annotation

GitHub Actions / static-check / static-check 

Include file: <QDir> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QStandardPaths>

Check warning on line 28 in src/lib/cooperation/core/net/networkutil.cpp

View workflow job for this annotation

GitHub Actions / static-check / static-check 

Include file: <QStandardPaths> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QScreen>

Check warning on line 29 in src/lib/cooperation/core/net/networkutil.cpp

View workflow job for this annotation

GitHub Actions / static-check / static-check 

Include file: <QScreen> not found. Please note: Cppcheck does not need standard library headers to get proper results.

using namespace cooperation_core;
NetworkUtilPrivate::NetworkUtilPrivate(NetworkUtil *qq)
Expand All @@ -35,6 +36,7 @@
LOG << "This is only transfer?" << onlyTransfer;

sessionManager = new SessionManager(this);
sessionManager->setStorageRoot(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
if (onlyTransfer) {
DLOG << "Running in transfer-only mode, skipping full initialization";
return;
Expand Down
Loading