Develop/23h2 sp1 rebase master

debian/changelog

@@ -1,3 +1,9 @@
+dde-file-manager (6.0.28) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.28
+
+ -- lvwujun <[email protected]>  Fri, 18 Aug 2023 14:29:09 +0800
+
 dde-file-manager (6.0.27) unstable; urgency=medium
 
   * update file manager baseline version to V6.0.27 that fixed some bugs

src/apps/dde-file-manager/main.cpp

@@ -88,14 +88,14 @@ static bool isLoadVaultPlugin()
     DSysInfo::UosEdition uosEdition = DSysInfo::uosEditionType();
     if (DSysInfo::UosServer == uosType) {
         if (DSysInfo::UosEnterprise == uosEdition
-                || DSysInfo::UosEnterpriseC == uosEdition
-                || DSysInfo::UosEuler == uosEdition) {
+            || DSysInfo::UosEnterpriseC == uosEdition
+            || DSysInfo::UosEuler == uosEdition) {
             return true;
         }
     } else if (DSysInfo::UosDesktop == uosType) {
         if (DSysInfo::UosProfessional == uosEdition
-                || static_cast<int>(DSysInfo::UosEnterprise) == static_cast<int>(uosEdition + 1)
-                || DSysInfo::UosEducation == uosEdition) {
+            || static_cast<int>(DSysInfo::UosEnterprise) == static_cast<int>(uosEdition + 1)
+            || DSysInfo::UosEducation == uosEdition) {
             return true;
         }
     }
@@ -129,18 +129,6 @@ static bool pluginsLoad()
     if (!isLoadVaultPlugin())
         blackNames << "dfmplugin-vault";
 
-#ifndef ENABLE_SMB_IN_ADMIN
-    /*
-     * NOTE(xust): the secret manager cannot be launched in WAYLAND ADMIN mode,
-     * which cause file-manager freeze when mount samba (dfm-mount using secret-manager
-     * to save/get the password of samba by sync).
-     * and the Admin mode is designed for operate files those normal user cannot write
-     * and should be the smallest dfm, so remove the smb-browser plugin in Admin mode
-     * */
-    if (SysInfoUtils::isOpenAsAdmin())
-        blackNames << "dfmplugin-smbbrowser";
-#endif
-
     // disbale lazy load if enbale headless
     bool enableHeadless { DConfigManager::instance()->value(kDefaultCfgPath, "dfm.headless", false).toBool() };
     if (enableHeadless && CommandParser::instance().isSet("d"))

src/dfm-base/base/device/devicemanager.cpp

@@ -273,7 +273,7 @@ void DeviceManager::unmountBlockDevAsync(const QString &id, const QVariantMap &o
     }
 
     auto mpt = dev->mountPoint();
