rebase the master codes

CMakeLists.txt

@@ -9,7 +9,7 @@ set(CMAKE_AUTOUIC ON)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wl,--as-need -fPIE")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wl,--as-needed")
 
 #安全加固
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-all -Werror=return-type")

assets/configs/org.deepin.dde.file-manager.computer.json

@@ -0,0 +1,28 @@
+{
+    "magic":"dsg.config.meta",
+    "version":"1.0",
+    "contents":{
+        "hideMyDirectories":{
+            "value": false,
+            "serial":0,
+            "flags":[],
+            "name":"Hide My Directories on the Computer page",
+            "name[zh_CN]":"计算机工作区隐藏我的目录",
+            "description[zh_CN]":"计算机工作区隐藏我的目录",
+            "description":"Hide My Directories on the Computer page",
+            "permissions":"readwrite",
+            "visibility":"public"
+        },
+        "hide3rdEntries":{
+            "value": false,
+            "serial":0,
+            "flags":[],
+            "name":"Hide 3rd party entries on the Computer page",
+            "name[zh_CN]":"计算机工作区隐藏第三方插件",
+            "description[zh_CN]":"计算机工作区隐藏第三方插件",
+            "description":"Hide 3rd party entries on the Computer page",
+            "permissions":"readwrite",
+            "visibility":"public"
+        }
+    }
+}

assets/configs/org.deepin.dde.file-manager.desktop.json

@@ -0,0 +1,83 @@
+{
+	"magic": "dsg.config.meta",
+	"version": "1.0",
+	"contents": {
+		"autoAlign": {
+			"value": -1,
+			"serial": 0,
+			"flags": [],
+			"name": "Enable auto align on desktop",
+			"name[zh_CN]": "启用桌面自动排列",
+			"description[zh_CN]": "用于控制是否启用桌面自动排列",
+			"description": "It's used to control whether the auto align on desktop is enabled.",
+			"permissions": "readwrite",
+			"visibility": "public"
+		},
+		"maskLogoUri": {
+			"value": "",
+			"serial": 0,
+			"flags": [],
+			"name": "WaterMask Uri",
+			"name[zh_CN]": "水印路径",
+			"description[zh_CN]": "水印图片路径",
+			"description": "Watermask logo uri.",
+			"permissions": "readwrite",
+			"visibility": "public"
+		},
+		"maskOffsetX": {
+			"value": 0,
+			"serial": 0,
+			"flags": [],
+			"name": "Horizontal Offset",
+			"name[zh_CN]": "水平偏移",
+			"description[zh_CN]": "相对系统水印左上角的水平偏移距离，左为负值，右为正值",
+			"description": "The horizontal offset distance relative to the topleft of the system watermark, the right is a plus, and the left is a reduce",
+			"permissions": "readwrite",
+			"visibility": "public"
+		},
+		"maskOffsetY": {
+			"value": 0,
+			"serial": 0,
+			"flags": [],
+			"name": "Vertical Offset",
+			"name[zh_CN]": "垂直偏移",
+			"description[zh_CN]": "相对系统水印左上角的竖直偏移距离，上为负值，下为正值",
+			"description": "The vertical offset distance relative to the topleft of the system watermark, the up is a plus, and the down is a reduce",
+			"permissions": "readwrite",
+			"visibility": "public"
+		},
+		"maskWidth": {
+			"value": 114,
+			"serial": 0,
+			"flags": [],
+			"name": "Width",
+			"name[zh_CN]": "宽度",
+			"description[zh_CN]": "水印图片的宽度",
+			"description": "Watermask width",
+			"permissions": "readwrite",
+			"visibility": "public"
+		},
+		"maskHeight": {
+			"value": 14,
+			"serial": 0,
+			"flags": [],
+			"name": "Height",
+			"name[zh_CN]": "高度",
+			"description[zh_CN]": "水印图片高度",
+			"description": "Watermask height",
+			"permissions": "readwrite",
+			"visibility": "public"
+		},
+		"enableMask": {
+			"value": false,
+			"serial": 0,
+			"flags": [],
+			"name": "Enable WaterMask",
+			"name[zh_CN]": "启用水印",
+			"description[zh_CN]": "用于开启/隐藏水印",
+			"description": "It's used to control whether to enable the WaterMask.",
+			"permissions": "readwrite",
+			"visibility": "public"
+		}
+	}
+}

