Revert "feat: [ulnfs] add ulnfs"

This reverts commit 6035774.
pppanghu77 · Oct 17, 2024 · 4986fd1 · 4986fd1
1 parent 8de7d51
commit 4986fd1
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 284 deletions.
diff --git a/assets/configs/org.deepin.dde.file-manager.json b/assets/configs/org.deepin.dde.file-manager.json
@@ -112,28 +112,6 @@
             "permissions":"readwrite",
             "visibility":"private"
         },
-        "dfm.mount.ulnfs": {
-            "value":false,
-            "serial":0,
-            "flags":[],
-            "name":"Extend characters of file names by ulnfs",
-            "name[zh_CN]":"扩展文件名字符数",
-            "description[zh_CN]":"扩展文件名字符数需重启后才能生效",
-            "description":"To extend characters of file names, you should restart to make the configuration effective.",
-            "permissions":"readwrite",
-            "visibility":"private"
-        },
-        "dfm.mount.ulnfs.defaults": {
-            "value":["$HOME"],
-            "serial":0,
-            "flags":[],
-            "name":"Dirs that support long file names by ulnfs",
-            "name[zh_CN]":"启用长文件名扩展的目录",
-            "description[zh_CN]":"默认启用长文件名扩展的目录",
-            "description":"Dirs that support long file names by default.",
-            "permissions":"readwrite",
-            "visibility":"private"
-        },
         "dfm.mount.dlnfs": {
             "value":false,
             "serial":0,

diff --git a/assets/scripts/99dfm-ulnfs-automount b/assets/scripts/99dfm-ulnfs-automount
diff --git a/assets/scripts/dfm-dlnfs-automount b/assets/scripts/dfm-dlnfs-automount
@@ -13,10 +13,7 @@ query_dconfig="dde-dconfig --get -a org.deepin.dde.file-manager -r org.deepin.dd
 dlnfs_enable=`$query_dconfig dfm.mount.dlnfs`
 echo "dfm_INFO: dlnfs mount status: $dlnfs_enable"
 
-ulnfs_enable=`$query_dconfig dfm.mount.ulnfs`
-echo "dfm_INFO: ulnfs mount status: $ulnfs_enable"
-
-if [ "$dlnfs_enable" == "true" ] && [ "$ulnfs_enable" != "true" ]; then
+if [ "$dlnfs_enable" == "true" ]; then
     default_paths=`$query_dconfig dfm.mount.dlnfs.defaults`
     echo "dfm_INFO: default mount paths: $default_paths"
 

diff --git a/assets/scripts/dfm-ulnfs-automount b/assets/scripts/dfm-ulnfs-automount
diff --git a/debian/dde-file-manager.install b/debian/dde-file-manager.install
@@ -24,5 +24,3 @@ usr/share/deepin-debug-config/deepin-debug-config.d/*.json
 usr/lib/systemd/user/
 etc/X11/Xsession.d/99dfm-dlnfs-automount
 etc/deepin/dde-file-manager/dfm-dlnfs-automount
-etc/X11/Xsession.d/99dfm-ulnfs-automount
-etc/deepin/dde-file-manager/dfm-ulnfs-automount
diff --git a/src/dfm-base/CMakeLists.txt b/src/dfm-base/CMakeLists.txt
@@ -64,12 +64,6 @@ set(DFM_DLNFS_SCRIPT_LAUNCHER
     ${AssetsPath}/scripts/file-manager.sh)
 install(PROGRAMS ${DFM_DLNFS_SCRIPT_LAUNCHER} DESTINATION bin)
 
-set(ULNFS_SCRIPT ${AssetsPath}/scripts/dfm-ulnfs-automount)
-install(FILES ${ULNFS_SCRIPT} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/deepin/dde-file-manager)
-
-set(ULNFS_SCRIPT_LAUNCHER ${AssetsPath}/scripts/99dfm-ulnfs-automount)
-install(FILES ${ULNFS_SCRIPT_LAUNCHER} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/X11/Xsession.d)
-
 set(Mimetypes "${ShareDir}/mimetypes")
 FILE(GLOB MIMETYPE_FILES ${AssetsPath}/mimetypes/*)
 install(FILES ${MIMETYPE_FILES} DESTINATION ${Mimetypes})

diff --git a/src/dfm-base/utils/fileutils.cpp b/src/dfm-base/utils/fileutils.cpp
@@ -1376,7 +1376,7 @@ QString FileUtils::normalPathToTrash(const QString &normal)
 bool FileUtils::supportLongName(const QUrl &url)
 {
     const static QList<QString> datas {
-        "vfat", "exfat", "ntfs", "fuseblk", "fuse.dlnfs", "ulnfs"
+        "vfat", "exfat", "ntfs", "fuseblk", "fuse.dlnfs"
     };
 
     const QString &fileSystem = dfmio::DFMUtils::fsTypeFromUrl(url);

diff --git a/src/services/mountcontrol/mountcontroldbus.cpp b/src/services/mountcontrol/mountcontroldbus.cpp
@@ -7,7 +7,6 @@
 #include "mounthelpers/cifsmounthelper.h"
 #include "mounthelpers/dlnfsmounthelper.h"
 #include "mounthelpers/commonmounthelper.h"
-#include "mounthelpers/ulnfsmounthelper.h"
 
 #include <QFile>
 
@@ -88,12 +87,9 @@ MountControlDBusPrivate::MountControlDBusPrivate(MountControlDBus *qq)
 {
     CifsMountHelper *cifsHelper = new CifsMountHelper(qq);
     DlnfsMountHelper *dlnfsHelper = new DlnfsMountHelper(qq);
-    UlnfsMountHelper *ulnfsHelper = new UlnfsMountHelper(qq);
     CommonMountHelper *commonHelper = new CommonMountHelper(qq);
 
     cifsHelper->cleanMountPoint();
-    mountHelpers.insert(MountFstypeSupportedField::kCifs, cifsHelper);
-    mountHelpers.insert(MountFstypeSupportedField::kUlnFs, ulnfsHelper);
     mountHelpers.insert(MountFstypeSupportedField::kDlnFs, dlnfsHelper);
     supportedFS.append(MountFstypeSupportedField::kDlnFs);
     mountHelpers.insert(MountFstypeSupportedField::kCommon, commonHelper);

diff --git a/src/services/mountcontrol/mounthelpers/dlnfsmounthelper.cpp b/src/services/mountcontrol/mounthelpers/dlnfsmounthelper.cpp
@@ -22,13 +22,13 @@ QVariantMap DlnfsMountHelper::mount(const QString &path, const QVariantMap &opts
     // 1. check if dlnfs at `path` is already exist.
     if (checkDlnfsExist(path))
         return { { kResult, true },
-                 { kErrorCode, -kLnMountMounted },
+                 { kErrorCode, -kDlnMountMounted },
                  { kErrorMessage, QString("dlnfs is already mounted at %1").arg(path) } };
 
     // 2. check `dlnfs` process exist.
     if (QStandardPaths::findExecutable(kDlnfs).isEmpty())
         return { { kResult, false },
-                 { kErrorCode, -kLnFsProcessNotExists },
+                 { kErrorCode, -kDlnFsProcessNotExists },
                  { kErrorMessage, "dlnfs do not exist" } };
 
     // 3. mount dlnfs on `path`

diff --git a/src/services/mountcontrol/mounthelpers/ulnfsmounthelper.cpp b/src/services/mountcontrol/mounthelpers/ulnfsmounthelper.cpp
diff --git a/src/services/mountcontrol/mounthelpers/ulnfsmounthelper.h b/src/services/mountcontrol/mounthelpers/ulnfsmounthelper.h
diff --git a/src/services/mountcontrol/service_mountcontrol_global.h b/src/services/mountcontrol/service_mountcontrol_global.h
@@ -38,7 +38,6 @@ inline constexpr char kErrorMessage[] { "errMsg" };
 
 namespace MountFstypeSupportedField {
 inline constexpr char kDlnFs[] { "dlnfs" };
-inline constexpr char kUlnFs[] { "ulnfs" };
 inline constexpr char kCifs[] { "cifs" };
 inline constexpr char kCommon[] { "common" };
 }
@@ -52,8 +51,8 @@ enum MountErrorCode {   // NOTE(xust): use NAGATIVE value when return, avoid con
     kMountNotExist,
     kNotOwnerOfMount,
 
-    kLnFsProcessNotExists,
-    kLnMountMounted,
+    kDlnFsProcessNotExists,
+    kDlnMountMounted,
     kFusermountProcessNotExists,
 
     kUnhandledError = 1000