-    if (mpt.isEmpty()) {
+    if (mpt.isEmpty() && !dev->isEncrypted()) {
         if (cb)
             cb(true, Utils::genOperateErrorInfo(DeviceError::kNoError));
         return;

src/dfm-base/base/device/deviceutils.cpp

@@ -246,6 +246,34 @@ bool DeviceUtils::isSftp(const QUrl &url)
     return hasMatch(url.path(), smbMatch);
 }
 
+bool DeviceUtils::isMtpFile(const QUrl &url)
+{
+    if (!url.isValid())
+        return false;
+
+    const QString &path = url.toLocalFile();
+    static const QString gvfsMatch { R"(^/run/user/\d+/gvfs/mtp:host|^/root/.gvfs/mtp:host)" };
+    QRegularExpression re { gvfsMatch };
+    QRegularExpressionMatch match { re.match(path) };
+    return match.hasMatch();
+}
+
+bool DeviceUtils::supportDfmioCopyDevice(const QUrl &url)
+{
+    if (!url.isValid())
+        return false;
+
+    return !isMtpFile(url);
+}
+
+bool DeviceUtils::supportSetPermissionsDevice(const QUrl &url)
+{
+    if (!url.isValid())
+        return false;
+
+    return !isMtpFile(url);
+}
+
 bool DeviceUtils::isExternalBlock(const QUrl &url)
 {
     return DeviceProxyManager::instance()->isFileOfExternalBlockMounts(url.path());
@@ -585,6 +613,14 @@ qint64 DeviceUtils::deviceBytesFree(const QUrl &url)
     return DFMIO::DFMUtils::deviceBytesFree(url);
 }
 
+bool DeviceUtils::isUnmountSamba(const QUrl &url)
+{
+    if (!isSamba(url))
+        return false;
+
+    return !DevProxyMng->isFileOfProtocolMounts(url.path());
+}
+
 bool DeviceUtils::findDlnfsPath(const QString &target, Compare func)
 {
     Q_ASSERT(func);

src/dfm-base/base/device/deviceutils.h

@@ -48,6 +48,9 @@ class DeviceUtils
     static bool isSamba(const QUrl &url);
     static bool isFtp(const QUrl &url);
     static bool isSftp(const QUrl &url);
+    static bool isMtpFile(const QUrl &url);
+    static bool supportDfmioCopyDevice(const QUrl &url);
+    static bool supportSetPermissionsDevice(const QUrl &url);
     static bool isExternalBlock(const QUrl &url);
     static QUrl parseNetSourceUrl(const QUrl &target);
 
@@ -73,6 +76,7 @@ class DeviceUtils
 
     static QString fileSystemType(const QUrl &url);
     static qint64 deviceBytesFree(const QUrl &url);
+    static bool isUnmountSamba(const QUrl &url);
 
 private:
     static bool hasMatch(const QString &txt, const QString &rex);

src/dfm-base/dialogs/taskdialog/taskwidget.cpp

@@ -279,6 +279,7 @@ void TaskWidget::onShowTaskInfo(const JobInfoPointer JobInfo)
 {
     if (isShowError)
         return;
+
     QString source = JobInfo->value(AbstractJobHandler::NotifyInfoKey::kSourceMsgKey).toString();
     QString target = JobInfo->value(AbstractJobHandler::NotifyInfoKey::kTargetMsgKey).toString();
     lbSrcPath->setText(source);
@@ -424,6 +425,7 @@ void TaskWidget::initUI()
     lbDstPath = new ElidedLable;
     lbRmTime = new QLabel;
     lbSrcPath->setFixedWidth(kMsgLabelWidth);
+    lbSrcPath->setText("In data statistics ...");
     lbDstPath->setFixedWidth(kMsgLabelWidth);
     lbSpeed->setFixedWidth(kSpeedLabelWidth);
     lbRmTime->setFixedWidth(kSpeedLabelWidth);
@@ -759,7 +761,7 @@ bool TaskWidget::showFileInfo(const FileInfoPointer info, const bool isOrg)
             .arg(info->timeOf(TimeInfoType::kLastModified).value<QDateTime>().isValid()
                          ? info->timeOf(TimeInfoType::kLastModified).value<QDateTime>().toString("yyyy/MM/dd HH:mm:ss")
                          : qApp->translate("MimeTypeDisplayManager", "Unknown"));
-    auto sizeStr = tr("In data statistics");
+    auto sizeStr = tr("In data statistics ...");
     auto titleStr = isOrg ? tr("Original folder") : tr("Target folder");
     if (info->isAttributes(OptInfoType::kIsDir)) {
         if (info->countChildFile() < 0) {

src/dfm-base/file/local/asyncfileinfo.cpp

@@ -746,7 +746,7 @@ QString AsyncFileInfoPrivate::path() const
  */
 QString AsyncFileInfoPrivate::filePath() const
 {
-    return this->attribute(DFileInfo::AttributeID::kStandardFilePath).toString();
+    return q->fileUrl().path();
 }
 
 /*!

src/dfm-base/file/local/localfilehandler.cpp

@@ -1047,7 +1047,7 @@ bool LocalFileHandlerPrivate::doOpenFiles(const QList<QUrl> &urls, const QString
     } else {
         defaultDesktopFile = MimesAppsManager::getDefaultAppDesktopFileByMimeType(mimeType);
         if (defaultDesktopFile.isEmpty()) {
-            if (DeviceUtils::isSamba(fileUrl)) {
+            if (DeviceUtils::isUnmountSamba(fileUrl)) {
                 mimeType = QString("inode/directory");
                 defaultDesktopFile = MimesAppsManager::getDefaultAppDesktopFileByMimeType(mimeType);
                 isOpenNow = true;

src/dfm-base/file/local/syncfileinfo.cpp

@@ -737,7 +737,7 @@ QString SyncFileInfoPrivate::path() const
  */
 QString SyncFileInfoPrivate::filePath() const
 {
-    return this->attribute(DFileInfo::AttributeID::kStandardFilePath).toString();
+    return q->fileUrl().path();
 }
 
 /*!

src/dfm-base/utils/thumbnail/thumbnailfactory.cpp

@@ -15,6 +15,9 @@
 using namespace dfmbase;
 DFMGLOBAL_USE_NAMESPACE
 
+static constexpr int kMaxCountLimit { 50 };
+static constexpr int kPushInterval { 100 };   // ms
+
 ThumbnailFactory::ThumbnailFactory(QObject *parent)
     : QObject(parent),
       thread(new QThread),
@@ -42,6 +45,10 @@ void ThumbnailFactory::init()
 {
     Q_ASSERT(qApp->thread() == QThread::currentThread());
 
+    taskPushTimer.setSingleShot(true);
+    taskPushTimer.setInterval(kPushInterval);
+    connect(&taskPushTimer, &QTimer::timeout, this, &ThumbnailFactory::pushTask);
+
     connect(qApp, &QGuiApplication::aboutToQuit, this, &ThumbnailFactory::onAboutToQuit);
 
     connect(this, &ThumbnailFactory::addTask, worker.data(), &ThumbnailWorker::onTaskAdded, Qt::QueuedConnection);
@@ -54,7 +61,14 @@ void ThumbnailFactory::init()
 
 void ThumbnailFactory::joinThumbnailJob(const QUrl &url, ThumbnailSize size)
 {
-    emit addTask(url, size);
+    if (taskMap.isEmpty())
+        taskPushTimer.start();
+
+    taskMap.insert(url, size);
+    if (taskMap.size() < kMaxCountLimit)
+        return;
+
+    pushTask();
 }
 
 bool ThumbnailFactory::registerThumbnailCreator(const QString &mimeType, ThumbnailCreator creator)
@@ -69,3 +83,9 @@ void ThumbnailFactory::onAboutToQuit()
     thread->quit();
     thread->wait(3000);
 }
+
+void ThumbnailFactory::pushTask()
+{
+    auto map = std::move(taskMap);
+    emit addTask(map);
+}

src/dfm-base/utils/thumbnail/thumbnailfactory.h

@@ -11,6 +11,8 @@
 #include <dfm-base/dfm_global_defines.h>
 #include <dfm-base/interfaces/fileinfo.h>
 
+#include <QTimer>
+
 namespace dfmbase {
 
 class ThumbnailFactory final : public QObject
@@ -31,19 +33,22 @@ class ThumbnailFactory final : public QObject
     void produceFinished(const QUrl &src, const QString &thumb);
     void produceFailed(const QUrl &src);
 
-    void addTask(const QUrl &url, DFMGLOBAL_NAMESPACE::ThumbnailSize size);
+    void addTask(const ThumbnailWorker::ThumbnailTaskMap &taskMap);
 
-public Q_SLOTS:
+private Q_SLOTS:
     void onAboutToQuit();
+    void pushTask();
 
 protected:
     explicit ThumbnailFactory(QObject *parent = nullptr);
     ~ThumbnailFactory() override;
     void init();
 
 private:
+    ThumbnailWorker::ThumbnailTaskMap taskMap;
     QSharedPointer<QThread> thread { nullptr };
     QSharedPointer<ThumbnailWorker> worker { nullptr };
+    QTimer taskPushTimer;
 };
 }   // namespace dfmbase
 

src/dfm-base/utils/thumbnail/thumbnailhelper.cpp

@@ -228,10 +228,10 @@ bool ThumbnailHelper::checkThumbEnable(const QUrl &url)
     if (!enable) {
         if (FileUtils::isMtpFile(url)) {
             enable = DConfigManager::instance()->value("org.deepin.dde.file-manager.preview", "mtpThumbnailEnable", true).toBool();
-        } else if (FileUtils::isGvfsFile(url)) {
-            enable = Application::instance()->genericAttribute(Application::kShowThunmbnailInRemote).toBool();
         } else if (DevProxyMng->isFileOfExternalBlockMounts(url.path())) {
             enable = true;
+        } else {
+            enable = Application::instance()->genericAttribute(Application::kShowThunmbnailInRemote).toBool();
         }
     }
 

src/dfm-base/utils/thumbnail/thumbnailworker.cpp

@@ -88,6 +88,7 @@ ThumbnailWorker::ThumbnailWorker(QObject *parent)
     : QObject(parent),
       d(new ThumbnailWorkerPrivate(this))
 {
+    qRegisterMetaType<ThumbnailTaskMap>("ThumbnailTaskMap");
 }
 
 ThumbnailWorker::~ThumbnailWorker()
@@ -112,42 +113,46 @@ void ThumbnailWorker::stop()
     d->isStoped = true;
 }
 
-void ThumbnailWorker::onTaskAdded(const QUrl &url, Global::ThumbnailSize size)
+void ThumbnailWorker::onTaskAdded(const ThumbnailTaskMap &taskMap)
 {
     if (d->isStoped)
         return;
 
-    QUrl fileUrl = d->originalUrl = url;
-    if (UrlRoute::isVirtual(url)) {
-        auto info { InfoFactory::create<FileInfo>(url) };
-        if (!info || !info->exists())
-            return;
+    QMapIterator<QUrl, Global::ThumbnailSize> iter(taskMap);
+    while (iter.hasNext()) {
+        iter.next();
+        QUrl fileUrl = d->originalUrl = iter.key();
+        if (UrlRoute::isVirtual(fileUrl)) {
+            auto info { InfoFactory::create<FileInfo>(fileUrl) };
+            if (!info || !info->exists())
+                continue;
+
+            fileUrl = QUrl::fromLocalFile(info->pathOf(PathInfoType::kAbsoluteFilePath));
+            if (!fileUrl.isLocalFile())
+                continue;
+        }
 
-        fileUrl = QUrl::fromLocalFile(info->pathOf(PathInfoType::kAbsoluteFilePath));
-        if (!fileUrl.isLocalFile())
-            return;
-    }
+        if (!d->thumbHelper.checkThumbEnable(fileUrl))
+            continue;
 
-    if (!d->thumbHelper.checkThumbEnable(fileUrl))
-        return;
+        const auto &img = d->thumbHelper.thumbnailImage(fileUrl, iter.value());
+        if (!img.isNull()) {
+            Q_EMIT thumbnailCreateFinished(iter.key(), img.text(QT_STRINGIFY(Thumb::Path)));
+            continue;
+        }
 
-    const auto &img = d->thumbHelper.thumbnailImage(fileUrl, size);
-    if (!img.isNull()) {
-        Q_EMIT thumbnailCreateFinished(url, img.text(QT_STRINGIFY(Thumb::Path)));
-        return;
+        createThumbnail(fileUrl, iter.value());
     }
-
-    createThumbnail(fileUrl, size);
 }
 
 void ThumbnailWorker::createThumbnail(const QUrl &url, Global::ThumbnailSize size)
 {
     // check whether the file is stable
     // if not, rejoin the event queue and create thumbnail later
     if (!d->checkFileStable(url)) {
+        ThumbnailTaskMap taskMap { { url, size } };
         QMetaObject::invokeMethod(this, "onTaskAdded", Qt::QueuedConnection,
-                                  Q_ARG(QUrl, d->originalUrl),
-                                  Q_ARG(dfmbase::Global::ThumbnailSize, size));
+                                  Q_ARG(ThumbnailTaskMap, taskMap));
         return;
     }
 

src/dfm-base/utils/thumbnail/thumbnailworker.h

@@ -8,6 +8,8 @@
 #include <dfm-base/dfm_base_global.h>
 #include <dfm-base/dfm_global_defines.h>
 
+#include <QUrl>
+
 #include <functional>
 
 namespace dfmbase {
@@ -17,6 +19,8 @@ class ThumbnailWorker : public QObject
 {
     Q_OBJECT
 public:
+    using ThumbnailTaskMap = QMap<QUrl, DFMGLOBAL_NAMESPACE::ThumbnailSize>;
+
     explicit ThumbnailWorker(QObject *parent = nullptr);
     ~ThumbnailWorker();
 
@@ -25,7 +29,7 @@ class ThumbnailWorker : public QObject
     void stop();
 
 public Q_SLOTS:
-    void onTaskAdded(const QUrl &url, DFMGLOBAL_NAMESPACE::ThumbnailSize size);
+    void onTaskAdded(const ThumbnailTaskMap &taskMap);
 
 Q_SIGNALS:
     void thumbnailCreateFinished(const QUrl &url, const QString &thumbnail);

src/dfm-base/widgets/dfmkeyvaluelabel/keyvaluelabel.cpp

@@ -205,6 +205,11 @@ QString KeyValueLabel::RightValue()
     return rightValueLabel->text();
 }
 
+void KeyValueLabel::setLeftVauleLabelFixedWidth(int width)
+{
+    leftValueLabel->setFixedWidth(width);
+}
+
 void KeyValueLabel::paintEvent(QPaintEvent *evt)
 {
     Qt::TextElideMode fontWeight = propertyMap.value(kLeftElideMode).value<Qt::TextElideMode>();

src/dfm-base/widgets/dfmkeyvaluelabel/keyvaluelabel.h

@@ -81,6 +81,7 @@ private Q_SLOTS:
     QString LeftValue();
 
     QString RightValue();
+    void setLeftVauleLabelFixedWidth(int width);
 
 Q_SIGNALS:
     void valueAreaClicked();