Skip to content

fix: handle file selection when traversing to file path #3465

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
deepin-bot merged 1 commit into from
Jan 4, 2026
Merged

fix: handle file selection when traversing to file path #3465

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
36 changes: 9 additions & 27 deletions src/plugins/filemanager/dfmplugin-smbbrowser/events/traversprehandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,33 +91,10 @@ void travers_prehandler::networkAccessPrehandler(quint64 winId, const QUrl &url,
static QString kRecordFilePath = QString("/tmp/dfm_smb_mount_%1.ini").arg(getuid());
static QString kRecordGroup = "defaultSmbPath";
static QRegularExpression kRegx { "/|\\.|:" };
auto recordSubPath = [](const QString &smbRoot, const QString &subPath) {
QFile record(kRecordFilePath);
if (!record.exists() && record.open(QIODevice::NewOnly)) {
record.close();
fmDebug() << "Created new record file:" << kRecordFilePath;
}
auto key(smbRoot);
key = key.replace(kRegx, "_");
QSettings sets(kRecordFilePath, QSettings::IniFormat);
sets.setValue(QString("%1/%2").arg(kRecordGroup).arg(key), subPath);
};
auto readSubPath = [](const QString &smbRoot) {
auto key(smbRoot);
key = key.replace(kRegx, "_");
QSettings sets(kRecordFilePath, QSettings::IniFormat);
return sets.value(QString("%1/%2").arg(kRecordGroup).arg(key), "").toString();
};

DevMngIns->mountNetworkDeviceAsync(mountSource, [=](bool ok, const DFMMOUNT::OperationErrorInfo &err, const QString &mpt) {
fmInfo() << "mount done: " << netUrl << ok << err.code << err.message << mpt;
if (!mpt.isEmpty()) {
if (err.code == DFMMOUNT::DeviceError::kNoError)
recordSubPath(mountSource, subPath);
QString jumpTo(subPath);
if (jumpTo.isEmpty())
jumpTo = readSubPath(mountSource);
doChangeCurrentUrl(winId, mpt, jumpTo, netUrl);
doChangeCurrentUrl(winId, mpt, subPath, netUrl);
} else if (ok || err.code == DFMMOUNT::DeviceError::kGIOErrorAlreadyMounted) {
if (isSmb) onSmbRootMounted(mountSource, after);
} else {
Expand Down Expand Up @@ -175,9 +152,14 @@ void travers_prehandler::doChangeCurrentUrl(quint64 winId, const QString &mpt, c
targetPath.append(subPath);

QUrl url = QUrl::fromLocalFile(targetPath);
FileInfoPointer fileInfo = InfoFactory::create<FileInfo>(url);
if (fileInfo && fileInfo->isAttributes(FileInfo::FileIsType::kIsFile))
url = fileInfo->urlOf(FileInfo::FileUrlInfoType::kParentUrl);
FileInfoPointer fileInfo = InfoFactory::create<FileInfo>(url, Global::kCreateFileInfoSync);
if (fileInfo && fileInfo->isAttributes(FileInfo::FileIsType::kIsFile)) {
dpfSignalDispatcher->publish(GlobalEventType::kOpenFiles, winId, QList<QUrl> { url });

QUrl parentUrl = fileInfo->urlOf(UrlInfoType::kParentUrl);
parentUrl.setQuery("selectUrl=" + url.toString());
url = parentUrl;
}
dpfSignalDispatcher->publish(GlobalEventType::kChangeCurrentUrl, winId, url);

// remove sourceUrl from history stack.
Expand Down
Loading