fix: [io]When renaming a new document in vault, the suffix is also se…

…lected.

When creating a new file after using asyncfileinfo in vault, the suffix of the file is not obtained correctly. The asyncfileinfo code in the master branch uses a url to get the file suffix.

Log: When renaming a new document in vault, the suffix is also selected.
Bug: https://pms.uniontech.com/bug-view-211605.html

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

@@ -101,20 +101,10 @@ QString AsyncFileInfo::nameOf(const NameInfoType type) const
         if (d->asyncAttribute(AsyncAttributeID::kStandardName).isValid())
             return d->asyncAttribute(AsyncAttributeID::kStandardName).toString();
         break;
-    case FileNameInfoType::kBaseName:
-        if (d->asyncAttribute(AsyncAttributeID::kStandardBaseName).isValid())
-            return d->asyncAttribute(AsyncAttributeID::kStandardBaseName).toString();
-        break;
     case FileNameInfoType::kCompleteBaseName:
         if (d->asyncAttribute(AsyncAttributeID::kStandardCompleteBaseName).isValid())
             return d->asyncAttribute(AsyncAttributeID::kStandardCompleteBaseName).toString();
         break;
-    case FileNameInfoType::kSuffix:
-        [[fallthrough]];
-    case FileNameInfoType::kSuffixOfRename:
-        if (d->asyncAttribute(AsyncAttributeID::kStandardSuffix).isValid())
-            return d->asyncAttribute(AsyncAttributeID::kStandardSuffix).toString();
-        break;
     case FileNameInfoType::kCompleteSuffix:
         if (d->asyncAttribute(AsyncAttributeID::kStandardCompleteSuffix).isValid())
             return d->asyncAttribute(AsyncAttributeID::kStandardCompleteSuffix).toString();
@@ -644,21 +634,6 @@ QString AsyncFileInfoPrivate::fileName() const
         fileName = this->attribute(DFileInfo::AttributeID::kIdFilesystem).toString();
     return fileName;
 }