assets/configs/org.deepin.dde.file-manager.json

@@ -188,6 +188,17 @@
             "description":"Size used to determine whether a file is a large file during copying",
             "permissions":"readwrite",
             "visibility":"private"
+        },
+        "dfm.iterator.allasync": {
+            "value":true,
+            "serial":0,
+            "flags":[],
+            "name":"Async Iteration",
+            "name[zh_CN]":"异步迭代文件",
+            "description[zh_CN]":"用于判断是否所以目录都使用异步迭代方式加载文件",
+            "description":"Used to determine if all directories use async iteration to load files",
+            "permissions":"readwrite",
+            "visibility":"private"
         }
     }
 }

assets/configs/org.deepin.dde.file-manager.operations.json

@@ -0,0 +1,28 @@
+{
+    "magic":"dsg.config.meta",
+    "version":"1.0",
+    "contents":{
+        "file.operation.bigfilesize": {
+            "value":"83886080",
+            "serial":0,
+            "flags":[],
+            "name":"Big File",
+            "name[zh_CN]":"大文件大小",
+            "description[zh_CN]":"用于拷贝时判断文件是否是大文件的size，默认是80MB，value的单位是byte",
+            "description":"Size used to determine whether a file is a large file during copying，the default is 80MB,The unit of value is byte",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
+        "file.operation.blockeverysync": {
+            "value":false,
+            "serial":0,
+            "flags":[],
+            "name":"Safe synchronization mode",
+            "name[zh_CN]":"安全同步模式",
+            "description[zh_CN]":"安全同步模式是拷贝到外设块设备时，每次写入执行同步到设备。高性能模式是拷贝到外设块设备时，每个任务完成后在进行同步到设备。默认是高性能模式（即关闭安全同步模式）。",
+            "description":"Safe synchronization mode is when copying to a peripheral block device, synchronize to the device for each write. High-performance mode is to synchronize to the device after each task is completed when copying to a peripheral block device.Default is high performance mode (i.e. turn off safe synchronization mode).",
+            "permissions":"readwrite",
+            "visibility":"private"
+        }
+    }
+}

assets/configs/org.deepin.dde.file-manager.plugins.json

@@ -0,0 +1,69 @@
+{
+    "magic": "dsg.config.meta",
+    "version": "1.0",
+    "contents": {
+        "filemanager.blackList": {
+            "value": [],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-file-manager plugin blacklist",
+            "name[zh_CN]": "文件管理器插件黑名单列表",
+            "description[zh_CN]": "文件管理器插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-file-manager, blacklisted plugins will not be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "desktop.blackList": {
+            "value": [],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-desktop plugins blacklist",
+            "name[zh_CN]": "桌面插件黑名单列表",
+            "description[zh_CN]": "桌面插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-desktop, plugins in the blacklist will not be able to be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "server.blackList": {
+            "value": [],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-file-manager-server plugins blacklist",
+            "name[zh_CN]": "文件管理器用户服务插件黑名单列表",
+            "description[zh_CN]": "文件管理器用户服务插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-file-manager-server, plugins in the blacklist will not be able to be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "daemon.blackList": {
+            "value": [],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-file-manager-daemon plugins blacklist",
+            "name[zh_CN]": "文件管理器守护进程插件黑名单列表",
+            "description[zh_CN]": "文件管理器守护进程插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-file-manager-daemon, plugins in the blacklist will not be able to be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        },
+        "filedialog.blackList": {
+            "value": ["dfmplugin-burn",
+                      "dfmplugin-dirshare",
+                      "dfmplugin-myshares",
+                      "dfmplugin-propertydialog",
+                      "dfmplugin-trashcore",
+                      "dfmplugin-trash",
+                      "dfmplugin-filepreview",
+                      "dfmplugin-vault",
+                      "dfmplugin-phone" ],
+            "serial": 0,
+            "flags": [],
+            "name": "dde-file-dialog plugins blacklist",
+            "name[zh_CN]": "文件管理器文件选择对话框插件黑名单列表",
+            "description[zh_CN]": "文件管理器文件选择对话框插件黑名单列表，黑名单中的插件将无法被启用",
+            "description": "List of plugins disabled by the dde-file-dialog, plugins in the blacklist will not be able to be enabled",
+            "permissions": "readwrite",
+            "visibility": "public"
+        }
+    }
+}

debian/changelog

@@ -1,3 +1,27 @@
+dde-file-manager (6.0.31) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.31
+
+ -- lvwujun <[email protected]>  Fri, 1 Sep 2023 10:16:23 +0800
+
+dde-file-manager (6.0.30) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.30
+
+ -- lvwujun <[email protected]>  Mon, 28 Aug 2023 15:23:11 +0800
+
+dde-file-manager (6.0.29) unstable; urgency=medium
+
+  * update file manager baseline version to V6.0.29
+
+ -- zhangsheng <[email protected]>  Thu, 24 Aug 2023 10:22:04 +0800
+
+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

debian/control

@@ -66,7 +66,6 @@ Depends:
  ${misc:Depends},
  libdde-file-manager,
  libgio-qt,
- libjemalloc2,
  libqt5xdg3,
  socat,
  cryfs,

debian/dde-file-manager.install

@@ -25,4 +25,3 @@ usr/lib/systemd/user/
 etc/dbus-1/system.d/com.deepin.filemanager.daemon.conf
 etc/X11/Xsession.d/99dfm-dlnfs-automount
 etc/deepin/dde-file-manager/dfm-dlnfs-automount
-etc/xdg/autostart

include/dfm-base/base/schemefactory.h

@@ -205,6 +205,11 @@ class InfoFactory final : public SchemeFactory<FileInfo>
                                     const Global::CreateFileInfoType type = Global::CreateFileInfoType::kCreateFileInfoAuto,
                                     QString *errorString = nullptr)
     {
+        if (!url.isValid()) {
+            qWarning() << "url is invalid !!! url = " << url;
+            return nullptr;
+        }
+
         if (InfoCacheController::instance().cacheDisable(url.scheme()))
             return qSharedPointerDynamicCast<T>(instance().SchemeFactory<FileInfo>::
                                                         create(url, errorString));
@@ -223,7 +228,7 @@ class InfoFactory final : public SchemeFactory<FileInfo>
                 auto info = qSharedPointerDynamicCast<T>(instance().SchemeFactory<FileInfo>::
                                                                  create(Global::Scheme::kAsyncFile, url, errorString));
                 if (info)
-                    info->refresh();
+                    info->updateAttributes();
                 return info;
             }
         }
