forked from linuxdeepin/image-editor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Read images from gvfs-mtp mounted folder was slow.
使用基础IO接口操作gvfs-mtp挂载的文件时,由于多次转发,IO效率较低, 引入dfm-io,使用gio接口操作,改进IO性能. Log: 引入dfm-io加快gvfs-mtp挂载文件读取. Bug: https://pms.uniontech.com/bug-view-204243.html Influence: FileLoad MTP Change-Id: Id02a6c3ecace425498dbe7f017c18ce5f9792cd9
- Loading branch information
Showing
8 changed files
with
491 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,284 @@ | ||
| // SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd. | ||
| // | ||
| // SPDX-License-Identifier: GPL-3.0-or-later | ||
|
|
||
| #include "mtpfileproxy.h" | ||
| #include "imageengine.h" | ||
|
|
||
| #include <QStorageInfo> | ||
| #include <QDebug> | ||
|
|
||
| #include <algorithm> | ||
|
|
||
| #ifdef USE_DFM_IO | ||
| #include <dfm-io/doperator.h> | ||
| USING_IO_NAMESPACE | ||
| #endif | ||
|
|
||
| static QString realPath(const QStringList &paths, const QString &filePath) | ||
| { | ||
| return filePath.isEmpty() && !paths.isEmpty() ? paths.first() : filePath; | ||
| } | ||
|
|
||
| /** | ||
| @brief 接收拷贝完成信号 | ||
| */ | ||
| static void fileOperateCallbackFunc(bool ret, void *data) | ||
| { | ||
| if (data) { | ||
| MtpFileProxy::instance()->loadFinished(*reinterpret_cast<QString *>(data), ret); | ||
| } | ||
| } | ||
|
|
||
| MtpFileProxy::MtpFileProxy() {} | ||
|
|
||
| MtpFileProxy::~MtpFileProxy() {} | ||
|
|
||
| MtpFileProxy *MtpFileProxy::instance() | ||
| { | ||
| static MtpFileProxy ins; | ||
| return &ins; | ||
| } | ||
|
|
||
| /** | ||
| @return 返回当前是否存在代理文件 | ||
| */ | ||
| bool MtpFileProxy::isValid() const | ||
| { | ||
| return !proxyCache.isEmpty(); | ||
| } | ||
|
|
||
| /** | ||
| @brief 检测传入的文件 `firstPath` 和列表 `paths` 是否为MTP文件。 | ||
| 1. 若为，则创建代理文件，并将 `firstPath` `paths` 替换为代理文件路径，返回 true ; | ||
| 2. 若非MTP文件，则不修改传入参数，返回 false . | ||
| */ | ||
| bool MtpFileProxy::checkAndCreateProxyFile(QStringList &paths, QString &firstPath) | ||
| { | ||
| firstPath = realPath(paths, firstPath); | ||
| if (MtpFileProxy::instance()->checkFileDeviceIsMtp(firstPath)) { | ||
| firstPath = MtpFileProxy::instance()->createPorxyFile(firstPath); | ||
| paths.clear(); | ||
| paths.append(firstPath); | ||
|
|
||
| qWarning() << qPrintable("Detect MTP mount file."); | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| @return 返回文件 `filePath` 是否为MTP挂载图片文件 | ||
| 目前可能采用 gvfs/cifs 进行挂载。 | ||
| */ | ||
| bool MtpFileProxy::checkFileDeviceIsMtp(const QString &filePath) | ||
| { | ||
| QStorageInfo storage(filePath); | ||
| if (storage.device().startsWith("gvfs") || storage.device().startsWith("cifs")) { | ||
| // /run/user/1000/gvfs/mtp: /run/user/1000/gvfs/gphoto2: | ||
| QString absoluteFilePath = QFileInfo(filePath).absoluteFilePath(); | ||
| if (absoluteFilePath.contains(QRegExp("fs/(mtp|gphoto2):"))) { | ||
| // 判断是否为图片文件 | ||
| if (ImageEngine::instance()->isImage(filePath)) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| @brief 提交代理文件 `proxyFile` 变更(图片旋转)到 MTP 挂载文件并返回是否成功。 | ||
| */ | ||
| bool MtpFileProxy::submitChangesToMTP(const QString &proxyFile) | ||
| { | ||
| if (isValid() && proxyCache.contains(proxyFile)) { | ||
| auto infoPtr = proxyCache.value(proxyFile); | ||
|
|
||
| // 提交临时文件变更到 MTP 原始文件目录 | ||
| #ifdef USE_DFM_IO | ||
| DOperator copyOpt(QUrl::fromLocalFile(proxyFile)); | ||
| if (!copyOpt.copyFile(QUrl::fromLocalFile(infoPtr->originFileName), DFile::CopyFlag::kOverwrite)) { | ||
| qWarning() | ||
| << QString("Submit changes to MTP mount file failed! DOperator error:%!").arg(copyOpt.lastError().errorMsg()); | ||
| return false; | ||
| } | ||
| #else | ||
| QFile copyFile(proxyFile); | ||
| if (!copyFile.copy(infoPtr->originFileName)) { | ||
| qWarning() << QString("Submit changes to MTP mount file failed! QFile error:%!").arg(copyFile.errorString()); | ||
| return false; | ||
| } | ||
| #endif | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| @return 返回缓存是否包含 `proxyFile` 代理文件路径 | ||
| */ | ||
| bool MtpFileProxy::contains(const QString &proxyFile) const | ||
| { | ||
| return proxyCache.contains(proxyFile); | ||
| } | ||
|
|
||
| /** | ||
| @return 返回代理文件当前状态。 | ||
| @li None 初始状态 | ||
| @li Loading 加载中 | ||
| @li LoadSucc 加载成功 | ||
| @li LoadFailed 加载失败 | ||
| @li FileDelete 文件删除 | ||
| */ | ||
| MtpFileProxy::FileState MtpFileProxy::state(const QString &proxyFile) const | ||
| { | ||
| if (proxyCache.contains(proxyFile)) { | ||
| return proxyCache.value(proxyFile)->fileState; | ||
| } | ||
|
|
||
| return None; | ||
| } | ||
|
|
||
| /** | ||
| @brief 根据原始文件路径 `filePath` 创建代理文件并返回代理文件路径。 | ||
| 如果已存在 `filePath` 的代理文件，将判断文件是否变更。 | ||
| 创建并非立即完成，创建完成信号通过 `createProxyFileFinished` 发出。 | ||
| */ | ||
| QString MtpFileProxy::createPorxyFile(const QString &filePath) | ||
| { | ||
| auto findItr = std::find_if(proxyCache.begin(), proxyCache.end(), [&](const QSharedPointer<ProxyInfo> &info) { | ||
| return info->originFileName == filePath; | ||
| }); | ||
|
|
||
| if (findItr != proxyCache.end()) { | ||
| // 同一路径文件已变更，移除之前缓存信息 | ||
| QFileInfo current(filePath); | ||
| if (findItr.value()->lastModified == current.lastModified()) { | ||
| return findItr.key(); | ||
| } | ||
| proxyCache.erase(findItr); | ||
| } | ||
|
|
||
| QSharedPointer<ProxyInfo> infoPtr = QSharedPointer<ProxyInfo>(new ProxyInfo); | ||
| if (!infoPtr->tempDir.isValid()) { | ||
| qWarning() << qPrintable("Cannot create temporary dir for MTP mount device."); | ||
| return filePath; | ||
| } | ||
|
|
||
| QFileInfo info(filePath); | ||
| QString proxyFile = infoPtr->tempDir.filePath(info.fileName()); | ||
| infoPtr->fileState = Loading; | ||
| infoPtr->proxyFileName = proxyFile; | ||
| infoPtr->originFileName = filePath; | ||
| infoPtr->lastModified = info.lastModified(); | ||
| proxyCache.insert(proxyFile, infoPtr); | ||
|
|
||
| // 异步拷贝文件到临时目录 | ||
| copyFileFromMtpAsync(infoPtr); | ||
|
|
||
| return proxyFile; | ||
| } | ||
|
|
||
| /** | ||
| @return 返回代理文件 `proxyFile` 所指向的原始文件路径。 | ||
| */ | ||
| QString MtpFileProxy::mapToOriginFile(const QString &proxyFile) const | ||
| { | ||
| if (proxyCache.contains(proxyFile)) { | ||
| return proxyCache.value(proxyFile)->originFileName; | ||
| } | ||
|
|
||
| // 返回传入文件路径 | ||
| return proxyFile; | ||
| } | ||
|
|
||
| /** | ||
| @brief 接收 dfm-io 异步拷贝文件 `proxyFile` 的结果 `ret`，将通过 `createProxyFileFinished` 信号通知 | ||
| */ | ||
| void MtpFileProxy::loadFinished(const QString &proxyFile, bool ret) | ||
| { | ||
| if (proxyCache.contains(proxyFile)) { | ||
| if (!ret) { | ||
| qWarning() << qPrintable("Copy MTP mount file to tmp folder failed!"); | ||
| } | ||
|
|
||
| proxyCache.value(proxyFile)->fileState = ret ? LoadSucc : LoadFailed; | ||
| Q_EMIT createProxyFileFinished(proxyFile, ret); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| @brief 触发原始文件 `originFile` 变更操作，将根据原始文件状态更新代理文件状态。 | ||
| */ | ||
| void MtpFileProxy::triggerOriginFileChanged(const QString &originFile) | ||
| { | ||
| auto findItr = std::find_if(proxyCache.begin(), proxyCache.end(), [&](const QSharedPointer<ProxyInfo> &info) { | ||
| return info->originFileName == originFile; | ||
| }); | ||
|
|
||
| if (findItr == proxyCache.end()) { | ||
| return; | ||
| } | ||
|
|
||
| QFileInfo info(originFile); | ||
| auto proxyPtr = findItr.value(); | ||
|
|
||
| if (!info.exists()) { | ||
| // 文件已被移除 | ||
| if (QFile::rename(proxyPtr->proxyFileName, proxyPtr->proxyFileName + ".delete")) { | ||
| proxyPtr->fileState = FileDelete; | ||
| } else { | ||
| qWarning() << qPrintable("For delete, rename MTP cached file failed!"); | ||
| } | ||
| } else if (FileDelete == findItr.value()->fileState) { | ||
| // 文件恢复 | ||
| if (QFile::rename(proxyPtr->proxyFileName + ".delete", proxyPtr->proxyFileName)) { | ||
| proxyPtr->fileState = LoadSucc; | ||
| } else { | ||
| qWarning() << qPrintable("For restore, rename MTP cached file failed!"); | ||
| } | ||
| } else if (info.lastModified() != findItr.value()->lastModified) { | ||
| // 文件变更 | ||
| copyFileFromMtpAsync(proxyPtr); | ||
| proxyPtr->lastModified = info.lastModified(); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| @brief 根据给出的代理信息 `proxyPtr` ，将原始文件拷贝至临时文件目录 | ||
| */ | ||
| void MtpFileProxy::copyFileFromMtpAsync(const QSharedPointer<MtpFileProxy::ProxyInfo> &proxyPtr) | ||
| { | ||
| #ifdef USE_DFM_IO | ||
| proxyPtr->fileState = Loading; | ||
| // dfm-io (gio) | ||
| DOperator copyOpt(QUrl::fromLocalFile(proxyPtr->originFileName)); | ||
| copyOpt.copyFileAsync(QUrl::fromLocalFile(proxyPtr->proxyFileName), | ||
| DFile::CopyFlag::kOverwrite, | ||
| nullptr, | ||
| nullptr, | ||
| 0, | ||
| fileOperateCallbackFunc, | ||
| reinterpret_cast<void *>(&proxyPtr->proxyFileName)); | ||
|
|
||
| #else | ||
| // 使用 Qt Api | ||
| QFile copyFile(proxyPtr->originFileName); | ||
| // 移除原有代理文件 QFile::copy() 默认不会覆盖文件 | ||
| if (QFile::exists(proxyPtr->proxyFileName)) { | ||
| QFile::remove(proxyPtr->proxyFileName); | ||
| } | ||
|
|
||
| bool ret = copyFile.copy(proxyPtr->proxyFileName); | ||
| if (!ret) { | ||
| qWarning() << QString("Copy from MTP mount file failed! QFile error:%!").arg(copyFile.errorString()); | ||
| } | ||
|
|
||
| loadFinished(proxyPtr->proxyFileName, ret); | ||
| #endif | ||
| } |
Oops, something went wrong.