-/*!
- * \brief baseName 文件的基本名称
- *
- * url = file:///tmp/archive.tar.gz
- *
- * baseName = archive
- *
- * \param
- *
- * \return
- */
-QString AsyncFileInfoPrivate::baseName() const
-{
-    return this->attribute(DFileInfo::AttributeID::kStandardBaseName).toString();
-}
 /*!
  * \brief completeBaseName 文件的完整基本名称
  *
@@ -674,21 +649,6 @@ QString AsyncFileInfoPrivate::completeBaseName() const
 {
     return this->attribute(DFileInfo::AttributeID::kStandardCompleteBaseName).toString();
 }
-/*!
- * \brief suffix 文件的suffix
- *
- * url = file:///tmp/archive.tar.gz
- *
- * suffix = gz
- *
- * \param
- *
- * \return
- */
-QString AsyncFileInfoPrivate::suffix() const
-{
-    return this->attribute(DFileInfo::AttributeID::kStandardSuffix).toString();
-}
 /*!
  * \brief suffix 文件的完整suffix
  *
@@ -1015,9 +975,7 @@ void AsyncFileInfoPrivate::cacheAllAttributes()
     assert(qApp->thread() != QThread::currentThread());
     QMap<AsyncFileInfo::AsyncAttributeID, QVariant> tmp;
     tmp.insert(AsyncFileInfo::AsyncAttributeID::kStandardName, fileName());
-    tmp.insert(AsyncFileInfo::AsyncAttributeID::kStandardBaseName, baseName());
     tmp.insert(AsyncFileInfo::AsyncAttributeID::kStandardCompleteBaseName, completeBaseName());
-    tmp.insert(AsyncFileInfo::AsyncAttributeID::kStandardSuffix, suffix());
     tmp.insert(AsyncFileInfo::AsyncAttributeID::kStandardCompleteSuffix, completeSuffix());
     tmp.insert(AsyncFileInfo::AsyncAttributeID::kStandardDisplayName, fileDisplayName());
     tmp.insert(AsyncFileInfo::AsyncAttributeID::kStandardSize, attribute(DFileInfo::AttributeID::kStandardSize));

src/dfm-base/file/local/private/asyncfileinfo_p.h

@@ -77,9 +77,7 @@ class AsyncFileInfoPrivate
 
 public:
     QString fileName() const;
-    QString baseName() const;
     QString completeBaseName() const;
-    QString suffix() const;
     QString completeSuffix() const;
     QString iconName() const;
     QString mimeTypeName() const;

src/dfm-base/file/local/private/syncfileinfo_p.h

@@ -74,9 +74,7 @@ class SyncFileInfoPrivate
 
 public:
     QString fileName() const;
-    QString baseName() const;
     QString completeBaseName() const;
-    QString suffix() const;
     QString completeSuffix() const;
     QString iconName() const;
     QString mimeTypeName() const;

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

@@ -136,14 +136,8 @@ QString SyncFileInfo::nameOf(const NameInfoType type) const
     switch (type) {
     case FileNameInfoType::kFileName:
         return d->fileName();
-    case FileNameInfoType::kBaseName:
-        return d->baseName();
     case FileNameInfoType::kCompleteBaseName:
         return d->completeBaseName();
-    case FileNameInfoType::kSuffix:
-        [[fallthrough]];
-    case FileNameInfoType::kSuffixOfRename:
-        return d->suffix();
     case FileNameInfoType::kCompleteSuffix:
         return d->completeSuffix();
     case FileNameInfoType::kFileCopyName:
@@ -633,21 +627,6 @@ QString SyncFileInfoPrivate::fileName() const
         fileName = this->attribute(DFileInfo::AttributeID::kIdFilesystem).toString();
     return fileName;
 }
-/*!
- * \brief baseName 文件的基本名称
- *
- * url = file:///tmp/archive.tar.gz
- *
- * baseName = archive
- *
- * \param
- *
- * \return
- */
-QString SyncFileInfoPrivate::baseName() const
-{
-    return this->attribute(DFileInfo::AttributeID::kStandardBaseName).toString();
-}
 /*!
  * \brief completeBaseName 文件的完整基本名称
  *
@@ -663,21 +642,6 @@ QString SyncFileInfoPrivate::completeBaseName() const
 {
     return this->attribute(DFileInfo::AttributeID::kStandardCompleteBaseName).toString();
 }
-/*!
- * \brief suffix 文件的suffix
- *
- * url = file:///tmp/archive.tar.gz
- *
- * suffix = gz
- *
- * \param
- *
- * \return
- */
-QString SyncFileInfoPrivate::suffix() const
-{
-    return this->attribute(DFileInfo::AttributeID::kStandardSuffix).toString();
-}
 /*!
  * \brief suffix 文件的完整suffix
  *

src/dfm-base/interfaces/fileinfo.cpp

@@ -132,6 +132,8 @@ QString dfmbase::FileInfo::nameOf(const NameInfoType type) const
         [[fallthrough]];
     case FileNameInfoType::kBaseNameOfRename:
         return dptr->baseName();
+    case FileNameInfoType::kSuffixOfRename:
+        [[fallthrough]];
     case FileNameInfoType::kSuffix:
         return dptr->suffix();
     case FileNameInfoType::kIconName:

src/dfm-base/utils/fileutils.cpp

@@ -678,7 +678,7 @@ QString FileUtils::nonExistSymlinkFileName(const QUrl &fileUrl, const QUrl &pare
 
     if (info && DFMIO::DFile(fileUrl).exists()) {
         QString baseName = info->displayOf(DisPlayInfoType::kFileDisplayName) == info->nameOf(NameInfoType::kFileName)
-                ? info->nameOf(NameInfoType::kCompleteBaseName)
+                ? info->nameOf(NameInfoType::kBaseName)
                 : info->displayOf(DisPlayInfoType::kFileDisplayName);
         QString shortcut = QObject::tr("Shortcut");
         QString linkBaseName;