@@ -232,10 +237,10 @@ class InfoFactory final : public SchemeFactory<FileInfo>
         if (!info) {
             auto tarScheme = scheme(url);
             info = instance().SchemeFactory<FileInfo>::create(tarScheme, url, errorString);
-            if (info && tarScheme == Global::Scheme::kAsyncFile) {
-                info->refresh();
-                emit InfoCacheController::instance().cacheFileInfo(url, info);
-            }
+            if (info && tarScheme == Global::Scheme::kAsyncFile)
+                info->updateAttributes();
+
+            emit InfoCacheController::instance().cacheFileInfo(url, info);
         }
 
         if (!info)

include/dfm-base/dfm_global_defines.h

@@ -82,7 +82,7 @@ enum ItemRoles {
     kItemFileOriginalPath = Qt::UserRole + 23,
     kItemFileDeletionDate = Qt::UserRole + 24,
     kItemFileRefreshIcon = Qt::UserRole + 25,
-    kItemFileIsAvailableRole = Qt::UserRole + 26, // the item gray display and can not select
+    kItemFileIsAvailableRole = Qt::UserRole + 26,   // the item gray display and can not select
     kItemFileIsDirRole = Qt::UserRole + 27,
     kItemFileIsWritableRole = Qt::UserRole + 28,
     kItemFileCanRenameRole = Qt::UserRole + 29,
@@ -127,6 +127,8 @@ inline constexpr char kTypeTextXPython[] { "text/x-python" };
 inline constexpr char kTypeTextPlain[] { "text/plain" };
 inline constexpr char kTypeAppXOleStorage[] { "application/x-ole-storage" };
 inline constexpr char kTypeAppZip[] { "application/zip" };
+inline constexpr char kTypeArchiveRAR[] { "application/vnd.rar" };
+inline constexpr char kTypeAppRAR[] { "application/rar" };
 inline constexpr char kTypeAppXDesktop[] { "application/x-desktop" };
 // image
 inline constexpr char kTypeImageIef[] { "image/ief" };