Skip to content

fix: Refactor long file name handling in common interface #304

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
Jul 28, 2025
Merged

fix: Refactor long file name handling in common interface #304

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
16 changes: 8 additions & 8 deletions 3rdparty/interface/archiveinterface/cliinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const
});
return PFT_Nomral;
}
bool bDlnfs = m_common->isSubpathOfDlnfs(options.strTargetPath);
setProperty("dlnfs", bDlnfs);
bool bLnfs = m_common->isSubpathOfLnfs(options.strTargetPath);
setProperty("lnfs", bLnfs);
ArchiveData arcData = DataManager::get_instance().archiveData();
m_files = files;
m_extractOptions = options;

if (!bDlnfs) {
if (!bLnfs) {
if (arcData.listRootEntry.isEmpty() && options.qSize < FILE_MAX_SIZE) {
emit signalprogress(1);
setProperty("list", "tmpList");
Expand All @@ -119,10 +119,10 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const
return PFT_Nomral;
}
}
return extractFiles(files, options, bDlnfs);
return extractFiles(files, options, bLnfs);
}

PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const ExtractionOptions &options, bool bDlnfs)
PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const ExtractionOptions &options, bool bLnfs)
{
ArchiveData arcData = DataManager::get_instance().archiveData();
setProperty("list", "");
Expand Down Expand Up @@ -187,7 +187,7 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const
}
}
//长文件解压
if (!bDlnfs) {
if (!bLnfs) {
for (FileEntry entry : m_files) {
if (NAME_MAX < entry.strFileName.toLocal8Bit().length() || NAME_MAX < entry.strFullPath.toLocal8Bit().length()) {
bHandleLongName = true;
Expand Down Expand Up @@ -236,7 +236,7 @@ PluginFinishType CliInterface::extractFiles(const QList<FileEntry> &files, const
} else {
password = options.password;
}
if (!bDlnfs) {
if (!bLnfs) {
for (QMap<QString, FileEntry>::const_iterator iter = arcData.mapFileEntry.begin(); iter != arcData.mapFileEntry.end(); iter++) {
if (NAME_MAX < iter.value().strFileName.toLocal8Bit().length()) {
bHandleLongName = true;
Expand Down Expand Up @@ -751,7 +751,7 @@ bool CliInterface::runProcess(const QString &programName, const QStringList &arg
emit signalFinished(PFT_Error);
}
deleteProcess();
extractFiles(m_files, m_extractOptions, property("dlnfs").toBool());
extractFiles(m_files, m_extractOptions, property("lnfs").toBool());
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/interface/archiveinterface/cliinterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class CliInterface : public ReadWriteArchiveInterface
/**
* @brief extractFiles 业务解压
*/
PluginFinishType extractFiles(const QList<FileEntry> &files, const ExtractionOptions &options, bool bDlnfs);
PluginFinishType extractFiles(const QList<FileEntry> &files, const ExtractionOptions &options, bool bLnfs);

private:
/**
Expand Down
30 changes: 23 additions & 7 deletions 3rdparty/interface/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,9 +419,9 @@ QString Common::handleLongNameforPath(const QString &strFilePath, const QString
return sDir;
}

bool Common::isSubpathOfDlnfs(const QString &path)
bool Common::isSubpathOfLnfs(const QString &path)
{
return findDlnfsPath(path, [](const QString &target, const QString &compare) {
return findLnfsPath(path, [](const QString &target, const QString &compare) {
return target.startsWith(compare);
});
}
Expand Down Expand Up @@ -464,7 +464,7 @@ bool Common::isSupportSeek(QString sFileName)
return false;
}

bool Common::findDlnfsPath(const QString &target, Compare func)
bool Common::findLnfsPath(const QString &target, Compare func)
{
Q_ASSERT(func);
libmnt_table *tab { mnt_new_table() };
Expand All @@ -486,13 +486,29 @@ bool Common::findDlnfsPath(const QString &target, Compare func)
while (mnt_table_next_fs(tab, iter, &fs) == 0) {
if (!fs)
continue;
qInfo() << unifyPath(mnt_fs_get_target(fs));
if (strcmp("dlnfs", mnt_fs_get_source(fs)) == 0) {
QString mpt = unifyPath(mnt_fs_get_target(fs));
if (func(unifyPath(target), mpt))

const char* fsType = mnt_fs_get_fstype(fs);
const char* mountPoint = mnt_fs_get_target(fs);

if (!mountPoint)
continue;

QString fsTypeStr = fsType ? QString(fsType) : "";
QString mountPointStr = unifyPath(mountPoint);

qInfo() << "Checking filesystem - Type:" << fsTypeStr
<< "Mount:" << mountPointStr;

// 检查是否是支持长文件名的文件系统类型
bool isLongFileNameFS = (fsTypeStr == "fuse.dlnfs") ||
(fsTypeStr == "ulnfs");

if (isLongFileNameFS) {
if (func(unifyPath(target), mountPointStr)) {
if (tab) mnt_free_table(tab);
if (iter) mnt_free_iter(iter);
return true;
}
}
}

Expand Down
4 changes: 2 additions & 2 deletions 3rdparty/interface/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ class Common: public QObject
//长文件夹处理
QString handleLongNameforPath(const QString &strFilePath, const QString &entryName, QMap<QString, int> &mapLongDirName, QMap<QString, int> &mapRealDirValue);
//当前文件系统是否支持长文件
bool isSubpathOfDlnfs(const QString &path);
bool isSubpathOfLnfs(const QString &path);
/**
* @brief isSupportSeek 是否支持seek操作
* @param sFileName 文件名
*/
bool isSupportSeek(QString sFileName);
private:
//通过mount对应方法判断文件系统是否支持长文件
bool findDlnfsPath(const QString &target, Compare func);
bool findLnfsPath(const QString &target, Compare func);
};

/**
Expand Down
4 changes: 2 additions & 2 deletions 3rdparty/libarchive/libarchive/libarchiveplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ PluginFinishType LibarchivePlugin::extractFiles(const QList<FileEntry> &files, c
struct archive_entry *entry = nullptr;

QString extractDst;
bool bDlnfs = m_common->isSubpathOfDlnfs(options.strTargetPath);
bool bLnfs = m_common->isSubpathOfLnfs(options.strTargetPath);
// Iterate through all entries in archive.
int iIndex = 0; // 存储索引值
while (!QThread::currentThread()->isInterruptionRequested() && (archive_read_next_header(m_archiveReader.data(), &entry) == ARCHIVE_OK)) {
Expand Down Expand Up @@ -265,7 +265,7 @@ PluginFinishType LibarchivePlugin::extractFiles(const QList<FileEntry> &files, c
bool bLongName = false;
QString tempFilePathName;
QString strOriginName = entryName;
if(!bDlnfs) {
if(!bLnfs) {
QString sDir = m_common->handleLongNameforPath(strFilePath, entryName, m_mapLongDirName, m_mapRealDirValue);
if(sDir.length() > 0) {
strFilePath = sDir.endsWith(QDir::separator())?sDir.left(sDir.length() -1):sDir;
Expand Down
4 changes: 2 additions & 2 deletions 3rdparty/libzipplugin/libzipplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ PluginFinishType LibzipPlugin::extractFiles(const QList<FileEntry> &files, const
} else {
m_dScaleSize = 100.0 / options.qSize;
}
m_bDlnfs = m_common->isSubpathOfDlnfs(options.strTargetPath);
m_bLnfs = m_common->isSubpathOfLnfs(options.strTargetPath);

// 执行解压操作
bool bHandleLongName = false;
Expand Down Expand Up @@ -812,7 +812,7 @@ ErrorType LibzipPlugin::extractEntry(zip_t *archive, zip_int64_t index, const Ex
}

QString tempFilePathName;
if(!m_bDlnfs) {
if(!m_bLnfs) {
QString sDir = m_common->handleLongNameforPath(strFilePath, strFileName, m_mapLongDirName, m_mapRealDirValue);
if(sDir.length() > 0) {
strFilePath = sDir.endsWith(QDir::separator())?sDir.left(sDir.length() -1):sDir;
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libzipplugin/libzipplugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class LibzipPlugin : public ReadWriteArchiveInterface
QMap<QString, int> m_mapLongDirName; // 长文件夹统计
QMap<QString, int> m_mapRealDirValue; // 长文件真实文件统计
QSet<QString> m_setLongName; // 存储被截取之后的文件名称（包含001之类的）
bool m_bDlnfs = false; //文件系统是否支持长文件
bool m_bLnfs = false; //文件系统是否支持长文件名
};

#endif // LIBZIPPLUGIN_H
14 changes: 13 additions & 1 deletion src/source/common/uitools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,19 @@ bool UiTools::isLocalDeviceFile(const QString &strFileName)
{
QStorageInfo info(strFileName);
QString sDevice = info.device();
return sDevice.startsWith("/dev/") || sDevice.startsWith("dlnfs"); //长文件名开启后以dlnfs方式挂载
QString sFileSystemType = info.fileSystemType();

// 检查传统的本地设备（以 /dev/ 开头）
if (sDevice.startsWith("/dev/")) {
return true;
}

// 检查长文件名文件系统类型
if (sFileSystemType == "fuse.dlnfs" || sFileSystemType == "ulnfs") {
return true;
}

return false;
}

QStringList UiTools::removeSameFileName(const QStringList &listFiles)
Expand Down